Move miscellaneous layouts to data driven (#20516)

5 files changed, 342 insertions, 323 deletions

diff --git a/keyboards/westfoxtrot/aanzee/aanzee.h b/keyboards/westfoxtrot/aanzee/aanzee.h
deleted file mode 100644
index 1cfa1784fb..0000000000
--- a/keyboards/westfoxtrot/aanzee/aanzee.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2019 westfoxtrot
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define ___ KC_NO
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
-*
-* The first section contains all of the arguments representing the physical
-* layout of the board and position of the keys.
-*
-* The second converts the arguments into a two-dimensional array which
-* represents the switch matrix.
-*/
-#define LAYOUT_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0F, k0D, k0E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1D, k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2D, k2E, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,      k3D, k3E, \
-    k40, k41, k42,                k46,           k49, k4A,      k4C,      k4D, k4E \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, ___ }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, k2D, k2E, ___ }, \
-    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, ___ }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4A, ___, k4C, k4D, k4E, ___ } \
-}
-
-#define LAYOUT_iso( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
-    k40, k41, k42,                k46,           k49, k4A,      k4C, k4D, k4E \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, ___ }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, ___, k1E, ___ }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, ___ }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, ___ }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4A, ___, k4C, k4D, k4E, ___ } \
-}
-
-void matrix_init_user(void);
-void matrix_scan_user(void);
diff --git a/keyboards/westfoxtrot/aanzee/info.json b/keyboards/westfoxtrot/aanzee/info.json
index 0038e1f7e5..9dd3fcb2a4 100644
--- a/keyboards/westfoxtrot/aanzee/info.json
+++ b/keyboards/westfoxtrot/aanzee/info.json
@@ -29,10 +29,158 @@
   "bootloader": "atmel-dfu",
   "layouts": {
     "LAYOUT_ansi": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "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}, {"x":13, "y":0}, {"x":14, "y":0}, {"label":"Home", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"PgUp", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgDn", "x":15, "y":2}, {"label":"\u21e7 Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"Fn", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [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, 15], "x": 13, "y": 0},
+        {"matrix": [0, 13], "x": 14, "y": 0},
+        {"matrix": [0, 14], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [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, "w": 1.5},
+        {"matrix": [1, 14], "x": 15, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [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, 13], "x": 12.75, "y": 2, "w": 2.25},
+        {"matrix": [2, 14], "x": 15, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 13], "x": 14, "y": 3},
+        {"matrix": [3, 14], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+        {"matrix": [4, 12], "x": 13, "y": 4},
+        {"matrix": [4, 13], "x": 14, "y": 4},
+        {"matrix": [4, 14], "x": 15, "y": 4}
+      ]
     },
     "LAYOUT_iso": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "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":"Backspace", "x":13, "y":0, "w":2}, {"label":"Home", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"x":13.75, "y":1, "w":1.25, "h":2}, {"label":"PgUp", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"PgDn", "x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"Fn", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [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, "w": 2},
+        {"matrix": [0, 14], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [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, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+        {"matrix": [2, 0], "x": 15, "y": 1},
+
+        {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 1.75, "y": 2},
+        {"matrix": [2, 3], "x": 2.75, "y": 2},
+        {"matrix": [2, 4], "x": 3.75, "y": 2},
+        {"matrix": [2, 5], "x": 4.75, "y": 2},
+        {"matrix": [2, 6], "x": 5.75, "y": 2},
+        {"matrix": [2, 7], "x": 6.75, "y": 2},
+        {"matrix": [2, 8], "x": 7.75, "y": 2},
+        {"matrix": [2, 9], "x": 8.75, "y": 2},
+        {"matrix": [2, 10], "x": 9.75, "y": 2},
+        {"matrix": [2, 11], "x": 10.75, "y": 2},
+        {"matrix": [2, 12], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2},
+        {"matrix": [2, 14], "x": 15, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.25, "y": 3},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 13], "x": 14, "y": 3},
+        {"matrix": [3, 14], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+        {"matrix": [4, 12], "x": 13, "y": 4},
+        {"matrix": [4, 13], "x": 14, "y": 4},
+        {"matrix": [4, 14], "x": 15, "y": 4}
+      ]
     }
   }
 }
diff --git a/keyboards/westfoxtrot/cypher/rev1/info.json b/keyboards/westfoxtrot/cypher/rev1/info.json
index 217d979c41..d6e5689df9 100644
--- a/keyboards/westfoxtrot/cypher/rev1/info.json
+++ b/keyboards/westfoxtrot/cypher/rev1/info.json
@@ -21,202 +21,201 @@
   "layouts": {
     "LAYOUT_ansi": {
       "layout": [
-        {"label":"~","x":0,"y":0},
-        {"label":"!","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":"Backspace","x":13,"y":0},
-        {"label":"~","x":14,"y":0},
-
-        {"label":"Num Lock","x":15.5,"y":0},
-        {"label":"/","x":16.5,"y":0},
-        {"label":"*","x":17.5,"y":0},
-        {"label":"-","x":18.5,"y":0},
-
-        {"label":"Tab","x":0,"y":1,"w":1.5},
-        {"label":"Q","x":1.5,"y":1},
-        {"label":"W","x":2.5,"y":1},
-        {"label":"E","x":3.5,"y":1},
-        {"label":"R","x":4.5,"y":1},
-        {"label":"T","x":5.5,"y":1},
-        {"label":"Y","x":6.5,"y":1},
-        {"label":"U","x":7.5,"y":1},
-        {"label":"I","x":8.5,"y":1},
-        {"label":"O","x":9.5,"y":1},
-        {"label":"P","x":10.5,"y":1},
-        {"label":"{","x":11.5,"y":1},
-        {"label":"}","x":12.5,"y":1},
-        {"label":"|","x":13.5,"y":1,"w":1.5},
-
-        {"label":"7","x":15.5,"y":1},
-        {"label":"8","x":16.5,"y":1},
-        {"label":"9","x":17.5,"y":1},
-        {"label":"+","x":18.5,"y":1},
-
-        {"label":"Caps Lock","x":0,"y":2,"w":1.75},
-        {"label":"A","x":1.75,"y":2},
-        {"label":"S","x":2.75,"y":2},
-        {"label":"D","x":3.75,"y":2},
-        {"label":"F","x":4.75,"y":2},
-        {"label":"G","x":5.75,"y":2},
-        {"label":"H","x":6.75,"y":2},
-        {"label":"J","x":7.75,"y":2},
-        {"label":"K","x":8.75,"y":2},
-        {"label":"L","x":9.75,"y":2},
-        {"label":":","x":10.75,"y":2},
-        {"label":"\"","x":11.75,"y":2},
-        {"label":"Enter","x":12.75,"y":2,"w":2.25},
-
-        {"label":"4","x":15.5,"y":2},
-        {"label":"5","x":16.5,"y":2},
-        {"label":"6","x":17.5,"y":2},
-        {"label":"=","x":18.5,"y":2},
-
-        {"label":"Shift","x":0,"y":3,"w":2.25},
-        {"label":"Z","x":2.25,"y":3},
-        {"label":"X","x":3.25,"y":3},
-        {"label":"C","x":4.25,"y":3},
-        {"label":"V","x":5.25,"y":3},
-        {"label":"B","x":6.25,"y":3},
-        {"label":"N","x":7.25,"y":3},
-        {"label":"M","x":8.25,"y":3},
-        {"label":"<","x":9.25,"y":3},
-        {"label":">","x":10.25,"y":3},
-        {"label":"?","x":11.25,"y":3},
-        {"label":"Shift","x":12.25,"y":3,"w":1.75},
-
-        {"label":"Up","x":14.25,"y":3.25},
-
-        {"label":"1","x":15.5,"y":3},
-        {"label":"2","x":16.5,"y":3},
-        {"label":"3","x":17.5,"y":3},
-        {"label":"Enter","x":18.5,"y":3},
-
-        {"label":"Ctrl","x":0,"y":4,"w":1.25},
-        {"label":"Win","x":1.25,"y":4},
-        {"label":"Alt","x":2.25,"y":4,"w":1.25},
-        {"label":"Space","x":3.5,"y":4,"w":6},
-        {"label":"Alt","x":9.5,"y":4,"w":1.25},
-        {"label":"Win","x":10.75,"y":4},
-        {"label":"Ctrl","x":11.75,"y":4,"w":1.25},
-
-        {"label":"Left","x":13.25,"y":4.25},
-        {"label":"Down","x":14.25,"y":4.25},
-        {"label":"Right","x":15.25,"y":4.25},
-
-        {"label":"0","x":16.5,"y":4},
-        {"label":".","x":17.5,"y":4},
-        {"label":"Backspace","x":18.5,"y":4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [5, 0], "x": 10, "y": 0},
+        {"matrix": [5, 1], "x": 11, "y": 0},
+        {"matrix": [5, 2], "x": 12, "y": 0},
+        {"matrix": [5, 3], "x": 13, "y": 0},
+        {"matrix": [5, 4], "x": 14, "y": 0},
+
+        {"matrix": [5, 5], "x": 15.5, "y": 0},
+        {"matrix": [5, 6], "x": 16.5, "y": 0},
+        {"matrix": [5, 7], "x": 17.5, "y": 0},
+        {"matrix": [5, 8], "x": 18.5, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [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": [6, 0], "x": 10.5, "y": 1},
+        {"matrix": [6, 1], "x": 11.5, "y": 1},
+        {"matrix": [6, 2], "x": 12.5, "y": 1},
+        {"matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [6, 5], "x": 15.5, "y": 1},
+        {"matrix": [6, 6], "x": 16.5, "y": 1},
+        {"matrix": [6, 7], "x": 17.5, "y": 1},
+        {"matrix": [6, 8], "x": 18.5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [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": [7, 0], "x": 10.75, "y": 2},
+        {"matrix": [7, 1], "x": 11.75, "y": 2},
+        {"matrix": [7, 3], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [7, 5], "x": 15.5, "y": 2},
+        {"matrix": [7, 6], "x": 16.5, "y": 2},
+        {"matrix": [7, 7], "x": 17.5, "y": 2},
+        {"matrix": [7, 8], "x": 18.5, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [8, 0], "x": 10.25, "y": 3},
+        {"matrix": [8, 1], "x": 11.25, "y": 3},
+        {"matrix": [8, 2], "x": 12.25, "y": 3, "w": 1.75},
+
+        {"matrix": [8, 3], "x": 14.25, "y": 3.25},
+
+        {"matrix": [8, 5], "x": 15.5, "y": 3},
+        {"matrix": [8, 6], "x": 16.5, "y": 3},
+        {"matrix": [8, 7], "x": 17.5, "y": 3},
+        {"matrix": [8, 8], "x": 18.5, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4},
+        {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6},
+        {"matrix": [4, 9], "x": 9.5, "y": 4, "w": 1.25},
+        {"matrix": [9, 0], "x": 10.75, "y": 4},
+        {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.25},
+
+        {"matrix": [9, 2], "x": 13.25, "y": 4.25},
+        {"matrix": [9, 3], "x": 14.25, "y": 4.25},
+        {"matrix": [9, 5], "x": 15.25, "y": 4.25},
+
+        {"matrix": [9, 6], "x": 16.5, "y": 4},
+        {"matrix": [9, 7], "x": 17.5, "y": 4},
+        {"matrix": [9, 8], "x": 18.5, "y": 4}
       ]
     },
-
     "LAYOUT_iso": {
       "layout": [
-        {"label":"~","x":0,"y":0},
-        {"label":"!","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":"Backspace","x":13,"y":0},
-        {"label":"~","x":14,"y":0},
-
-        {"label":"Num Lock","x":15.5,"y":0},
-        {"label":"/","x":16.5,"y":0},
-        {"label":"*","x":17.5,"y":0},
-        {"label":"-","x":18.5,"y":0},
-
-        {"label":"Tab","x":0,"y":1,"w":1.5},
-        {"label":"Q","x":1.5,"y":1},
-        {"label":"W","x":2.5,"y":1},
-        {"label":"E","x":3.5,"y":1},
-        {"label":"R","x":4.5,"y":1},
-        {"label":"T","x":5.5,"y":1},
-        {"label":"Y","x":6.5,"y":1},
-        {"label":"U","x":7.5,"y":1},
-        {"label":"I","x":8.5,"y":1},
-        {"label":"O","x":9.5,"y":1},
-        {"label":"P","x":10.5,"y":1},
-        {"label":"{","x":11.5,"y":1},
-        {"label":"}","x":12.5,"y":1},
-
-        {"label":"7","x":15.5,"y":1},
-        {"label":"8","x":16.5,"y":1},
-        {"label":"9","x":17.5,"y":1},
-        {"label":"+","x":18.5,"y":1},
-
-        {"label":"Caps Lock","x":0,"y":2,"w":1.75},
-        {"label":"A","x":1.75,"y":2},
-        {"label":"S","x":2.75,"y":2},
-        {"label":"D","x":3.75,"y":2},
-        {"label":"F","x":4.75,"y":2},
-        {"label":"G","x":5.75,"y":2},
-        {"label":"H","x":6.75,"y":2},
-        {"label":"J","x":7.75,"y":2},
-        {"label":"K","x":8.75,"y":2},
-        {"label":"L","x":9.75,"y":2},
-        {"label":":","x":10.75,"y":2},
-        {"label":"\"","x":11.75,"y":2},
-        {"label":"~","x":12.75,"y":2},
-        {"label":"Enter","x":13.75,"y":1,"w":1.25,"h":2},
-
-        {"label":"4","x":15.5,"y":2},
-        {"label":"5","x":16.5,"y":2},
-        {"label":"6","x":17.5,"y":2},
-        {"label":"=","x":18.5,"y":2},
-
-        {"label":"Shift","x":0,"y":3,"w":1.25},
-        {"label":"|","x":1.25,"y":3},
-        {"label":"Z","x":2.25,"y":3},
-        {"label":"X","x":3.25,"y":3},
-        {"label":"C","x":4.25,"y":3},
-        {"label":"V","x":5.25,"y":3},
-        {"label":"B","x":6.25,"y":3},
-        {"label":"N","x":7.25,"y":3},
-        {"label":"M","x":8.25,"y":3},
-        {"label":"<","x":9.25,"y":3},
-        {"label":">","x":10.25,"y":3},
-        {"label":"?","x":11.25,"y":3},
-        {"label":"Shift","x":12.25,"y":3,"w":1.75},
-
-        {"label":"Up","x":14.25,"y":3.25},
-
-        {"label":"1","x":15.5,"y":3},
-        {"label":"2","x":16.5,"y":3},
-        {"label":"3","x":17.5,"y":3},
-        {"label":"Enter","x":18.5,"y":3},
-
-        {"label":"Ctrl","x":0,"y":4,"w":1.25},
-        {"label":"Win","x":1.25,"y":4},
-        {"label":"Alt","x":2.25,"y":4,"w":1.25},
-        {"label":"Space","x":3.5,"y":4,"w":6},
-        {"label":"Alt","x":9.5,"y":4,"w":1.25},
-        {"label":"Win","x":10.75,"y":4},
-        {"label":"Ctrl","x":11.75,"y":4,"w":1.25},
-
-        {"label":"Left","x":13.25,"y":4.25},
-        {"label":"Down","x":14.25,"y":4.25},
-        {"label":"Right","x":15.25,"y":4.25},
-
-        {"label":"0","x":16.5,"y":4},
-        {"label":".","x":17.5,"y":4},
-        {"label":"Backspace","x":18.5,"y":4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [5, 0], "x": 10, "y": 0},
+        {"matrix": [5, 1], "x": 11, "y": 0},
+        {"matrix": [5, 2], "x": 12, "y": 0},
+        {"matrix": [5, 3], "x": 13, "y": 0},
+        {"matrix": [5, 4], "x": 14, "y": 0},
+
+        {"matrix": [5, 5], "x": 15.5, "y": 0},
+        {"matrix": [5, 6], "x": 16.5, "y": 0},
+        {"matrix": [5, 7], "x": 17.5, "y": 0},
+        {"matrix": [5, 8], "x": 18.5, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [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": [6, 0], "x": 10.5, "y": 1},
+        {"matrix": [6, 1], "x": 11.5, "y": 1},
+        {"matrix": [6, 2], "x": 12.5, "y": 1},
+
+        {"matrix": [6, 5], "x": 15.5, "y": 1},
+        {"matrix": [6, 6], "x": 16.5, "y": 1},
+        {"matrix": [6, 7], "x": 17.5, "y": 1},
+        {"matrix": [6, 8], "x": 18.5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [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": [7, 0], "x": 10.75, "y": 2},
+        {"matrix": [7, 1], "x": 11.75, "y": 2},
+        {"matrix": [7, 2], "x": 12.75, "y": 2},
+        {"matrix": [7, 3], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+        {"matrix": [7, 5], "x": 15.5, "y": 2},
+        {"matrix": [7, 6], "x": 16.5, "y": 2},
+        {"matrix": [7, 7], "x": 17.5, "y": 2},
+        {"matrix": [7, 8], "x": 18.5, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.25, "y": 3},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [8, 0], "x": 10.25, "y": 3},
+        {"matrix": [8, 1], "x": 11.25, "y": 3},
+        {"matrix": [8, 2], "x": 12.25, "y": 3, "w": 1.75},
+
+        {"matrix": [8, 3], "x": 14.25, "y": 3.25},
+
+        {"matrix": [8, 5], "x": 15.5, "y": 3},
+        {"matrix": [8, 6], "x": 16.5, "y": 3},
+        {"matrix": [8, 7], "x": 17.5, "y": 3},
+        {"matrix": [8, 8], "x": 18.5, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4},
+        {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6},
+        {"matrix": [4, 9], "x": 9.5, "y": 4, "w": 1.25},
+        {"matrix": [9, 0], "x": 10.75, "y": 4},
+        {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.25},
+
+        {"matrix": [9, 2], "x": 13.25, "y": 4.25},
+        {"matrix": [9, 3], "x": 14.25, "y": 4.25},
+        {"matrix": [9, 5], "x": 15.25, "y": 4.25},
+
+        {"matrix": [9, 6], "x": 16.5, "y": 4},
+        {"matrix": [9, 7], "x": 17.5, "y": 4},
+        {"matrix": [9, 8], "x": 18.5, "y": 4}
       ]
     }
   }
diff --git a/keyboards/westfoxtrot/cypher/rev1/rev1.c b/keyboards/westfoxtrot/cypher/rev1/rev1.c
index 78b4b6b46e..b6736f97a7 100644
--- a/keyboards/westfoxtrot/cypher/rev1/rev1.c
+++ b/keyboards/westfoxtrot/cypher/rev1/rev1.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "rev1.h"
+#include "quantum.h"
 
 bool led_update_kb(led_t led_state) {
     bool res = led_update_user(led_state);
diff --git a/keyboards/westfoxtrot/cypher/rev1/rev1.h b/keyboards/westfoxtrot/cypher/rev1/rev1.h
deleted file mode 100644
index fdff12e9b1..0000000000
--- a/keyboards/westfoxtrot/cypher/rev1/rev1.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright 2019 westfoxtrot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define ___ KC_NO
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, K51, K52, K53, K54, 		  K55, K56, K57, K58,\
-      K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K60, K61, K62, K63,     	  K65, K66, K67, K68,   \
-		K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K70, K71,      K73,         K75, K76, K77, K78,   \
-	K30,      K32, K33, K34, K35, K36, K37, K38, K39, K80, K81, K82, 		K83,      K85, K86, K87, K88,   \
-	K40, K41, K42,                   K46,            K49, K90, K91,    K92, K93, K95, K96, K97, K98   \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39 }, \
-    { K40, K41, K42, ___, ___, ___, K46, ___, ___, K49 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \
-    { K60, K61, K62, K63, ___, K65, K66, K67, K68 }, \
-    { K70, K71, ___, K73, ___, K75, K76, K77, K78 }, \
-    { K80, K81, K82, K83, ___, K85, K86, K87, K88 }, \
-    { K90, K91, K92, K93, ___, K95, K96, K97, K98 } \
-}
-
-#define LAYOUT_iso( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, K51, K52, K53, K54, 		  K55, K56, K57, K58,\
-      K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K60, K61, K62,		     	  K65, K66, K67, K68,   \
-		K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K70, K71, K72, K73,         K75, K76, K77, K78,   \
-	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K80, K81, K82, 		K83,      K85, K86, K87, K88,   \
-	K40, K41, K42,                   K46,            K49, K90, K91,    K92, K93, K95, K96, K97, K98   \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39 }, \
-    { K40, K41, K42, ___, ___, ___, K46, ___, ___, K49 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \
-    { K60, K61, K62, ___, ___, K65, K66, K67, K68 }, \
-    { K70, K71, K72, K73, ___, K75, K76, K77, K78 }, \
-    { K80, K81, K82, K83, ___, K85, K86, K87, K88 }, \
-    { K90, K91, K92, K93, ___, K95, K96, K97, K98 } \
-}