Fix some invalid layout macros (#20256)

6 files changed, 488 insertions, 571 deletions

diff --git a/keyboards/keebio/quefrency/quefrency.h b/keyboards/keebio/quefrency/quefrency.h
index d9a14c439c..434f674bce 100644
--- a/keyboards/keebio/quefrency/quefrency.h
+++ b/keyboards/keebio/quefrency/quefrency.h
@@ -2,9 +2,6 @@
 
 #include "quantum.h"
 
-#ifdef KEYBOARD_keebio_quefrency_rev1
-    #include "rev1.h"
-#endif
 #ifdef KEYBOARD_keebio_quefrency_rev2
     #include "rev2.h"
 #endif
diff --git a/keyboards/keebio/quefrency/rev1/info.json b/keyboards/keebio/quefrency/rev1/info.json
index 648104baa2..6c40e387ac 100644
--- a/keyboards/keebio/quefrency/rev1/info.json
+++ b/keyboards/keebio/quefrency/rev1/info.json
@@ -16,465 +16,462 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-
-                { "label": "7", "x": 8, "y": 0 },
-                { "label": "8", "x": 9, "y": 0 },
-                { "label": "9", "x": 10, "y": 0 },
-                { "label": "0", "x": 11, "y": 0 },
-                { "label": "-", "x": 12, "y": 0 },
-                { "label": "=", "x": 13, "y": 0 },
-                { "label": "Del", "x": 14, "y": 0 },
-                { "label": "Bksp", "x": 15, "y": 0 },
-
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-
-                { "label": "Y", "x": 7.5, "y": 1 },
-                { "label": "U", "x": 8.5, "y": 1 },
-                { "label": "I", "x": 9.5, "y": 1 },
-                { "label": "O", "x": 10.5, "y": 1 },
-                { "label": "P", "x": 11.5, "y": 1 },
-                { "label": "[", "x": 12.5, "y": 1 },
-                { "label": "]", "x": 13.5, "y": 1 },
-                { "label": "Backslash", "x": 14.5, "y": 1, "w": 1.5 },
-
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-
-                { "label": "H", "x": 7.75, "y": 2 },
-                { "label": "J", "x": 8.75, "y": 2 },
-                { "label": "K", "x": 9.75, "y": 2 },
-                { "label": "L", "x": 10.75, "y": 2 },
-                { "label": ";", "x": 11.75, "y": 2 },
-                { "label": "'", "x": 12.75, "y": 2 },
-                { "label": "Enter", "x": 13.75, "y": 2, "w": 2.25 },
-
-                { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-
-                { "label": "N", "x": 8.25, "y": 3 },
-                { "label": "M", "x": 9.25, "y": 3 },
-                { "label": ",", "x": 10.25, "y": 3 },
-                { "label": ".", "x": 11.25, "y": 3 },
-                { "label": "/", "x": 12.25, "y": 3 },
-                { "label": "Shift", "x": 13.25, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 15, "y": 3 },
-
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 3.75, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 5, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 8.25, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 9.5, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 11, "y": 4 },
-                { "label": "Ctrl", "x": 12, "y": 4 },
-                { "label": "Left", "x": 13, "y": 4 },
-                { "label": "Down", "x": 14, "y": 4 },
-                { "label": "Right", "x": 15, "y": 4 }
+                {"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": [6, 0], "x": 8, "y": 0},
+                {"matrix": [6, 1], "x": 9, "y": 0},
+                {"matrix": [6, 2], "x": 10, "y": 0},
+                {"matrix": [6, 3], "x": 11, "y": 0},
+                {"matrix": [6, 4], "x": 12, "y": 0},
+                {"matrix": [6, 5], "x": 13, "y": 0},
+                {"matrix": [6, 6], "x": 14, "y": 0},
+                {"matrix": [6, 7], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+                {"matrix": [7, 0], "x": 7.5, "y": 1},
+                {"matrix": [7, 1], "x": 8.5, "y": 1},
+                {"matrix": [7, 2], "x": 9.5, "y": 1},
+                {"matrix": [7, 3], "x": 10.5, "y": 1},
+                {"matrix": [7, 4], "x": 11.5, "y": 1},
+                {"matrix": [7, 5], "x": 12.5, "y": 1},
+                {"matrix": [7, 6], "x": 13.5, "y": 1},
+                {"matrix": [7, 7], "x": 14.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+                {"matrix": [8, 0], "x": 7.75, "y": 2},
+                {"matrix": [8, 1], "x": 8.75, "y": 2},
+                {"matrix": [8, 2], "x": 9.75, "y": 2},
+                {"matrix": [8, 3], "x": 10.75, "y": 2},
+                {"matrix": [8, 4], "x": 11.75, "y": 2},
+                {"matrix": [8, 5], "x": 12.75, "y": 2},
+                {"matrix": [8, 7], "x": 13.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "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": [9, 0], "x": 8.25, "y": 3},
+                {"matrix": [9, 1], "x": 9.25, "y": 3},
+                {"matrix": [9, 2], "x": 10.25, "y": 3},
+                {"matrix": [9, 3], "x": 11.25, "y": 3},
+                {"matrix": [9, 5], "x": 12.25, "y": 3},
+                {"matrix": [9, 6], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [9, 7], "x": 15, "y": 3},
+
+                {"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, 4], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [10, 0], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [10, 1], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [10, 3], "x": 11, "y": 4},
+                {"matrix": [10, 4], "x": 12, "y": 4},
+                {"matrix": [10, 5], "x": 13, "y": 4},
+                {"matrix": [10, 6], "x": 14, "y": 4},
+                {"matrix": [10, 7], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-
-                { "label": "7", "x": 8, "y": 0 },
-                { "label": "8", "x": 9, "y": 0 },
-                { "label": "9", "x": 10, "y": 0 },
-                { "label": "0", "x": 11, "y": 0 },
-                { "label": "-", "x": 12, "y": 0 },
-                { "label": "=", "x": 13, "y": 0 },
-                { "label": "Del", "x": 14, "y": 0 },
-                { "label": "Bksp", "x": 15, "y": 0 },
-                { "label": "Home", "x": 16, "y": 0 },
-
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-
-                { "label": "Y", "x": 7.5, "y": 1 },
-                { "label": "U", "x": 8.5, "y": 1 },
-                { "label": "I", "x": 9.5, "y": 1 },
-                { "label": "O", "x": 10.5, "y": 1 },
-                { "label": "P", "x": 11.5, "y": 1 },
-                { "label": "[", "x": 12.5, "y": 1 },
-                { "label": "]", "x": 13.5, "y": 1 },
-                { "label": "Backslash", "x": 14.5, "y": 1, "w": 1.5 },
-                { "label": "End", "x": 16, "y": 1 },
-
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-
-                { "label": "H", "x": 7.75, "y": 2 },
-                { "label": "J", "x": 8.75, "y": 2 },
-                { "label": "K", "x": 9.75, "y": 2 },
-                { "label": "L", "x": 10.75, "y": 2 },
-                { "label": ";", "x": 11.75, "y": 2 },
-                { "label": "'", "x": 12.75, "y": 2 },
-                { "label": "Enter", "x": 13.75, "y": 2, "w": 2.25 },
-                { "label": "Page Up", "x": 16, "y": 2 },
-
-                { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-
-                { "label": "N", "x": 8.25, "y": 3 },
-                { "label": "M", "x": 9.25, "y": 3 },
-                { "label": ",", "x": 10.25, "y": 3 },
-                { "label": ".", "x": 11.25, "y": 3 },
-                { "label": "/", "x": 12.25, "y": 3 },
-                { "label": "Shift", "x": 13.25, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 15, "y": 3 },
-                { "label": "Page Down", "x": 16, "y": 3 },
-
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 3.75, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 5, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 8.25, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 9.5, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 11, "y": 4 },
-                { "label": "Ctrl", "x": 12, "y": 4 },
-                { "label": "Win", "x": 13, "y": 4 },
-                { "label": "Left", "x": 14, "y": 4 },
-                { "label": "Down", "x": 15, "y": 4 },
-                { "label": "Right", "x": 16, "y": 4 }
+                {"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": [6, 0], "x": 8, "y": 0},
+                {"matrix": [6, 1], "x": 9, "y": 0},
+                {"matrix": [6, 2], "x": 10, "y": 0},
+                {"matrix": [6, 3], "x": 11, "y": 0},
+                {"matrix": [6, 4], "x": 12, "y": 0},
+                {"matrix": [6, 5], "x": 13, "y": 0},
+                {"matrix": [6, 6], "x": 14, "y": 0},
+                {"matrix": [6, 7], "x": 15, "y": 0},
+                {"matrix": [11, 6], "x": 16, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+                {"matrix": [7, 0], "x": 7.5, "y": 1},
+                {"matrix": [7, 1], "x": 8.5, "y": 1},
+                {"matrix": [7, 2], "x": 9.5, "y": 1},
+                {"matrix": [7, 3], "x": 10.5, "y": 1},
+                {"matrix": [7, 4], "x": 11.5, "y": 1},
+                {"matrix": [7, 5], "x": 12.5, "y": 1},
+                {"matrix": [7, 6], "x": 13.5, "y": 1},
+                {"matrix": [7, 7], "x": 14.5, "y": 1, "w": 1.5},
+                {"matrix": [11, 7], "x": 16, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+                {"matrix": [8, 0], "x": 7.75, "y": 2},
+                {"matrix": [8, 1], "x": 8.75, "y": 2},
+                {"matrix": [8, 2], "x": 9.75, "y": 2},
+                {"matrix": [8, 3], "x": 10.75, "y": 2},
+                {"matrix": [8, 4], "x": 11.75, "y": 2},
+                {"matrix": [8, 5], "x": 12.75, "y": 2},
+                {"matrix": [8, 7], "x": 13.75, "y": 2, "w": 2.25},
+                {"matrix": [8, 6], "x": 16, "y": 2},
+
+                {"matrix": [3, 0], "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": [9, 0], "x": 8.25, "y": 3},
+                {"matrix": [9, 1], "x": 9.25, "y": 3},
+                {"matrix": [9, 2], "x": 10.25, "y": 3},
+                {"matrix": [9, 3], "x": 11.25, "y": 3},
+                {"matrix": [9, 5], "x": 12.25, "y": 3},
+                {"matrix": [9, 6], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [9, 7], "x": 15, "y": 3},
+                {"matrix": [9, 4], "x": 16, "y": 3},
+
+                {"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, 4], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [10, 0], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [10, 1], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [10, 3], "x": 11, "y": 4},
+                {"matrix": [10, 4], "x": 12, "y": 4},
+                {"matrix": [10, 5], "x": 13, "y": 4},
+                {"matrix": [10, 6], "x": 14, "y": 4},
+                {"matrix": [10, 7], "x": 15, "y": 4},
+                {"matrix": [10, 2], "x": 16, "y": 4}
             ]
         },
         "LAYOUT_60_with_macro": {
             "layout": [
-                { "label": "F1", "x": 0, "y": 0 },
-                { "label": "F6", "x": 1, "y": 0 },
-
-                { "label": "Esc", "x": 2.25, "y": 0 },
-                { "label": "1", "x": 3.25, "y": 0 },
-                { "label": "2", "x": 4.25, "y": 0 },
-                { "label": "3", "x": 5.25, "y": 0 },
-                { "label": "4", "x": 6.25, "y": 0 },
-                { "label": "5", "x": 7.25, "y": 0 },
-                { "label": "6", "x": 8.25, "y": 0 },
-
-                { "label": "7", "x": 10.25, "y": 0 },
-                { "label": "8", "x": 11.25, "y": 0 },
-                { "label": "9", "x": 12.25, "y": 0 },
-                { "label": "0", "x": 13.25, "y": 0 },
-                { "label": "-", "x": 14.25, "y": 0 },
-                { "label": "=", "x": 15.25, "y": 0 },
-                { "label": "Del", "x": 16.25, "y": 0 },
-                { "label": "Bksp", "x": 17.25, "y": 0 },
-
-                { "label": "F2", "x": 0, "y": 1 },
-                { "label": "F7", "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": 9.75, "y": 1 },
-                { "label": "U", "x": 10.75, "y": 1 },
-                { "label": "I", "x": 11.75, "y": 1 },
-                { "label": "O", "x": 12.75, "y": 1 },
-                { "label": "P", "x": 13.75, "y": 1 },
-                { "label": "[", "x": 14.75, "y": 1 },
-                { "label": "]", "x": 15.75, "y": 1 },
-                { "label": "Backslash", "x": 16.75, "y": 1, "w": 1.5 },
-
-                { "label": "F3", "x": 0, "y": 2 },
-                { "label": "F8", "x": 1, "y": 2 },
-
-                { "label": "Caps Lock", "x": 2.25, "y": 2, "w": 1.75 },
-                { "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": 10, "y": 2 },
-                { "label": "J", "x": 11, "y": 2 },
-                { "label": "K", "x": 12, "y": 2 },
-                { "label": "L", "x": 13, "y": 2 },
-                { "label": ";", "x": 14, "y": 2 },
-                { "label": "'", "x": 15, "y": 2 },
-                { "label": "Enter", "x": 16, "y": 2, "w": 2.25 },
-
-                { "label": "F4", "x": 0, "y": 3 },
-                { "label": "F9", "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": 10.5, "y": 3 },
-                { "label": "M", "x": 11.5, "y": 3 },
-                { "label": ",", "x": 12.5, "y": 3 },
-                { "label": ".", "x": 13.5, "y": 3 },
-                { "label": "/", "x": 14.5, "y": 3 },
-                { "label": "Shift", "x": 15.5, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 17.25, "y": 3 },
-
-                { "label": "F5", "x": 0, "y": 4 },
-                { "label": "F10", "x": 1, "y": 4 },
-
-                { "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 4.75, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 6, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 7.25, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 10.5, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 11.75, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 13.25, "y": 4 },
-                { "label": "Ctrl", "x": 14.25, "y": 4 },
-                { "label": "Left", "x": 15.25, "y": 4 },
-                { "label": "Down", "x": 16.25, "y": 4 },
-                { "label": "Right", "x": 17.25, "y": 4 }
+                {"matrix": [4, 3], "x": 0, "y": 0},
+                {"matrix": [0, 7], "x": 1, "y": 0},
+
+                {"matrix": [0, 0], "x": 2.25, "y": 0},
+                {"matrix": [0, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [0, 3], "x": 5.25, "y": 0},
+                {"matrix": [0, 4], "x": 6.25, "y": 0},
+                {"matrix": [0, 5], "x": 7.25, "y": 0},
+                {"matrix": [0, 6], "x": 8.25, "y": 0},
+
+                {"matrix": [6, 0], "x": 10.25, "y": 0},
+                {"matrix": [6, 1], "x": 11.25, "y": 0},
+                {"matrix": [6, 2], "x": 12.25, "y": 0},
+                {"matrix": [6, 3], "x": 13.25, "y": 0},
+                {"matrix": [6, 4], "x": 14.25, "y": 0},
+                {"matrix": [6, 5], "x": 15.25, "y": 0},
+                {"matrix": [6, 6], "x": 16.25, "y": 0},
+                {"matrix": [6, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 6], "x": 0, "y": 1},
+                {"matrix": [1, 7], "x": 1, "y": 1},
+
+                {"matrix": [1, 0], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3.75, "y": 1},
+                {"matrix": [1, 2], "x": 4.75, "y": 1},
+                {"matrix": [1, 3], "x": 5.75, "y": 1},
+                {"matrix": [1, 4], "x": 6.75, "y": 1},
+                {"matrix": [1, 5], "x": 7.75, "y": 1},
+
+                {"matrix": [7, 0], "x": 9.75, "y": 1},
+                {"matrix": [7, 1], "x": 10.75, "y": 1},
+                {"matrix": [7, 2], "x": 11.75, "y": 1},
+                {"matrix": [7, 3], "x": 12.75, "y": 1},
+                {"matrix": [7, 4], "x": 13.75, "y": 1},
+                {"matrix": [7, 5], "x": 14.75, "y": 1},
+                {"matrix": [7, 6], "x": 15.75, "y": 1},
+                {"matrix": [7, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 6], "x": 0, "y": 2},
+                {"matrix": [2, 7], "x": 1, "y": 2},
+
+                {"matrix": [2, 0], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 4, "y": 2},
+                {"matrix": [2, 2], "x": 5, "y": 2},
+                {"matrix": [2, 3], "x": 6, "y": 2},
+                {"matrix": [2, 4], "x": 7, "y": 2},
+                {"matrix": [2, 5], "x": 8, "y": 2},
+
+                {"matrix": [8, 0], "x": 10, "y": 2},
+                {"matrix": [8, 1], "x": 11, "y": 2},
+                {"matrix": [8, 2], "x": 12, "y": 2},
+                {"matrix": [8, 3], "x": 13, "y": 2},
+                {"matrix": [8, 4], "x": 14, "y": 2},
+                {"matrix": [8, 5], "x": 15, "y": 2},
+                {"matrix": [8, 7], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 0, "y": 3},
+                {"matrix": [3, 7], "x": 1, "y": 3},
+
+                {"matrix": [3, 0], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 4.5, "y": 3},
+                {"matrix": [3, 3], "x": 5.5, "y": 3},
+                {"matrix": [3, 4], "x": 6.5, "y": 3},
+                {"matrix": [3, 5], "x": 7.5, "y": 3},
+                {"matrix": [3, 6], "x": 8.5, "y": 3},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 3},
+                {"matrix": [9, 1], "x": 11.5, "y": 3},
+                {"matrix": [9, 2], "x": 12.5, "y": 3},
+                {"matrix": [9, 3], "x": 13.5, "y": 3},
+                {"matrix": [9, 5], "x": 14.5, "y": 3},
+                {"matrix": [9, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [9, 7], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 5], "x": 0, "y": 4},
+                {"matrix": [4, 7], "x": 1, "y": 4},
+
+                {"matrix": [4, 0], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [10, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [10, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [10, 3], "x": 13.25, "y": 4},
+                {"matrix": [10, 4], "x": 14.25, "y": 4},
+                {"matrix": [10, 5], "x": 15.25, "y": 4},
+                {"matrix": [10, 6], "x": 16.25, "y": 4},
+                {"matrix": [10, 7], "x": 17.25, "y": 4}
             ]
         },
         "LAYOUT_65_with_macro": {
             "layout": [
-                { "label": "F1", "x": 0, "y": 0 },
-                { "label": "F6", "x": 1, "y": 0 },
-
-                { "label": "Esc", "x": 2.25, "y": 0 },
-                { "label": "1", "x": 3.25, "y": 0 },
-                { "label": "2", "x": 4.25, "y": 0 },
-                { "label": "3", "x": 5.25, "y": 0 },
-                { "label": "4", "x": 6.25, "y": 0 },
-                { "label": "5", "x": 7.25, "y": 0 },
-                { "label": "6", "x": 8.25, "y": 0 },
-
-                { "label": "7", "x": 10.25, "y": 0 },
-                { "label": "8", "x": 11.25, "y": 0 },
-                { "label": "9", "x": 12.25, "y": 0 },
-                { "label": "0", "x": 13.25, "y": 0 },
-                { "label": "-", "x": 14.25, "y": 0 },
-                { "label": "=", "x": 15.25, "y": 0 },
-                { "label": "Del", "x": 16.25, "y": 0 },
-                { "label": "Bksp", "x": 17.25, "y": 0 },
-                { "label": "Home", "x": 18.25, "y": 0 },
-
-                { "label": "F2", "x": 0, "y": 1 },
-                { "label": "F7", "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": 9.75, "y": 1 },
-                { "label": "U", "x": 10.75, "y": 1 },
-                { "label": "I", "x": 11.75, "y": 1 },
-                { "label": "O", "x": 12.75, "y": 1 },
-                { "label": "P", "x": 13.75, "y": 1 },
-                { "label": "[", "x": 14.75, "y": 1 },
-                { "label": "]", "x": 15.75, "y": 1 },
-                { "label": "Backslash", "x": 16.75, "y": 1, "w": 1.5 },
-                { "label": "PgUp", "x": 18.25, "y": 1 },
-
-                { "label": "F3", "x": 0, "y": 2 },
-                { "label": "F8", "x": 1, "y": 2 },
-
-                { "label": "Caps Lock", "x": 2.25, "y": 2, "w": 1.75 },
-                { "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": 10, "y": 2 },
-                { "label": "J", "x": 11, "y": 2 },
-                { "label": "K", "x": 12, "y": 2 },
-                { "label": "L", "x": 13, "y": 2 },
-                { "label": ";", "x": 14, "y": 2 },
-                { "label": "'", "x": 15, "y": 2 },
-                { "label": "Enter", "x": 16, "y": 2, "w": 2.25 },
-                { "label": "PgDn", "x": 18.25, "y": 2 },
-
-                { "label": "F4", "x": 0, "y": 3 },
-                { "label": "F9", "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": 10.5, "y": 3 },
-                { "label": "M", "x": 11.5, "y": 3 },
-                { "label": ",", "x": 12.5, "y": 3 },
-                { "label": ".", "x": 13.5, "y": 3 },
-                { "label": "/", "x": 14.5, "y": 3 },
-                { "label": "Shift", "x": 15.5, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 17.25, "y": 3 },
-                { "label": "End", "x": 18.25, "y": 3 },
-
-                { "label": "F5", "x": 0, "y": 4 },
-                { "label": "F10", "x": 1, "y": 4 },
-
-                { "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 4.75, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 6, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 7.25, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 10.5, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 11.75, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 13.25, "y": 4 },
-                { "label": "Ctrl", "x": 14.25, "y": 4 },
-                { "label": "Win", "x": 15.25, "y": 4 },
-                { "label": "Left", "x": 16.25, "y": 4 },
-                { "label": "Down", "x": 17.25, "y": 4 },
-                { "label": "Right", "x": 18.25, "y": 4 }
+                {"matrix": [4, 3], "x": 0, "y": 0},
+                {"matrix": [0, 7], "x": 1, "y": 0},
+
+                {"matrix": [0, 0], "x": 2.25, "y": 0},
+                {"matrix": [0, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [0, 3], "x": 5.25, "y": 0},
+                {"matrix": [0, 4], "x": 6.25, "y": 0},
+                {"matrix": [0, 5], "x": 7.25, "y": 0},
+                {"matrix": [0, 6], "x": 8.25, "y": 0},
+
+                {"matrix": [6, 0], "x": 10.25, "y": 0},
+                {"matrix": [6, 1], "x": 11.25, "y": 0},
+                {"matrix": [6, 2], "x": 12.25, "y": 0},
+                {"matrix": [6, 3], "x": 13.25, "y": 0},
+                {"matrix": [6, 4], "x": 14.25, "y": 0},
+                {"matrix": [6, 5], "x": 15.25, "y": 0},
+                {"matrix": [6, 6], "x": 16.25, "y": 0},
+                {"matrix": [6, 7], "x": 17.25, "y": 0},
+                {"matrix": [11, 6], "x": 18.25, "y": 0},
+
+                {"matrix": [1, 6], "x": 0, "y": 1},
+                {"matrix": [1, 7], "x": 1, "y": 1},
+
+                {"matrix": [1, 0], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3.75, "y": 1},
+                {"matrix": [1, 2], "x": 4.75, "y": 1},
+                {"matrix": [1, 3], "x": 5.75, "y": 1},
+                {"matrix": [1, 4], "x": 6.75, "y": 1},
+                {"matrix": [1, 5], "x": 7.75, "y": 1},
+
+                {"matrix": [7, 0], "x": 9.75, "y": 1},
+                {"matrix": [7, 1], "x": 10.75, "y": 1},
+                {"matrix": [7, 2], "x": 11.75, "y": 1},
+                {"matrix": [7, 3], "x": 12.75, "y": 1},
+                {"matrix": [7, 4], "x": 13.75, "y": 1},
+                {"matrix": [7, 5], "x": 14.75, "y": 1},
+                {"matrix": [7, 6], "x": 15.75, "y": 1},
+                {"matrix": [7, 7], "x": 16.75, "y": 1, "w": 1.5},
+                {"matrix": [11, 7], "x": 18.25, "y": 1},
+
+                {"matrix": [2, 6], "x": 0, "y": 2},
+                {"matrix": [2, 7], "x": 1, "y": 2},
+
+                {"matrix": [2, 0], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 4, "y": 2},
+                {"matrix": [2, 2], "x": 5, "y": 2},
+                {"matrix": [2, 3], "x": 6, "y": 2},
+                {"matrix": [2, 4], "x": 7, "y": 2},
+                {"matrix": [2, 5], "x": 8, "y": 2},
+
+                {"matrix": [8, 0], "x": 10, "y": 2},
+                {"matrix": [8, 1], "x": 11, "y": 2},
+                {"matrix": [8, 2], "x": 12, "y": 2},
+                {"matrix": [8, 3], "x": 13, "y": 2},
+                {"matrix": [8, 4], "x": 14, "y": 2},
+                {"matrix": [8, 5], "x": 15, "y": 2},
+                {"matrix": [8, 7], "x": 16, "y": 2, "w": 2.25},
+                {"matrix": [8, 6], "x": 18.25, "y": 2},
+
+                {"matrix": [3, 1], "x": 0, "y": 3},
+                {"matrix": [3, 7], "x": 1, "y": 3},
+
+                {"matrix": [3, 0], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 4.5, "y": 3},
+                {"matrix": [3, 3], "x": 5.5, "y": 3},
+                {"matrix": [3, 4], "x": 6.5, "y": 3},
+                {"matrix": [3, 5], "x": 7.5, "y": 3},
+                {"matrix": [3, 6], "x": 8.5, "y": 3},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 3},
+                {"matrix": [9, 1], "x": 11.5, "y": 3},
+                {"matrix": [9, 2], "x": 12.5, "y": 3},
+                {"matrix": [9, 3], "x": 13.5, "y": 3},
+                {"matrix": [9, 5], "x": 14.5, "y": 3},
+                {"matrix": [9, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [9, 7], "x": 17.25, "y": 3},
+                {"matrix": [9, 4], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 5], "x": 0, "y": 4},
+                {"matrix": [4, 7], "x": 1, "y": 4},
+
+                {"matrix": [4, 0], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [10, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [10, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [10, 3], "x": 13.25, "y": 4},
+                {"matrix": [10, 4], "x": 14.25, "y": 4},
+                {"matrix": [10, 5], "x": 15.25, "y": 4},
+                {"matrix": [10, 6], "x": 16.25, "y": 4},
+                {"matrix": [10, 7], "x": 17.25, "y": 4},
+                {"matrix": [10, 2], "x": 18.25, "y": 4}
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                { "label": "F1", "x": 0, "y": 0 },
-                { "label": "F6", "x": 1, "y": 0 },
-
-                { "label": "Esc", "x": 2.25, "y": 0 },
-                { "label": "1", "x": 3.25, "y": 0 },
-                { "label": "2", "x": 4.25, "y": 0 },
-                { "label": "3", "x": 5.25, "y": 0 },
-                { "label": "4", "x": 6.25, "y": 0 },
-                { "label": "5", "x": 7.25, "y": 0 },
-                { "label": "6", "x": 8.25, "y": 0 },
-
-                { "label": "7", "x": 10.25, "y": 0 },
-                { "label": "8", "x": 11.25, "y": 0 },
-                { "label": "9", "x": 12.25, "y": 0 },
-                { "label": "0", "x": 13.25, "y": 0 },
-                { "label": "-", "x": 14.25, "y": 0 },
-                { "label": "=", "x": 15.25, "y": 0 },
-                { "label": "Del", "x": 16.25, "y": 0 },
-                { "label": "Bksp", "x": 17.25, "y": 0 },
-                { "label": "Home", "x": 18.25, "y": 0 },
-
-                { "label": "F2", "x": 0, "y": 1 },
-                { "label": "F7", "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": 9.75, "y": 1 },
-                { "label": "U", "x": 10.75, "y": 1 },
-                { "label": "I", "x": 11.75, "y": 1 },
-                { "label": "O", "x": 12.75, "y": 1 },
-                { "label": "P", "x": 13.75, "y": 1 },
-                { "label": "[", "x": 14.75, "y": 1 },
-                { "label": "]", "x": 15.75, "y": 1 },
-                { "label": "Backslash", "x": 16.75, "y": 1, "w": 1.5 },
-                { "label": "PgUp", "x": 18.25, "y": 1 },
-
-                { "label": "F3", "x": 0, "y": 2 },
-                { "label": "F8", "x": 1, "y": 2 },
-
-                { "label": "Caps Lock", "x": 2.25, "y": 2, "w": 1.75 },
-                { "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": 10, "y": 2 },
-                { "label": "J", "x": 11, "y": 2 },
-                { "label": "K", "x": 12, "y": 2 },
-                { "label": "L", "x": 13, "y": 2 },
-                { "label": ";", "x": 14, "y": 2 },
-                { "label": "'", "x": 15, "y": 2 },
-                { "label": "NUHS", "x": 16, "y": 2 },
-                { "label": "Enter", "x": 17, "y": 2, "w": 1.25 },
-                { "label": "PgDn", "x": 18.25, "y": 2 },
-
-                { "label": "F4", "x": 0, "y": 3 },
-                { "label": "F9", "x": 1, "y": 3 },
-
-                { "label": "Shift", "x": 2.25, "y": 3, "w": 1.25 },
-                { "label": "NUBS", "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": 10.5, "y": 3 },
-                { "label": "M", "x": 11.5, "y": 3 },
-                { "label": ",", "x": 12.5, "y": 3 },
-                { "label": ".", "x": 13.5, "y": 3 },
-                { "label": "/", "x": 14.5, "y": 3 },
-                { "label": "Shift", "x": 15.5, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 17.25, "y": 3 },
-                { "label": "End", "x": 18.25, "y": 3 },
-
-                { "label": "F5", "x": 0, "y": 4 },
-                { "label": "F10", "x": 1, "y": 4 },
-
-                { "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 4.75, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 6, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 7.25, "y": 4 },
-                { "label": "Space", "x": 8.25, "y": 4, "w": 1.25 },
-
-                { "label": "Fn", "x": 10.5, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 11.75, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 13.25, "y": 4 },
-                { "label": "Ctrl", "x": 14.25, "y": 4 },
-                { "label": "Win", "x": 15.25, "y": 4 },
-                { "label": "Left", "x": 16.25, "y": 4 },
-                { "label": "Down", "x": 17.25, "y": 4 },
-                { "label": "Right", "x": 18.25, "y": 4 }
+                {"matrix": [4, 3], "x": 0, "y": 0},
+                {"matrix": [0, 7], "x": 1, "y": 0},
+
+                {"matrix": [0, 0], "x": 2.25, "y": 0},
+                {"matrix": [0, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [0, 3], "x": 5.25, "y": 0},
+                {"matrix": [0, 4], "x": 6.25, "y": 0},
+                {"matrix": [0, 5], "x": 7.25, "y": 0},
+                {"matrix": [0, 6], "x": 8.25, "y": 0},
+
+                {"matrix": [6, 0], "x": 10.25, "y": 0},
+                {"matrix": [6, 1], "x": 11.25, "y": 0},
+                {"matrix": [6, 2], "x": 12.25, "y": 0},
+                {"matrix": [6, 3], "x": 13.25, "y": 0},
+                {"matrix": [6, 4], "x": 14.25, "y": 0},
+                {"matrix": [6, 5], "x": 15.25, "y": 0},
+                {"matrix": [6, 6], "x": 16.25, "y": 0},
+                {"matrix": [6, 7], "x": 17.25, "y": 0},
+                {"matrix": [11, 6], "x": 18.25, "y": 0},
+
+                {"matrix": [1, 6], "x": 0, "y": 1},
+                {"matrix": [1, 7], "x": 1, "y": 1},
+
+                {"matrix": [1, 0], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3.75, "y": 1},
+                {"matrix": [1, 2], "x": 4.75, "y": 1},
+                {"matrix": [1, 3], "x": 5.75, "y": 1},
+                {"matrix": [1, 4], "x": 6.75, "y": 1},
+                {"matrix": [1, 5], "x": 7.75, "y": 1},
+
+                {"matrix": [7, 0], "x": 9.75, "y": 1},
+                {"matrix": [7, 1], "x": 10.75, "y": 1},
+                {"matrix": [7, 2], "x": 11.75, "y": 1},
+                {"matrix": [7, 3], "x": 12.75, "y": 1},
+                {"matrix": [7, 4], "x": 13.75, "y": 1},
+                {"matrix": [7, 5], "x": 14.75, "y": 1},
+                {"matrix": [7, 6], "x": 15.75, "y": 1},
+                {"matrix": [7, 7], "x": 16.75, "y": 1, "w": 1.5},
+                {"matrix": [11, 7], "x": 18.25, "y": 1},
+
+                {"matrix": [2, 6], "x": 0, "y": 2},
+                {"matrix": [2, 7], "x": 1, "y": 2},
+
+                {"matrix": [2, 0], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 4, "y": 2},
+                {"matrix": [2, 2], "x": 5, "y": 2},
+                {"matrix": [2, 3], "x": 6, "y": 2},
+                {"matrix": [2, 4], "x": 7, "y": 2},
+                {"matrix": [2, 5], "x": 8, "y": 2},
+
+                {"matrix": [8, 0], "x": 10, "y": 2},
+                {"matrix": [8, 1], "x": 11, "y": 2},
+                {"matrix": [8, 2], "x": 12, "y": 2},
+                {"matrix": [8, 3], "x": 13, "y": 2},
+                {"matrix": [8, 4], "x": 14, "y": 2},
+                {"matrix": [8, 5], "x": 15, "y": 2},
+                {"matrix": [8, 7], "x": 16, "y": 2, "w": 2.25},
+                {"matrix": [8, 6], "x": 18.25, "y": 2},
+
+                {"matrix": [3, 1], "x": 0, "y": 3},
+                {"matrix": [3, 7], "x": 1, "y": 3},
+
+                {"matrix": [3, 0], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 4.5, "y": 3},
+                {"matrix": [3, 3], "x": 5.5, "y": 3},
+                {"matrix": [3, 4], "x": 6.5, "y": 3},
+                {"matrix": [3, 5], "x": 7.5, "y": 3},
+                {"matrix": [3, 6], "x": 8.5, "y": 3},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 3},
+                {"matrix": [9, 1], "x": 11.5, "y": 3},
+                {"matrix": [9, 2], "x": 12.5, "y": 3},
+                {"matrix": [9, 3], "x": 13.5, "y": 3},
+                {"matrix": [9, 5], "x": 14.5, "y": 3},
+                {"matrix": [9, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [9, 7], "x": 17.25, "y": 3},
+                {"matrix": [9, 4], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 5], "x": 0, "y": 4},
+                {"matrix": [4, 7], "x": 1, "y": 4},
+
+                {"matrix": [4, 0], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [10, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [10, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [10, 3], "x": 13.25, "y": 4},
+                {"matrix": [10, 4], "x": 14.25, "y": 4},
+                {"matrix": [10, 5], "x": 15.25, "y": 4},
+                {"matrix": [10, 6], "x": 16.25, "y": 4},
+                {"matrix": [10, 7], "x": 17.25, "y": 4},
+                {"matrix": [10, 2], "x": 18.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/keebio/quefrency/rev1/keymaps/via/keymap.c b/keyboards/keebio/quefrency/rev1/keymaps/via/keymap.c
new file mode 100644
index 0000000000..04349ea990
--- /dev/null
+++ b/keyboards/keebio/quefrency/rev1/keymaps/via/keymap.c
@@ -0,0 +1,44 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_all(
+    KC_F1,   KC_F2,   QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC, KC_HOME,
+    KC_F3,   KC_F4,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_END,
+    KC_F5,   KC_F6,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT         , KC_ENT,  KC_PGUP,
+    KC_F7,   KC_F8,   KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
+    KC_F9,   KC_F10,  KC_LCTL, KC_LALT, KC_LGUI, MO(1),            KC_SPC,  MO(1),   KC_SPC,  KC_RALT, KC_RCTL, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+
+  [1] = LAYOUT_all(
+    _______, _______, QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_BSPC, _______,
+    _______, _______, RGB_TOG, RGB_MOD, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+    _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, KC_TILD, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______
+  ),
+
+  [2] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+    _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______
+  ),
+
+  [3] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+    _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______
+  )
+};
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(KC_MPRV, KC_MNXT) },
+    [2] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) },
+    [3] = { ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+};
+#endif
diff --git a/keyboards/keebio/quefrency/rev1/keymaps/via/rules.mk b/keyboards/keebio/quefrency/rev1/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1189f4ad19
--- /dev/null
+++ b/keyboards/keebio/quefrency/rev1/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keebio/quefrency/rev1/rev1.c b/keyboards/keebio/quefrency/rev1/rev1.c
index 6704b062f5..51adb74d31 100644
--- a/keyboards/keebio/quefrency/rev1/rev1.c
+++ b/keyboards/keebio/quefrency/rev1/rev1.c
@@ -1,4 +1,4 @@
-#include "quefrency.h"
+#include "quantum.h"
 
 void eeconfig_init_kb(void) {
 #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/keebio/quefrency/rev1/rev1.h b/keyboards/keebio/quefrency/rev1/rev1.h
deleted file mode 100644
index da62f904cc..0000000000
--- a/keyboards/keebio/quefrency/rev1/rev1.h
+++ /dev/null
@@ -1,124 +0,0 @@
-#pragma once
-
-#include "quefrency.h"
-
-#include "quantum.h"
-
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-  #include <avr/io.h>
-  #include <avr/interrupt.h>
-#endif
-#endif
-
-#define LAYOUT( \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
-  LB1, LB2, LB3, LB4, LB5, LB6,      RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, \
-  LC1, LC2, LC3, LC4, LC5, LC6,      RC1, RC2, RC3, RC4, RC5, RC6,      RC8, \
-  LD1,      LD3, LD4, LD5, LD6, LD7, RD1, RD2, RD3, RD4,      RD6, RD7, RD8, \
-  LE1, LE2, LE3,      LE5,      LE7, RE1, RE2,      RE4, RE5, RE6, RE7, RE8 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, KC_NO }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, KC_NO, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, KC_NO, KC_NO }, \
-    { LD1, KC_NO, LD3, LD4, LD5, LD6, LD7, KC_NO }, \
-    { LE1, LE2, LE3, KC_NO, LE5, KC_NO, LE7, KC_NO }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8 }, \
-    { RD1, RD2, RD3, RD4, KC_NO, RD6, RD7, RD8 }, \
-    { RE1, RE2, KC_NO, RE4, RE5, RE6, RE7, RE8 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
-  }
-
-#define LAYOUT_65( \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB1, LB2, LB3, LB4, LB5, LB6,      RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
-  LC1, LC2, LC3, LC4, LC5, LC6,      RC1, RC2, RC3, RC4, RC5, RC6,      RC8, RC9, \
-  LD1,      LD3, LD4, LD5, LD6, LD7, RD1, RD2, RD3, RD4,      RD6, RD7, RD8, RD9, \
-  LE1, LE2, LE3,      LE5,      LE7, RE1, RE2,      RE4, RE5, RE6, RE7, RE8, RE9 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, KC_NO }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, KC_NO, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, KC_NO, KC_NO }, \
-    { LD1, KC_NO, LD3, LD4, LD5, LD6, LD7, KC_NO }, \
-    { LE1, LE2, LE3, KC_NO, LE5, KC_NO, LE7, KC_NO }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC9, RC8 }, \
-    { RD1, RD2, RD3, RD4, RD9, RD6, RD7, RD8 }, \
-    { RE1, RE2, RE9, RE4, RE5, RE6, RE7, RE8 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RA9, RB9 } \
-  }
-
-#define LAYOUT_60_with_macro( \
-  LA9, LA8, LA1, LA2, LA3, LA4, LA5, LA6, LA7, RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
-  LB9, LB8, LB1, LB2, LB3, LB4, LB5, LB6,      RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, \
-  LC9, LC8, LC1, LC2, LC3, LC4, LC5, LC6,      RC1, RC2, RC3, RC4, RC5, RC6,      RC8, \
-  LD9, LD8, LD1,      LD3, LD4, LD5, LD6, LD7, RD1, RD2, RD3, RD4,      RD6, RD7, RD8, \
-  LE9, LE8, LE1, LE2, LE3,      LE5,      LE7, RE1, RE2,      RE4, RE5, RE6, RE7, RE8 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB9, LB8 }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC9, LC8 }, \
-    { LD1, LD9, LD3, LD4, LD5, LD6, LD7, LD8 }, \
-    { LE1, LE2, LE3, LA9, LE5, LE9, LE7, LE8 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8 }, \
-    { RD1, RD2, RD3, RD4, KC_NO, RD6, RD7, RD8 }, \
-    { RE1, RE2, KC_NO, RE4, RE5, RE6, RE7, RE8 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
-  }
-
-#define LAYOUT_65_with_macro( \
-  LA9, LA8, LA1, LA2, LA3, LA4, LA5, LA6, LA7, RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB9, LB8, LB1, LB2, LB3, LB4, LB5, LB6,      RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
-  LC9, LC8, LC1, LC2, LC3, LC4, LC5, LC6,      RC1, RC2, RC3, RC4, RC5, RC6,      RC8, RC9, \
-  LD9, LD8, LD1,      LD3, LD4, LD5, LD6, LD7, RD1, RD2, RD3, RD4,      RD6, RD7, RD8, RD9, \
-  LE9, LE8, LE1, LE2, LE3,      LE5,      LE7, RE1, RE2,      RE4, RE5, RE6, RE7, RE8, RE9 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB9, LB8 }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC9, LC8 }, \
-    { LD1, LD9, LD3, LD4, LD5, LD6, LD7, LD8 }, \
-    { LE1, LE2, LE3, LA9, LE5, LE9, LE7, LE8 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC9, RC8 }, \
-    { RD1, RD2, RD3, RD4, RD9, RD6, RD7, RD8 }, \
-    { RE1, RE2, RE9, RE4, RE5, RE6, RE7, RE8 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RA9, RB9 } \
-  }
-
-#define LAYOUT_all( \
-  LA9, LA8, LA1, LA2, LA3, LA4, LA5, LA6, LA7, RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB9, LB8, LB1, LB2, LB3, LB4, LB5, LB6,      RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
-  LC9, LC8, LC1, LC2, LC3, LC4, LC5, LC6,      RC1, RC2, RC3, RC4, RC5, RC6, RC7x,RC8, RC9, \
-  LD9, LD8, LD1, LD2x,LD3, LD4, LD5, LD6, LD7, RD1, RD2, RD3, RD4,      RD6, RD7, RD8, RD9, \
-  LE9, LE8, LE1, LE2, LE3,      LE5, LE6x,LE7, RE1, RE2,      RE4, RE5, RE6, RE7, RE8, RE9 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB9, LB8 }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC9, LC8 }, \
-    { LD1, LD9, LD3, LD4, LD5, LD6, LD7, LD8 }, \
-    { LE1, LE2, LE3, LA9, LE5, LE9, LE7, LE8 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC9, RC8 }, \
-    { RD1, RD2, RD3, RD4, RD9, RD6, RD7, RD8 }, \
-    { RE1, RE2, RE9, RE4, RE5, RE6, RE7, RE8 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RA9, RB9 } \
-  }