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

2 files changed, 230 insertions, 262 deletions

diff --git a/keyboards/nullbitsco/nibble/info.json b/keyboards/nullbitsco/nibble/info.json
index 3fc0c3304f..7f24d36813 100644
--- a/keyboards/nullbitsco/nibble/info.json
+++ b/keyboards/nullbitsco/nibble/info.json
@@ -21,232 +21,244 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":1, "y":0},
-                {"label":"!", "x":2, "y":0},
-                {"label":"@", "x":3, "y":0},
-                {"label":"#", "x":4, "y":0},
-                {"label":"$", "x":5, "y":0},
-                {"label":"%", "x":6, "y":0},
-                {"label":"^", "x":7, "y":0},
-                {"label":"&", "x":8, "y":0},
-                {"label":"*", "x":9, "y":0},
-                {"label":"(", "x":10, "y":0},
-                {"label":")", "x":11, "y":0},
-                {"label":"_", "x":12, "y":0},
-                {"label":"+", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0, "w":2},
-                {"label":"Home", "x":16, "y":0},
-                {"label":"ENC", "x":0, "y":1},
-                {"label":"Tab", "x":1, "y":1, "w":1.5},
-                {"label":"Q", "x":2.5, "y":1},
-                {"label":"W", "x":3.5, "y":1},
-                {"label":"E", "x":4.5, "y":1},
-                {"label":"R", "x":5.5, "y":1},
-                {"label":"T", "x":6.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":"|", "x":14.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":16, "y":1},
-                {"label":"M1", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1, "y":2, "w":1.25},
-                {"label":"A", "x":2.75, "y":2},
-                {"label":"S", "x":3.75, "y":2},
-                {"label":"D", "x":4.75, "y":2},
-                {"label":"F", "x":5.75, "y":2},
-                {"label":"G", "x":6.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":"PgUp", "x":16, "y":2},
-                {"label":"M2", "x":0, "y":3},
-                {"label":"Shift", "x":1, "y":3, "w":1.25},
-                {"label":"ISO \\", "x":2.25, "y":3},
-                {"label":"Z", "x":3.25, "y":3},
-                {"label":"X", "x":4.25, "y":3},
-                {"label":"C", "x":5.25, "y":3},
-                {"label":"V", "x":6.25, "y":3},
-                {"label":"B", "x":7.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":"\u2191", "x":15, "y":3},
-                {"label":"PgDn", "x":16, "y":3},
-                {"label":"M3", "x":0, "y":4},
-                {"label":"Ctrl", "x":1, "y":4, "w":1.25},
-                {"label":"Win", "x":2.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":3.5, "y":4, "w":1.25},
-                {"label":"Space", "x":4.75, "y":4, "w":6.25},
-                {"label":"Fn", "x":11, "y":4},
-                {"label":"Alt", "x":12, "y":4},
-                {"label":"Ctrl", "x":13, "y":4},
-                {"label":"\u2190", "x":14, "y":4},
-                {"label":"\u2193", "x":15, "y":4},
-                {"label":"\u2192", "x":16, "y":4}
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 16, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1, "w": 1.5},
+                {"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": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1},
+                {"matrix": [1, 14], "x": 14.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 16, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2, "w": 1.25},
+                {"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": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 16, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.25},
+                {"matrix": [0, 0], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3},
+                {"matrix": [3, 12], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [3, 15], "x": 16, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 4.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 11, "y": 4},
+                {"matrix": [4, 10], "x": 12, "y": 4},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+                {"matrix": [4, 15], "x": 16, "y": 4}
             ]
         },
         "LAYOUT_ansi": {
             "layout": [
-                {"label":"Esc", "x":1, "y":0},
-                {"label":"!", "x":2, "y":0},
-                {"label":"@", "x":3, "y":0},
-                {"label":"#", "x":4, "y":0},
-                {"label":"$", "x":5, "y":0},
-                {"label":"%", "x":6, "y":0},
-                {"label":"^", "x":7, "y":0},
-                {"label":"&", "x":8, "y":0},
-                {"label":"*", "x":9, "y":0},
-                {"label":"(", "x":10, "y":0},
-                {"label":")", "x":11, "y":0},
-                {"label":"_", "x":12, "y":0},
-                {"label":"+", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0, "w":2},
-                {"label":"~", "x":16, "y":0},
-                {"x":0, "y":1},
-                {"label":"Tab", "x":1, "y":1, "w":1.5},
-                {"label":"Q", "x":2.5, "y":1},
-                {"label":"W", "x":3.5, "y":1},
-                {"label":"E", "x":4.5, "y":1},
-                {"label":"R", "x":5.5, "y":1},
-                {"label":"T", "x":6.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":"|", "x":14.5, "y":1, "w":1.5},
-                {"label":"Page Up", "x":16, "y":1},
-                {"x":0, "y":2},
-                {"label":"Caps Lock", "x":1, "y":2, "w":1.25},
-                {"label":"A", "x":2.75, "y":2},
-                {"label":"S", "x":3.75, "y":2},
-                {"label":"D", "x":4.75, "y":2},
-                {"label":"F", "x":5.75, "y":2},
-                {"label":"G", "x":6.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 Down", "x":16, "y":2},
-                {"x":0, "y":3},
-                {"label":"Shift", "x":1, "y":3, "w":2.25},
-                {"label":"Z", "x":3.25, "y":3},
-                {"label":"X", "x":4.25, "y":3},
-                {"label":"C", "x":5.25, "y":3},
-                {"label":"V", "x":6.25, "y":3},
-                {"label":"B", "x":7.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":"\u2191", "x":15, "y":3},
-                {"label":"End", "x":16, "y":3},
-                {"x":0, "y":4},
-                {"label":"Ctrl", "x":1, "y":4, "w":1.25},
-                {"label":"Win", "x":2.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":3.5, "y":4, "w":1.25},
-                {"label":"Space", "x":4.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":11, "y":4},
-                {"label":"Fn", "x":12, "y":4},
-                {"label":"Ctrl", "x":13, "y":4},
-                {"label":"\u2190", "x":14, "y":4},
-                {"label":"\u2193", "x":15, "y":4},
-                {"label":"\u2192", "x":16, "y":4}
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 16, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1, "w": 1.5},
+                {"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": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1},
+                {"matrix": [1, 14], "x": 14.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 16, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2, "w": 1.25},
+                {"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": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 16, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3},
+                {"matrix": [3, 12], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [3, 15], "x": 16, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 4.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 11, "y": 4},
+                {"matrix": [4, 10], "x": 12, "y": 4},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+                {"matrix": [4, 15], "x": 16, "y": 4}
             ]
         },
         "LAYOUT_iso": {
             "layout": [
-                {"label":"Esc", "x":1, "y":0},
-                {"label":"!", "x":2, "y":0},
-                {"label":"@", "x":3, "y":0},
-                {"label":"#", "x":4, "y":0},
-                {"label":"$", "x":5, "y":0},
-                {"label":"%", "x":6, "y":0},
-                {"label":"^", "x":7, "y":0},
-                {"label":"&", "x":8, "y":0},
-                {"label":"*", "x":9, "y":0},
-                {"label":"(", "x":10, "y":0},
-                {"label":")", "x":11, "y":0},
-                {"label":"_", "x":12, "y":0},
-                {"label":"+", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0, "w":2},
-                {"label":"Home", "x":16, "y":0},
-                {"x":0, "y":1},
-                {"label":"Tab", "x":1, "y":1, "w":1.5},
-                {"label":"Q", "x":2.5, "y":1},
-                {"label":"W", "x":3.5, "y":1},
-                {"label":"E", "x":4.5, "y":1},
-                {"label":"R", "x":5.5, "y":1},
-                {"label":"T", "x":6.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":"Delete", "x":16, "y":1},
-                {"x":0, "y":2},
-                {"label":"Caps Lock", "x":1, "y":2, "w":1.25},
-                {"label":"A", "x":2.75, "y":2},
-                {"label":"S", "x":3.75, "y":2},
-                {"label":"D", "x":4.75, "y":2},
-                {"label":"F", "x":5.75, "y":2},
-                {"label":"G", "x":6.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":"~", "x":13.75, "y":2},
-                {"label":"Enter", "x":14.75, "y":1, "w":1.25, "h":2},
-                {"label":"Page Up", "x":16, "y":2},
-                {"x":0, "y":3},
-                {"label":"Shift", "x":1, "y":3, "w":1.25},
-                {"label":"|", "x":2.25, "y":3},
-                {"label":"Z", "x":3.25, "y":3},
-                {"label":"X", "x":4.25, "y":3},
-                {"label":"C", "x":5.25, "y":3},
-                {"label":"V", "x":6.25, "y":3},
-                {"label":"B", "x":7.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":"\u2191", "x":15, "y":3},
-                {"label":"Page Down", "x":16, "y":3},
-                {"x":0, "y":4},
-                {"label":"Ctrl", "x":1, "y":4, "w":1.25},
-                {"label":"Win", "x":2.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":3.5, "y":4, "w":1.25},
-                {"label":"Space", "x":4.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":11, "y":4},
-                {"label":"Fn", "x":12, "y":4},
-                {"label":"Ctrl", "x":13, "y":4},
-                {"label":"\u2190", "x":14, "y":4},
-                {"label":"\u2193", "x":15, "y":4},
-                {"label":"\u2192", "x":16, "y":4}
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 16, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1, "w": 1.5},
+                {"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": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1},
+                {"matrix": [1, 15], "x": 16, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2, "w": 1.25},
+                {"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": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 2},
+                {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 16, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.25},
+                {"matrix": [0, 0], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3},
+                {"matrix": [3, 12], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [3, 15], "x": 16, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 4.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 11, "y": 4},
+                {"matrix": [4, 10], "x": 12, "y": 4},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+                {"matrix": [4, 15], "x": 16, "y": 4}
             ]
         }
     }
diff --git a/keyboards/nullbitsco/nibble/nibble.h b/keyboards/nullbitsco/nibble/nibble.h
index 58ac804451..c1fa22e0c1 100644
--- a/keyboards/nullbitsco/nibble/nibble.h
+++ b/keyboards/nullbitsco/nibble/nibble.h
@@ -15,50 +15,6 @@
  */
 #pragma once
 
-#define ___ KC_NO
-
 #include "quantum.h"
 #include "common/remote_kb.h"
 #include "common/bitc_led.h"
-
-#define LAYOUT_all( \
-          K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
-    K11,  K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
-    K21,  K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, K2G, \
-    K31,  K32, K01, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, K3G, \
-    K41,  K42, K43, K44,                K47,           K4A, K4B, K4C, K4D, K4F, K4G  \
-) { \
-   {K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G}, \
-   {K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G}, \
-   {K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F, K2G}, \
-   {K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, K3F, K3G}, \
-   {K41, K42, K43, K44, ___, ___, K47, ___, ___, K4A, K4B, K4C, K4D, ___, K4F, K4G}, \
-}
-
-#define LAYOUT_ansi( \
-          K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
-    K11,  K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
-    K21,  K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, K2G, \
-    K31,  K32,      K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, K3G, \
-    K41,  K42, K43, K44,                K47,           K4A, K4B, K4C, K4D, K4F, K4G  \
-) { \
-   {___, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G}, \
-   {K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G}, \
-   {K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F, K2G}, \
-   {K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, K3F, K3G}, \
-   {K41, K42, K43, K44, ___, ___, K47, ___, ___, K4A, K4B, K4C, K4D, ___, K4F, K4G}, \
-}
-
-#define LAYOUT_iso( \
-          K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
-    K11,  K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,      K1G, \
-    K21,  K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, K1F, K2G, \
-    K31,  K32, K01, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, K3G, \
-    K41,  K42, K43, K44,                K47,           K4A, K4B, K4C, K4D, K4F, K4G  \
-) { \
-   {K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G}, \
-   {K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G}, \
-   {K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F, K2G}, \
-   {K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, K3F, K3G}, \
-   {K41, K42, K43, K44, ___, ___, K47, ___, ___, K4A, K4B, K4C, K4D, ___, K4F, K4G}, \
-}