Fix error_log complaint about Preonic layouts (#9443)

2 files changed, 432 insertions, 426 deletions

diff --git a/keyboards/preonic/rev3/info.json b/keyboards/preonic/rev3/info.json
index b1ad1227e1..fd72055e19 100644
--- a/keyboards/preonic/rev3/info.json
+++ b/keyboards/preonic/rev3/info.json
@@ -1,330 +1,345 @@
 {
-  "keyboard_name": "Preonic rev. 3",
-  "keyboard_folder": "preonic/rev3",
-  "url": "https://olkb.com/preonic",
-  "maintainer": "jackhumbert",
-  "width": 12,
-  "height": 5,
-  "layouts": {
-    "LAYOUT_preonic_1x2uC": {
-      "key_count": 59,
-      "layout": [
-        {"label":"k00", "x":0, "y":0},
-        {"label":"k01", "x":1, "y":0},
-        {"label":"k02", "x":2, "y":0},
-        {"label":"k03", "x":3, "y":0},
-        {"label":"k04", "x":4, "y":0},
-        {"label":"k05", "x":5, "y":0},
-        {"label":"k06", "x":6, "y":0},
-        {"label":"k07", "x":7, "y":0},
-        {"label":"k08", "x":8, "y":0},
-        {"label":"k09", "x":9, "y":0},
-        {"label":"k0a", "x":10, "y":0},
-        {"label":"k0b", "x":11, "y":0},
-        {"label":"k10", "x":0, "y":1},
-        {"label":"k11", "x":1, "y":1},
-        {"label":"k12", "x":2, "y":1},
-        {"label":"k13", "x":3, "y":1},
-        {"label":"k14", "x":4, "y":1},
-        {"label":"k15", "x":5, "y":1},
-        {"label":"k16", "x":6, "y":1},
-        {"label":"k17", "x":7, "y":1},
-        {"label":"k18", "x":8, "y":1},
-        {"label":"k19", "x":9, "y":1},
-        {"label":"k1a", "x":10, "y":1},
-        {"label":"k1b", "x":11, "y":1},
-        {"label":"k20", "x":0, "y":2},
-        {"label":"k21", "x":1, "y":2},
-        {"label":"k22", "x":2, "y":2},
-        {"label":"k23", "x":3, "y":2},
-        {"label":"k24", "x":4, "y":2},
-        {"label":"k25", "x":5, "y":2},
-        {"label":"k26", "x":6, "y":2},
-        {"label":"k27", "x":7, "y":2},
-        {"label":"k28", "x":8, "y":2},
-        {"label":"k29", "x":9, "y":2},
-        {"label":"k2a", "x":10, "y":2},
-        {"label":"k2b", "x":11, "y":2},
-        {"label":"k30", "x":0, "y":3},
-        {"label":"k31", "x":1, "y":3},
-        {"label":"k32", "x":2, "y":3},
-        {"label":"k33", "x":3, "y":3},
-        {"label":"k34", "x":4, "y":3},
-        {"label":"k35", "x":5, "y":3},
-        {"label":"k36", "x":6, "y":3},
-        {"label":"k37", "x":7, "y":3},
-        {"label":"k38", "x":8, "y":3},
-        {"label":"k39", "x":9, "y":3},
-        {"label":"k3a", "x":10, "y":3},
-        {"label":"k3b", "x":11, "y":3},
-        {"label":"k40", "x":0, "y":4},
-        {"label":"k41", "x":1, "y":4},
-        {"label":"k42", "x":2, "y":4},
-        {"label":"k43", "x":3, "y":4},
-        {"label":"k44", "x":4, "y":4},
-        {"label":"k45", "x":5, "y":4, "w":2},
-        {"label":"k47", "x":7, "y":4},
-        {"label":"k48", "x":8, "y":4},
-        {"label":"k49", "x":9, "y":4},
-        {"label":"k4a", "x":10, "y":4},
-        {"label":"k4b", "x":11, "y":4}
-      ]
-    },
-    "LAYOUT_preonic_1x2uR": {
-      "key_count": 59,
-      "layout": [
-        {"label":"k00", "x":0, "y":0},
-        {"label":"k01", "x":1, "y":0},
-        {"label":"k02", "x":2, "y":0},
-        {"label":"k03", "x":3, "y":0},
-        {"label":"k04", "x":4, "y":0},
-        {"label":"k05", "x":5, "y":0},
-        {"label":"k06", "x":6, "y":0},
-        {"label":"k07", "x":7, "y":0},
-        {"label":"k08", "x":8, "y":0},
-        {"label":"k09", "x":9, "y":0},
-        {"label":"k0a", "x":10, "y":0},
-        {"label":"k0b", "x":11, "y":0},
-        {"label":"k10", "x":0, "y":1},
-        {"label":"k11", "x":1, "y":1},
-        {"label":"k12", "x":2, "y":1},
-        {"label":"k13", "x":3, "y":1},
-        {"label":"k14", "x":4, "y":1},
-        {"label":"k15", "x":5, "y":1},
-        {"label":"k16", "x":6, "y":1},
-        {"label":"k17", "x":7, "y":1},
-        {"label":"k18", "x":8, "y":1},
-        {"label":"k19", "x":9, "y":1},
-        {"label":"k1a", "x":10, "y":1},
-        {"label":"k1b", "x":11, "y":1},
-        {"label":"k20", "x":0, "y":2},
-        {"label":"k21", "x":1, "y":2},
-        {"label":"k22", "x":2, "y":2},
-        {"label":"k23", "x":3, "y":2},
-        {"label":"k24", "x":4, "y":2},
-        {"label":"k25", "x":5, "y":2},
-        {"label":"k26", "x":6, "y":2},
-        {"label":"k27", "x":7, "y":2},
-        {"label":"k28", "x":8, "y":2},
-        {"label":"k29", "x":9, "y":2},
-        {"label":"k2a", "x":10, "y":2},
-        {"label":"k2b", "x":11, "y":2},
-        {"label":"k30", "x":0, "y":3},
-        {"label":"k31", "x":1, "y":3},
-        {"label":"k32", "x":2, "y":3},
-        {"label":"k33", "x":3, "y":3},
-        {"label":"k34", "x":4, "y":3},
-        {"label":"k35", "x":5, "y":3},
-        {"label":"k36", "x":6, "y":3},
-        {"label":"k37", "x":7, "y":3},
-        {"label":"k38", "x":8, "y":3},
-        {"label":"k39", "x":9, "y":3},
-        {"label":"k3a", "x":10, "y":3},
-        {"label":"k3b", "x":11, "y":3},
-        {"label":"k40", "x":0, "y":4},
-        {"label":"k41", "x":1, "y":4},
-        {"label":"k42", "x":2, "y":4},
-        {"label":"k43", "x":3, "y":4},
-        {"label":"k44", "x":4, "y":4},
-        {"label":"k45", "x":5, "y":4},
-        {"label":"k47", "x":6, "y":4, "w":2},
-        {"label":"k48", "x":8, "y":4},
-        {"label":"k49", "x":9, "y":4},
-        {"label":"k4a", "x":10, "y":4},
-        {"label":"k4b", "x":11, "y":4}
-      ]
-    },
-    "LAYOUT_preonic_1x2uL": {
-      "key_count": 59,
-      "layout": [
-        {"label":"k00", "x":0, "y":0},
-        {"label":"k01", "x":1, "y":0},
-        {"label":"k02", "x":2, "y":0},
-        {"label":"k03", "x":3, "y":0},
-        {"label":"k04", "x":4, "y":0},
-        {"label":"k05", "x":5, "y":0},
-        {"label":"k06", "x":6, "y":0},
-        {"label":"k07", "x":7, "y":0},
-        {"label":"k08", "x":8, "y":0},
-        {"label":"k09", "x":9, "y":0},
-        {"label":"k0a", "x":10, "y":0},
-        {"label":"k0b", "x":11, "y":0},
-        {"label":"k10", "x":0, "y":1},
-        {"label":"k11", "x":1, "y":1},
-        {"label":"k12", "x":2, "y":1},
-        {"label":"k13", "x":3, "y":1},
-        {"label":"k14", "x":4, "y":1},
-        {"label":"k15", "x":5, "y":1},
-        {"label":"k16", "x":6, "y":1},
-        {"label":"k17", "x":7, "y":1},
-        {"label":"k18", "x":8, "y":1},
-        {"label":"k19", "x":9, "y":1},
-        {"label":"k1a", "x":10, "y":1},
-        {"label":"k1b", "x":11, "y":1},
-        {"label":"k20", "x":0, "y":2},
-        {"label":"k21", "x":1, "y":2},
-        {"label":"k22", "x":2, "y":2},
-        {"label":"k23", "x":3, "y":2},
-        {"label":"k24", "x":4, "y":2},
-        {"label":"k25", "x":5, "y":2},
-        {"label":"k26", "x":6, "y":2},
-        {"label":"k27", "x":7, "y":2},
-        {"label":"k28", "x":8, "y":2},
-        {"label":"k29", "x":9, "y":2},
-        {"label":"k2a", "x":10, "y":2},
-        {"label":"k2b", "x":11, "y":2},
-        {"label":"k30", "x":0, "y":3},
-        {"label":"k31", "x":1, "y":3},
-        {"label":"k32", "x":2, "y":3},
-        {"label":"k33", "x":3, "y":3},
-        {"label":"k34", "x":4, "y":3},
-        {"label":"k35", "x":5, "y":3},
-        {"label":"k36", "x":6, "y":3},
-        {"label":"k37", "x":7, "y":3},
-        {"label":"k38", "x":8, "y":3},
-        {"label":"k39", "x":9, "y":3},
-        {"label":"k3a", "x":10, "y":3},
-        {"label":"k3b", "x":11, "y":3},
-        {"label":"k40", "x":0, "y":4},
-        {"label":"k41", "x":1, "y":4},
-        {"label":"k42", "x":2, "y":4},
-        {"label":"k43", "x":3, "y":4},
-        {"label":"k44", "x":4, "y":4, "w":2},
-        {"label":"k46", "x":6, "y":4},
-        {"label":"k47", "x":7, "y":4},
-        {"label":"k48", "x":8, "y":4},
-        {"label":"k49", "x":9, "y":4},
-        {"label":"k4a", "x":10, "y":4},
-        {"label":"k4b", "x":11, "y":4}
-      ]
-    },
-    "LAYOUT_preonic_2x2u": {
-      "key_count": 58,
-      "layout": [
-        {"label":"k00", "x":0, "y":0},
-        {"label":"k01", "x":1, "y":0},
-        {"label":"k02", "x":2, "y":0},
-        {"label":"k03", "x":3, "y":0},
-        {"label":"k04", "x":4, "y":0},
-        {"label":"k05", "x":5, "y":0},
-        {"label":"k06", "x":6, "y":0},
-        {"label":"k07", "x":7, "y":0},
-        {"label":"k08", "x":8, "y":0},
-        {"label":"k09", "x":9, "y":0},
-        {"label":"k0a", "x":10, "y":0},
-        {"label":"k0b", "x":11, "y":0},
-        {"label":"k10", "x":0, "y":1},
-        {"label":"k11", "x":1, "y":1},
-        {"label":"k12", "x":2, "y":1},
-        {"label":"k13", "x":3, "y":1},
-        {"label":"k14", "x":4, "y":1},
-        {"label":"k15", "x":5, "y":1},
-        {"label":"k16", "x":6, "y":1},
-        {"label":"k17", "x":7, "y":1},
-        {"label":"k18", "x":8, "y":1},
-        {"label":"k19", "x":9, "y":1},
-        {"label":"k1a", "x":10, "y":1},
-        {"label":"k1b", "x":11, "y":1},
-        {"label":"k20", "x":0, "y":2},
-        {"label":"k21", "x":1, "y":2},
-        {"label":"k22", "x":2, "y":2},
-        {"label":"k23", "x":3, "y":2},
-        {"label":"k24", "x":4, "y":2},
-        {"label":"k25", "x":5, "y":2},
-        {"label":"k26", "x":6, "y":2},
-        {"label":"k27", "x":7, "y":2},
-        {"label":"k28", "x":8, "y":2},
-        {"label":"k29", "x":9, "y":2},
-        {"label":"k2a", "x":10, "y":2},
-        {"label":"k2b", "x":11, "y":2},
-        {"label":"k30", "x":0, "y":3},
-        {"label":"k31", "x":1, "y":3},
-        {"label":"k32", "x":2, "y":3},
-        {"label":"k33", "x":3, "y":3},
-        {"label":"k34", "x":4, "y":3},
-        {"label":"k35", "x":5, "y":3},
-        {"label":"k36", "x":6, "y":3},
-        {"label":"k37", "x":7, "y":3},
-        {"label":"k38", "x":8, "y":3},
-        {"label":"k39", "x":9, "y":3},
-        {"label":"k3a", "x":10, "y":3},
-        {"label":"k3b", "x":11, "y":3},
-        {"label":"k40", "x":0, "y":4},
-        {"label":"k41", "x":1, "y":4},
-        {"label":"k42", "x":2, "y":4},
-        {"label":"k43", "x":3, "y":4},
-        {"label":"k44", "x":4, "y":4, "w":2},
-        {"label":"k46", "x":6, "y":4, "w":2},
-        {"label":"k48", "x":8, "y":4},
-        {"label":"k49", "x":9, "y":4},
-        {"label":"k4a", "x":10, "y":4},
-        {"label":"k4b", "x":11, "y":4}
-      ]
-    },
-    "LAYOUT_ortho_5x12": {
-      "key_count": 60,
-      "layout": [
-        {"label":"k00", "x":0, "y":0},
-        {"label":"k01", "x":1, "y":0},
-        {"label":"k02", "x":2, "y":0},
-        {"label":"k03", "x":3, "y":0},
-        {"label":"k04", "x":4, "y":0},
-        {"label":"k05", "x":5, "y":0},
-        {"label":"k06", "x":6, "y":0},
-        {"label":"k07", "x":7, "y":0},
-        {"label":"k08", "x":8, "y":0},
-        {"label":"k09", "x":9, "y":0},
-        {"label":"k0a", "x":10, "y":0},
-        {"label":"k0b", "x":11, "y":0},
-        {"label":"k10", "x":0, "y":1},
-        {"label":"k11", "x":1, "y":1},
-        {"label":"k12", "x":2, "y":1},
-        {"label":"k13", "x":3, "y":1},
-        {"label":"k14", "x":4, "y":1},
-        {"label":"k15", "x":5, "y":1},
-        {"label":"k16", "x":6, "y":1},
-        {"label":"k17", "x":7, "y":1},
-        {"label":"k18", "x":8, "y":1},
-        {"label":"k19", "x":9, "y":1},
-        {"label":"k1a", "x":10, "y":1},
-        {"label":"k1b", "x":11, "y":1},
-        {"label":"k20", "x":0, "y":2},
-        {"label":"k21", "x":1, "y":2},
-        {"label":"k22", "x":2, "y":2},
-        {"label":"k23", "x":3, "y":2},
-        {"label":"k24", "x":4, "y":2},
-        {"label":"k25", "x":5, "y":2},
-        {"label":"k26", "x":6, "y":2},
-        {"label":"k27", "x":7, "y":2},
-        {"label":"k28", "x":8, "y":2},
-        {"label":"k29", "x":9, "y":2},
-        {"label":"k2a", "x":10, "y":2},
-        {"label":"k2b", "x":11, "y":2},
-        {"label":"k30", "x":0, "y":3},
-        {"label":"k31", "x":1, "y":3},
-        {"label":"k32", "x":2, "y":3},
-        {"label":"k33", "x":3, "y":3},
-        {"label":"k34", "x":4, "y":3},
-        {"label":"k35", "x":5, "y":3},
-        {"label":"k36", "x":6, "y":3},
-        {"label":"k37", "x":7, "y":3},
-        {"label":"k38", "x":8, "y":3},
-        {"label":"k39", "x":9, "y":3},
-        {"label":"k3a", "x":10, "y":3},
-        {"label":"k3b", "x":11, "y":3},
-        {"label":"k40", "x":0, "y":4},
-        {"label":"k41", "x":1, "y":4},
-        {"label":"k42", "x":2, "y":4},
-        {"label":"k43", "x":3, "y":4},
-        {"label":"k44", "x":4, "y":4},
-        {"label":"k45", "x":5, "y":4},
-        {"label":"k46", "x":6, "y":4},
-        {"label":"k47", "x":7, "y":4},
-        {"label":"k48", "x":8, "y":4},
-        {"label":"k49", "x":9, "y":4},
-        {"label":"k4a", "x":10, "y":4},
-        {"label":"k4b", "x":11, "y":4}
-      ]
+    "keyboard_name": "Preonic rev. 3",
+    "keyboard_folder": "preonic/rev3",
+    "url": "https://olkb.com/preonic",
+    "maintainer": "jackhumbert",
+    "width": 12,
+    "height": 5,
+    "layouts": {
+        "LAYOUT_preonic_1x2uC": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+                {"x": 6, "y": 1},
+                {"x": 7, "y": 1},
+                {"x": 8, "y": 1},
+                {"x": 9, "y": 1},
+                {"x": 10, "y": 1},
+                {"x": 11, "y": 1},
+
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+                {"x": 6, "y": 2},
+                {"x": 7, "y": 2},
+                {"x": 8, "y": 2},
+                {"x": 9, "y": 2},
+                {"x": 10, "y": 2},
+                {"x": 11, "y": 2},
+
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3},
+                {"x": 5, "y": 3},
+                {"x": 6, "y": 3},
+                {"x": 7, "y": 3},
+                {"x": 8, "y": 3},
+                {"x": 9, "y": 3},
+                {"x": 10, "y": 3},
+                {"x": 11, "y": 3},
+
+                {"x": 0, "y": 4},
+                {"x": 1, "y": 4},
+                {"x": 2, "y": 4},
+                {"x": 3, "y": 4},
+                {"x": 4, "y": 4},
+                {"x": 5, "y": 4, "w": 2},
+                {"x": 7, "y": 4},
+                {"x": 8, "y": 4},
+                {"x": 9, "y": 4},
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4}
+            ]
+        },
+        "LAYOUT_preonic_1x2uR": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+                {"x": 6, "y": 1},
+                {"x": 7, "y": 1},
+                {"x": 8, "y": 1},
+                {"x": 9, "y": 1},
+                {"x": 10, "y": 1},
+                {"x": 11, "y": 1},
+
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+                {"x": 6, "y": 2},
+                {"x": 7, "y": 2},
+                {"x": 8, "y": 2},
+                {"x": 9, "y": 2},
+                {"x": 10, "y": 2},
+                {"x": 11, "y": 2},
+
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3},
+                {"x": 5, "y": 3},
+                {"x": 6, "y": 3},
+                {"x": 7, "y": 3},
+                {"x": 8, "y": 3},
+                {"x": 9, "y": 3},
+                {"x": 10, "y": 3},
+                {"x": 11, "y": 3},
+
+                {"x": 0, "y": 4},
+                {"x": 1, "y": 4},
+                {"x": 2, "y": 4},
+                {"x": 3, "y": 4},
+                {"x": 4, "y": 4},
+                {"x": 5, "y": 4},
+                {"x": 6, "y": 4, "w": 2},
+                {"x": 8, "y": 4},
+                {"x": 9, "y": 4},
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4}
+            ]
+        },
+        "LAYOUT_preonic_1x2uL": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+                {"x": 6, "y": 1},
+                {"x": 7, "y": 1},
+                {"x": 8, "y": 1},
+                {"x": 9, "y": 1},
+                {"x": 10, "y": 1},
+                {"x": 11, "y": 1},
+
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+                {"x": 6, "y": 2},
+                {"x": 7, "y": 2},
+                {"x": 8, "y": 2},
+                {"x": 9, "y": 2},
+                {"x": 10, "y": 2},
+                {"x": 11, "y": 2},
+
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3},
+                {"x": 5, "y": 3},
+                {"x": 6, "y": 3},
+                {"x": 7, "y": 3},
+                {"x": 8, "y": 3},
+                {"x": 9, "y": 3},
+                {"x": 10, "y": 3},
+                {"x": 11, "y": 3},
+
+                {"x": 0, "y": 4},
+                {"x": 1, "y": 4},
+                {"x": 2, "y": 4},
+                {"x": 3, "y": 4},
+                {"x": 4, "y": 4, "w": 2},
+                {"x": 6, "y": 4},
+                {"x": 7, "y": 4},
+                {"x": 8, "y": 4},
+                {"x": 9, "y": 4},
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4}
+            ]
+        },
+        "LAYOUT_preonic_2x2u": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+                {"x": 6, "y": 1},
+                {"x": 7, "y": 1},
+                {"x": 8, "y": 1},
+                {"x": 9, "y": 1},
+                {"x": 10, "y": 1},
+                {"x": 11, "y": 1},
+
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+                {"x": 6, "y": 2},
+                {"x": 7, "y": 2},
+                {"x": 8, "y": 2},
+                {"x": 9, "y": 2},
+                {"x": 10, "y": 2},
+                {"x": 11, "y": 2},
+
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3},
+                {"x": 5, "y": 3},
+                {"x": 6, "y": 3},
+                {"x": 7, "y": 3},
+                {"x": 8, "y": 3},
+                {"x": 9, "y": 3},
+                {"x": 10, "y": 3},
+                {"x": 11, "y": 3},
+
+                {"x": 0, "y": 4},
+                {"x": 1, "y": 4},
+                {"x": 2, "y": 4},
+                {"x": 3, "y": 4},
+                {"x": 4, "y": 4, "w": 2},
+                {"x": 6, "y": 4, "w": 2},
+                {"x": 8, "y": 4},
+                {"x": 9, "y": 4},
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4}
+            ]
+        },
+        "LAYOUT_ortho_5x12": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+                {"x": 6, "y": 1},
+                {"x": 7, "y": 1},
+                {"x": 8, "y": 1},
+                {"x": 9, "y": 1},
+                {"x": 10, "y": 1},
+                {"x": 11, "y": 1},
+
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+                {"x": 6, "y": 2},
+                {"x": 7, "y": 2},
+                {"x": 8, "y": 2},
+                {"x": 9, "y": 2},
+                {"x": 10, "y": 2},
+                {"x": 11, "y": 2},
+
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3},
+                {"x": 5, "y": 3},
+                {"x": 6, "y": 3},
+                {"x": 7, "y": 3},
+                {"x": 8, "y": 3},
+                {"x": 9, "y": 3},
+                {"x": 10, "y": 3},
+                {"x": 11, "y": 3},
+
+                {"x": 0, "y": 4},
+                {"x": 1, "y": 4},
+                {"x": 2, "y": 4},
+                {"x": 3, "y": 4},
+                {"x": 4, "y": 4},
+                {"x": 5, "y": 4},
+                {"x": 6, "y": 4},
+                {"x": 7, "y": 4},
+                {"x": 8, "y": 4},
+                {"x": 9, "y": 4},
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4}
+            ]
+        }
     }
-  }
 }
diff --git a/keyboards/preonic/rev3/rev3.h b/keyboards/preonic/rev3/rev3.h
index af97239fd1..e6462d5b75 100644
--- a/keyboards/preonic/rev3/rev3.h
+++ b/keyboards/preonic/rev3/rev3.h
@@ -18,106 +18,97 @@
 
 #include "preonic.h"
 
-#ifndef __AVR__ // Preonic rev. 3 and later
+#define LAYOUT_preonic_1x2uC( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
+    k40, k41, k42, k43, k44,    k45,   k47, k48, k49, k4a, k4b \
+) { \
+    { k00, k01, k02, k03, k04, k05 }, \
+    { k10, k11, k12, k13, k14, k15 }, \
+    { k20, k21, k22, k23, k24, k25 }, \
+    { k30, k31, k32, k33, k34, k35 }, \
+    { k06, k07, k08, k09, k0a, k0b }, \
+    { k16, k17, k18, k19, k1a, k1b }, \
+    { k26, k27, k28, k29, k2a, k2b }, \
+    { k36, k37, k38, k39, k3a, k3b }, \
+    { k40, k41, k42, k49, k4a, k4b }, \
+    { k45, k47, k48, k43, k44, k45 } \
+}
 
-	#define LAYOUT_preonic_1x2uC( \
-	  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-	  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-	  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-	  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-	  k40, k41, k42, k43, k44,    k45,   k47, k48, k49, k4a, k4b \
-  ) \
-  { \
-	  { k00, k01, k02, k03, k04, k05 }, \
-	  { k10, k11, k12, k13, k14, k15 }, \
-	  { k20, k21, k22, k23, k24, k25 }, \
-	  { k30, k31, k32, k33, k34, k35 }, \
-	  { k06, k07, k08, k09, k0a, k0b }, \
-	  { k16, k17, k18, k19, k1a, k1b }, \
-	  { k26, k27, k28, k29, k2a, k2b }, \
-	  { k36, k37, k38, k39, k3a, k3b }, \
-	  { k40, k41, k42, k49, k4a, k4b }, \
-	  { k45, k47, k48, k43, k44, k45 } \
-  }
+#define LAYOUT_preonic_1x2uR( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
+    k40, k41, k42, k43, k44, k45,   k47,    k48, k49, k4a, k4b \
+  ) { \
+    { k00, k01, k02, k03, k04, k05 }, \
+    { k10, k11, k12, k13, k14, k15 }, \
+    { k20, k21, k22, k23, k24, k25 }, \
+    { k30, k31, k32, k33, k34, k35 }, \
+    { k06, k07, k08, k09, k0a, k0b }, \
+    { k16, k17, k18, k19, k1a, k1b }, \
+    { k26, k27, k28, k29, k2a, k2b }, \
+    { k36, k37, k38, k39, k3a, k3b }, \
+    { k40, k41, k42, k49, k4a, k4b }, \
+    { k47, k47, k48, k43, k44, k45 } \
+}
 
-  #define LAYOUT_preonic_1x2uR( \
-	  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-	  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-	  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-	  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-	  k40, k41, k42, k43, k44, k45,   k47,    k48, k49, k4a, k4b \
-  ) \
-  { \
-	  { k00, k01, k02, k03, k04, k05 }, \
-	  { k10, k11, k12, k13, k14, k15 }, \
-	  { k20, k21, k22, k23, k24, k25 }, \
-	  { k30, k31, k32, k33, k34, k35 }, \
-	  { k06, k07, k08, k09, k0a, k0b }, \
-	  { k16, k17, k18, k19, k1a, k1b }, \
-	  { k26, k27, k28, k29, k2a, k2b }, \
-	  { k36, k37, k38, k39, k3a, k3b }, \
-	  { k40, k41, k42, k49, k4a, k4b }, \
-	  { k47, k47, k48, k43, k44, k45 } \
-  }
+#define LAYOUT_preonic_1x2uL( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
+    k40, k41, k42, k43,   k44,    k46, k47, k48, k49, k4a, k4b \
+) { \
+    { k00, k01, k02, k03, k04, k05 }, \
+    { k10, k11, k12, k13, k14, k15 }, \
+    { k20, k21, k22, k23, k24, k25 }, \
+    { k30, k31, k32, k33, k34, k35 }, \
+    { k06, k07, k08, k09, k0a, k0b }, \
+    { k16, k17, k18, k19, k1a, k1b }, \
+    { k26, k27, k28, k29, k2a, k2b }, \
+    { k36, k37, k38, k39, k3a, k3b }, \
+    { k40, k41, k42, k49, k4a, k4b }, \
+    { k46, k47, k48, k43, k44, k44 } \
+}
 
-  #define LAYOUT_preonic_1x2uL( \
-	  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-	  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-	  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-	  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-	  k40, k41, k42, k43,   k44,    k46, k47, k48, k49, k4a, k4b \
-  ) \
-  { \
-	  { k00, k01, k02, k03, k04, k05 }, \
-	  { k10, k11, k12, k13, k14, k15 }, \
-	  { k20, k21, k22, k23, k24, k25 }, \
-	  { k30, k31, k32, k33, k34, k35 }, \
-	  { k06, k07, k08, k09, k0a, k0b }, \
-	  { k16, k17, k18, k19, k1a, k1b }, \
-	  { k26, k27, k28, k29, k2a, k2b }, \
-	  { k36, k37, k38, k39, k3a, k3b }, \
-	  { k40, k41, k42, k49, k4a, k4b }, \
-	  { k46, k47, k48, k43, k44, k44 } \
-  }
+#define LAYOUT_preonic_2x2u( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
+    k40, k41, k42, k43,   k44,      k46,    k48, k49, k4a, k4b \
+) { \
+    { k00, k01, k02, k03, k04, k05 }, \
+    { k10, k11, k12, k13, k14, k15 }, \
+    { k20, k21, k22, k23, k24, k25 }, \
+    { k30, k31, k32, k33, k34, k35 }, \
+    { k06, k07, k08, k09, k0a, k0b }, \
+    { k16, k17, k18, k19, k1a, k1b }, \
+    { k26, k27, k28, k29, k2a, k2b }, \
+    { k36, k37, k38, k39, k3a, k3b }, \
+    { k40, k41, k42, k49, k4a, k4b }, \
+    { k46, k46, k48, k43, k44, k44 } \
+}
 
-  #define LAYOUT_preonic_2x2u( \
-	  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-	  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-	  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-	  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-	  k40, k41, k42, k43,   k44,      k46,    k48, k49, k4a, k4b \
-  ) \
-  { \
-	  { k00, k01, k02, k03, k04, k05 }, \
-	  { k10, k11, k12, k13, k14, k15 }, \
-	  { k20, k21, k22, k23, k24, k25 }, \
-	  { k30, k31, k32, k33, k34, k35 }, \
-	  { k06, k07, k08, k09, k0a, k0b }, \
-	  { k16, k17, k18, k19, k1a, k1b }, \
-	  { k26, k27, k28, k29, k2a, k2b }, \
-	  { k36, k37, k38, k39, k3a, k3b }, \
-	  { k40, k41, k42, k49, k4a, k4b }, \
-	  { k46, k46, k48, k43, k44, k44 } \
-  }
-
-  #define LAYOUT_preonic_grid( \
-	  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-	  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-	  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-	  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-	  k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \
-  ) \
-  { \
-	  { k00, k01, k02, k03, k04, k05 }, \
-	  { k10, k11, k12, k13, k14, k15 }, \
-	  { k20, k21, k22, k23, k24, k25 }, \
-	  { k30, k31, k32, k33, k34, k35 }, \
-	  { k06, k07, k08, k09, k0a, k0b }, \
-	  { k16, k17, k18, k19, k1a, k1b }, \
-	  { k26, k27, k28, k29, k2a, k2b }, \
-	  { k36, k37, k38, k39, k3a, k3b }, \
-	  { k40, k41, k42, k49, k4a, k4b }, \
-	  { k46, k47, k48, k43, k44, k45 } \
-  }
-
-#endif
+#define LAYOUT_ortho_5x12( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \
+) { \
+    { k00, k01, k02, k03, k04, k05 }, \
+    { k10, k11, k12, k13, k14, k15 }, \
+    { k20, k21, k22, k23, k24, k25 }, \
+    { k30, k31, k32, k33, k34, k35 }, \
+    { k06, k07, k08, k09, k0a, k0b }, \
+    { k16, k17, k18, k19, k1a, k1b }, \
+    { k26, k27, k28, k29, k2a, k2b }, \
+    { k36, k37, k38, k39, k3a, k3b }, \
+    { k40, k41, k42, k49, k4a, k4b }, \
+    { k46, k47, k48, k43, k44, k45 } \
+}