[Keyboard] nullbitsco/nibble Configurator rework (#10814)

* nullbitsco/nibble: rework LAYOUT_all

... and update via keymap accordingly.

* compress info.json LAYOUT_all tree

Only changes the white space.

* rebuild info.json LAYOUT_all tree

Note: this commit makes the visual layout the ANSI layout with a split left Shift, instead of being the same as the ISO layout.

* unify code styles

Make logically-unchanged code blocks similar in appearance to logically-changed blocks.

* correct LAYOUT_iso key sequence

Move ISO Enter's object to its proper place.

3 files changed, 247 insertions, 1140 deletions

diff --git a/keyboards/nullbitsco/nibble/info.json b/keyboards/nullbitsco/nibble/info.json
index bd97361e7c..fe4bf59fca 100644
--- a/keyboards/nullbitsco/nibble/info.json
+++ b/keyboards/nullbitsco/nibble/info.json
@@ -6,1125 +6,232 @@
     "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
-                },
-                {
-                    "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": "Enter",
-                    "x": 14.75,
-                    "y": 1,
-                    "w": 1.25,
-                    "h": 2
-                },
-                {
-                    "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": "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
-                }
+                {"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}
             ]
         },
         "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
-                }
+                {"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}
             ]
         },
         "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": "Enter",
-                    "x": 14.75,
-                    "y": 1,
-                    "w": 1.25,
-                    "h": 2
-                },
-                {
-                    "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": "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
-                }
+                {"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}
             ]
         }
     }
diff --git a/keyboards/nullbitsco/nibble/keymaps/via/keymap.c b/keyboards/nullbitsco/nibble/keymaps/via/keymap.c
index 1e1b0c0369..f72ffc56e1 100644
--- a/keyboards/nullbitsco/nibble/keymaps/via/keymap.c
+++ b/keyboards/nullbitsco/nibble/keymaps/via/keymap.c
@@ -42,35 +42,35 @@ bool deafened = false;
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_all(
-    KC_NUBS,   KC_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_BSPC, KC_HOME,
-    KC_F13,    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_DEL,
-    KC_F14,    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_F15,    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_F16,    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                  MO(_VIA1), KC_RALT, KC_RCTL, KC_LEFT,          KC_DOWN, KC_RGHT
+              KC_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_BSPC, KC_HOME,
+    KC_F13,   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_DEL,
+    KC_F14,   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_F15,   KC_LSFT, KC_NUBS, 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_F16,   KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                  MO(_VIA1), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
   ),
 
   [_VIA1] = LAYOUT_all(
-    _______,  RESET,   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_HOME,  KC_INS,
+              RESET,   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_HOME,  KC_INS,
     RGB_TOG,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-    _______,  _______, _______, _______,                   _______,                   _______, _______, _______, KC_MPRV,          KC_MPLY, KC_MNXT
+    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______, _______, _______,                            _______,                   _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT
   ),
 
   [_VIA2] = LAYOUT_all(
+              _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
     _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-    _______,  _______, _______, _______,                   _______,                   _______, _______, _______, _______,          _______, _______
+    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
   ),
 
   [_VIA3] = LAYOUT_all(
-    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+              _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-    _______,  _______, _______, _______,                   _______,                   _______, _______, _______, _______,          _______, _______
+    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
   ),
 
 };
diff --git a/keyboards/nullbitsco/nibble/nibble.h b/keyboards/nullbitsco/nibble/nibble.h
index 9744ae745c..f6537b8b31 100644
--- a/keyboards/nullbitsco/nibble/nibble.h
+++ b/keyboards/nullbitsco/nibble/nibble.h
@@ -21,11 +21,11 @@
 #include "remote_kb.h"
 
 #define LAYOUT_all( \
-    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  \
+          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}, \
@@ -35,11 +35,11 @@
 }
 
 #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  \
 ) { \
    {___, 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}, \
@@ -49,11 +49,11 @@
 }
 
 #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, K1F, 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  \
+          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, K1F, 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}, \