Move Alice and Ergodox layouts to data driven (#20340)

6 files changed, 413 insertions, 217 deletions

diff --git a/keyboards/handwired/colorlice/colorlice.c b/keyboards/handwired/colorlice/colorlice.c
index 1fd5fddd11..736db8d465 100644
--- a/keyboards/handwired/colorlice/colorlice.c
+++ b/keyboards/handwired/colorlice/colorlice.c
@@ -13,7 +13,8 @@
  * 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 "colorlice.h"
+
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/handwired/colorlice/colorlice.h b/keyboards/handwired/colorlice/colorlice.h
deleted file mode 100644
index dbf31f5680..0000000000
--- a/keyboards/handwired/colorlice/colorlice.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2019 marhalloweenvt
- *
- * 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
-
-
-#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_alice_split_bs( \
-    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, k2c,      K2e,      \
-    k30, k31, k32, k33, k34, k35,      k37, k38, k39, k3a, k3b, k3c, k3d, k3e,      \
-    k40,      k42, k43, k44,           k47,           k4a,                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, KC_NO  }, \
-    { k20,  k21,   k22,   k23,  k24,  k25,   k26,   k27,   k28,  k29,   k2a,  k2b,  k2c,    KC_NO,  K2e, KC_NO  }, \
-    { k30,  k31,   k32,   k33,  k34,  k35,   KC_NO, k37,   k38,  k39,   k3a,  k3b,  k3c,    k3d,    k3e, KC_NO  }, \
-    { k40,  KC_NO, k42,   k43,  k44,  KC_NO, KC_NO, k47, KC_NO,  KC_NO, k4a,  KC_NO,KC_NO,  KC_NO,  k4e, KC_NO  }, \
-}
-
-#define LAYOUT LAYOUT_alice_split_bs
diff --git a/keyboards/handwired/colorlice/info.json b/keyboards/handwired/colorlice/info.json
index 66e5836a15..29783d211c 100644
--- a/keyboards/handwired/colorlice/info.json
+++ b/keyboards/handwired/colorlice/info.json
@@ -16,76 +16,90 @@
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["alice_split_bs"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_alice_split_bs"
+    },
     "layouts": {
       "LAYOUT_alice_split_bs": {
         "layout": [
-          {"label":"K63", "x":0, "y":0},
-          {"label":"K00", "x":1.25, "y":0},
-          {"label":"K01", "x":2.25, "y":0},
-          {"label":"K02", "x":3.25, "y":0},
-          {"label":"K03", "x":4.25, "y":0},
-          {"label":"K04", "x":5.25, "y":0},
-          {"label":"K05", "x":6.25, "y":0},
-          {"label":"K06", "x":7.25, "y":0},
-          {"label":"K07", "x":10.25, "y":0},
-          {"label":"K08", "x":11.25, "y":0},
-          {"label":"K09", "x":12.25, "y":0},
-          {"label":"K10", "x":13.25, "y":0},
-          {"label":"K11", "x":14.25, "y":0},
-          {"label":"K12", "x":15.25, "y":0},
-          {"label":"K13", "x":16.25, "y":0},
-          {"label":"K14", "x":17.25, "y":0},
-          {"label":"K64", "x":0, "y":1},
-          {"label":"K15", "x":1.25, "y":1, "w":1.5},
-          {"label":"K16", "x":2.75, "y":1},
-          {"label":"K17", "x":3.75, "y":1},
-          {"label":"K18", "x":4.75, "y":1},
-          {"label":"K19", "x":5.75, "y":1},
-          {"label":"K20", "x":6.75, "y":1},
-          {"label":"K21", "x":9.75, "y":1},
-          {"label":"K22", "x":10.75, "y":1},
-          {"label":"K23", "x":11.75, "y":1},
-          {"label":"K24", "x":12.75, "y":1},
-          {"label":"K25", "x":13.75, "y":1},
-          {"label":"K26", "x":14.75, "y":1},
-          {"label":"K27", "x":15.75, "y":1},
-          {"label":"K28", "x":16.75, "y":1, "w":1.5},
-          {"label":"K65", "x":0, "y":2},
-          {"label":"K29", "x":1.25, "y":2, "w":1.75},
-          {"label":"K30", "x":3, "y":2},
-          {"label":"K31", "x":4, "y":2},
-          {"label":"K32", "x":5, "y":2},
-          {"label":"K33", "x":6, "y":2},
-          {"label":"K34", "x":7, "y":2},
-          {"label":"K35", "x":10, "y":2},
-          {"label":"K36", "x":11, "y":2},
-          {"label":"K37", "x":12, "y":2},
-          {"label":"K38", "x":13, "y":2},
-          {"label":"K39", "x":14, "y":2},
-          {"label":"K40", "x":15, "y":2},
-          {"label":"K41", "x":16, "y":2, "w":2.25},
-          {"label":"K42", "x":1.25, "y":3, "w":2.25},
-          {"label":"K43", "x":3.5, "y":3},
-          {"label":"K44", "x":4.5, "y":3},
-          {"label":"K45", "x":5.5, "y":3},
-          {"label":"K46", "x":6.5, "y":3},
-          {"label":"K47", "x":7.5, "y":3},
-          {"label":"K48", "x":9.5, "y":3},
-          {"label":"K49", "x":10.5, "y":3},
-          {"label":"K50", "x":11.5, "y":3},
-          {"label":"K51", "x":12.5, "y":3},
-          {"label":"K52", "x":13.5, "y":3},
-          {"label":"K53", "x":14.5, "y":3},
-          {"label":"K54", "x":15.5, "y":3, "w":1.75},
-          {"label":"K55", "x":17.25, "y":3},
-          {"label":"K56", "x":1.25, "y":4, "w":1.5},
-          {"label":"K57", "x":4.25, "y":4, "w":1.5},
-          {"label":"K58", "x":5.75, "y":4, "w":2},
-          {"label":"K59", "x":7.75, "y":4, "w":1.25},
-          {"label":"K60", "x":9.5, "y":4, "w":2.75},
-          {"label":"K61", "x":12.25, "y":4, "w":1.5},
-          {"label":"K62", "x":16.75, "y":4, "w":1.5}
+          {"label": "K63", "matrix": [0, 0], "x": 0, "y": 0},
+
+          {"label": "K00", "matrix": [0, 1], "x": 1.25, "y": 0},
+          {"label": "K01", "matrix": [0, 2], "x": 2.25, "y": 0},
+          {"label": "K02", "matrix": [0, 3], "x": 3.25, "y": 0},
+          {"label": "K03", "matrix": [0, 4], "x": 4.25, "y": 0},
+          {"label": "K04", "matrix": [0, 5], "x": 5.25, "y": 0},
+          {"label": "K05", "matrix": [0, 6], "x": 6.25, "y": 0},
+          {"label": "K06", "matrix": [0, 7], "x": 7.25, "y": 0},
+
+          {"label": "K07", "matrix": [0, 8], "x": 10.25, "y": 0},
+          {"label": "K08", "matrix": [0, 9], "x": 11.25, "y": 0},
+          {"label": "K09", "matrix": [0, 10], "x": 12.25, "y": 0},
+          {"label": "K10", "matrix": [0, 11], "x": 13.25, "y": 0},
+          {"label": "K11", "matrix": [0, 12], "x": 14.25, "y": 0},
+          {"label": "K12", "matrix": [0, 13], "x": 15.25, "y": 0},
+          {"label": "K13", "matrix": [0, 14], "x": 16.25, "y": 0},
+          {"label": "K14", "matrix": [0, 15], "x": 17.25, "y": 0},
+
+          {"label": "K64", "matrix": [1, 0], "x": 0, "y": 1},
+
+          {"label": "K15", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+          {"label": "K16", "matrix": [1, 2], "x": 2.75, "y": 1},
+          {"label": "K17", "matrix": [1, 3], "x": 3.75, "y": 1},
+          {"label": "K18", "matrix": [1, 4], "x": 4.75, "y": 1},
+          {"label": "K19", "matrix": [1, 5], "x": 5.75, "y": 1},
+          {"label": "K20", "matrix": [1, 6], "x": 6.75, "y": 1},
+
+          {"label": "K21", "matrix": [1, 7], "x": 9.75, "y": 1},
+          {"label": "K22", "matrix": [1, 8], "x": 10.75, "y": 1},
+          {"label": "K23", "matrix": [1, 9], "x": 11.75, "y": 1},
+          {"label": "K24", "matrix": [1, 10], "x": 12.75, "y": 1},
+          {"label": "K25", "matrix": [1, 11], "x": 13.75, "y": 1},
+          {"label": "K26", "matrix": [1, 12], "x": 14.75, "y": 1},
+          {"label": "K27", "matrix": [1, 13], "x": 15.75, "y": 1},
+          {"label": "K28", "matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+          {"label": "K65", "matrix": [2, 0], "x": 0, "y": 2},
+
+          {"label": "K29", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+          {"label": "K30", "matrix": [2, 2], "x": 3, "y": 2},
+          {"label": "K31", "matrix": [2, 3], "x": 4, "y": 2},
+          {"label": "K32", "matrix": [2, 4], "x": 5, "y": 2},
+          {"label": "K33", "matrix": [2, 5], "x": 6, "y": 2},
+          {"label": "K34", "matrix": [2, 6], "x": 7, "y": 2},
+
+          {"label": "K35", "matrix": [2, 7], "x": 10, "y": 2},
+          {"label": "K36", "matrix": [2, 8], "x": 11, "y": 2},
+          {"label": "K37", "matrix": [2, 9], "x": 12, "y": 2},
+          {"label": "K38", "matrix": [2, 10], "x": 13, "y": 2},
+          {"label": "K39", "matrix": [2, 11], "x": 14, "y": 2},
+          {"label": "K40", "matrix": [2, 12], "x": 15, "y": 2},
+          {"label": "K41", "matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
+
+          {"label": "K42", "matrix": [3, 0], "x": 1.25, "y": 3, "w": 2.25},
+          {"label": "K43", "matrix": [3, 1], "x": 3.5, "y": 3},
+          {"label": "K44", "matrix": [3, 2], "x": 4.5, "y": 3},
+          {"label": "K45", "matrix": [3, 3], "x": 5.5, "y": 3},
+          {"label": "K46", "matrix": [3, 4], "x": 6.5, "y": 3},
+          {"label": "K47", "matrix": [3, 5], "x": 7.5, "y": 3},
+
+          {"label": "K48", "matrix": [3, 7], "x": 9.5, "y": 3},
+          {"label": "K49", "matrix": [3, 8], "x": 10.5, "y": 3},
+          {"label": "K50", "matrix": [3, 9], "x": 11.5, "y": 3},
+          {"label": "K51", "matrix": [3, 10], "x": 12.5, "y": 3},
+          {"label": "K52", "matrix": [3, 11], "x": 13.5, "y": 3},
+          {"label": "K53", "matrix": [3, 12], "x": 14.5, "y": 3},
+          {"label": "K54", "matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+          {"label": "K55", "matrix": [3, 14], "x": 17.25, "y": 3},
+
+          {"label": "K56", "matrix": [4, 0], "x": 1.25, "y": 4, "w": 1.5},
+          {"label": "K57", "matrix": [4, 2], "x": 4.25, "y": 4, "w": 1.5},
+          {"label": "K58", "matrix": [4, 3], "x": 5.75, "y": 4, "w": 2},
+          {"label": "K59", "matrix": [4, 4], "x": 7.75, "y": 4, "w": 1.25},
+          {"label": "K60", "matrix": [4, 7], "x": 9.5, "y": 4, "w": 2.75},
+          {"label": "K61", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+          {"label": "K62", "matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
         ]
       }
     }
-  }
+}
diff --git a/keyboards/handwired/owlet60/info.json b/keyboards/handwired/owlet60/info.json
index 6b84c37e9b..c8be456104 100644
--- a/keyboards/handwired/owlet60/info.json
+++ b/keyboards/handwired/owlet60/info.json
@@ -12,18 +12,344 @@
     "bootloader": "caterina",
     "debounce": 9,
     "community_layouts": ["alice", "alice_split_bs"],
+    "layout_aliases": {
+        "LAYOUT_owlet60_60_percent_full_bsp": "LAYOUT_alice",
+        "LAYOUT_owlet60_60_percent_split_bsp": "LAYOUT_alice_split_bs"
+    },
     "layouts": {
         "LAYOUT_owlet60_full_bsp": {
-            "layout": [{"label":"F1", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Backspace", "x":15.25, "y":0, "w":2}, {"label":"PgUp", "x":17.25, "y":0}, {"label":"F2", "x":0.25, "y":1}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"|", "x":16, "y":1, "w":1.5}, {"label":"PgDn", "x":17.5, "y":1}, {"label":"F3", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":":", "x":13.5, "y":2}, {"label":"\"", "x":14.5, "y":2}, {"label":"Enter", "x":15.5, "y":2, "w":2.25}, {"label":"Home", "x":17.75, "y":2}, {"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":"B", "x":9.25, "y":3}, {"label":"N", "x":10.25, "y":3}, {"label":"M", "x":11.25, "y":3}, {"label":"<", "x":12.25, "y":3}, {"label":">", "x":13.25, "y":3}, {"label":"?", "x":14.25, "y":3}, {"label":"Shift", "x":15.25, "y":3, "w":1.75}, {"label":"Up", "x":17, "y":3}, {"label":"End", "x":18, "y":3}, {"label":"Ctrl", "x":1, "y":4, "w":1.5}, {"label":"Alt", "x":3.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":2.25}, {"label":"Super", "x":7.25, "y":4, "w":1.25}, {"x":9.25, "y":4, "w":2}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Left", "x":16, "y":4}, {"label":"Down", "x":17, "y":4}, {"label":"Right", "x":18, "y":4}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [7, 0], "x": 1.75, "y": 0},
+                {"matrix": [8, 0], "x": 2.75, "y": 0},
+                {"matrix": [7, 1], "x": 3.75, "y": 0},
+                {"matrix": [8, 1], "x": 4.75, "y": 0},
+                {"matrix": [7, 2], "x": 5.75, "y": 0},
+                {"matrix": [8, 2], "x": 6.75, "y": 0},
+                {"matrix": [8, 3], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 4], "x": 9.25, "y": 0},
+                {"matrix": [7, 4], "x": 10.25, "y": 0},
+                {"matrix": [8, 4], "x": 11.25, "y": 0},
+                {"matrix": [7, 5], "x": 12.25, "y": 0},
+                {"matrix": [8, 5], "x": 13.25, "y": 0},
+                {"matrix": [7, 6], "x": 14.25, "y": 0},
+                {"matrix": [8, 6], "x": 15.25, "y": 0, "w": 2},
+                {"matrix": [7, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [6, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [0, 1], "x": 3, "y": 1},
+                {"matrix": [6, 1], "x": 4, "y": 1},
+                {"matrix": [0, 2], "x": 5, "y": 1},
+                {"matrix": [6, 2], "x": 6, "y": 1},
+                {"matrix": [0, 3], "x": 7, "y": 1},
+
+                {"matrix": [7, 3], "x": 9, "y": 1},
+                {"matrix": [1, 4], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [0, 5], "x": 12, "y": 1},
+                {"matrix": [6, 5], "x": 13, "y": 1},
+                {"matrix": [0, 6], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15, "y": 1},
+                {"matrix": [0, 7], "x": 16, "y": 1, "w": 1.5},
+                {"matrix": [6, 7], "x": 17.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [1, 1], "x": 3, "y": 2},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [1, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [1, 3], "x": 7, "y": 2},
+
+                {"matrix": [6, 3], "x": 9.5, "y": 2},
+                {"matrix": [2, 4], "x": 10.5, "y": 2},
+                {"matrix": [5, 4], "x": 11.5, "y": 2},
+                {"matrix": [1, 5], "x": 12.5, "y": 2},
+                {"matrix": [5, 5], "x": 13.5, "y": 2},
+                {"matrix": [1, 6], "x": 14.5, "y": 2},
+                {"matrix": [5, 6], "x": 15.5, "y": 2, "w": 2.25},
+                {"matrix": [5, 7], "x": 17.75, "y": 2},
+
+                {"matrix": [4, 0], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [2, 1], "x": 3.25, "y": 3},
+                {"matrix": [4, 1], "x": 4.25, "y": 3},
+                {"matrix": [2, 2], "x": 5.25, "y": 3},
+                {"matrix": [4, 2], "x": 6.25, "y": 3},
+                {"matrix": [2, 3], "x": 7.25, "y": 3},
+
+                {"matrix": [5, 3], "x": 9.25, "y": 3},
+                {"matrix": [3, 4], "x": 10.25, "y": 3},
+                {"matrix": [4, 4], "x": 11.25, "y": 3},
+                {"matrix": [2, 5], "x": 12.25, "y": 3},
+                {"matrix": [4, 5], "x": 13.25, "y": 3},
+                {"matrix": [2, 6], "x": 14.25, "y": 3},
+                {"matrix": [4, 6], "x": 15.25, "y": 3, "w": 1.75},
+                {"matrix": [1, 7], "x": 17, "y": 3},
+                {"matrix": [4, 7], "x": 18, "y": 3},
+
+                {"matrix": [3, 0], "x": 1, "y": 4, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.5, "y": 4, "w": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 4, "w": 2.25},
+                {"matrix": [3, 3], "x": 7.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 9.25, "y": 4, "w": 2},
+                {"matrix": [3, 5], "x": 11.25, "y": 4, "w": 1.5},
+                {"matrix": [3, 6], "x": 16, "y": 4},
+                {"matrix": [2, 7], "x": 17, "y": 4},
+                {"matrix": [3, 7], "x": 18, "y": 4}
+            ]
         },
         "LAYOUT_owlet60_split_bsp": {
-            "layout": [{"label":"F1", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Bsp", "x":15.25, "y":0}, {"label":"Del", "x":16.25, "y":0}, {"label":"PgUp", "x":17.25, "y":0}, {"label":"F2", "x":0.25, "y":1}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"|", "x":16, "y":1, "w":1.5}, {"label":"PgDn", "x":17.5, "y":1}, {"label":"F3", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":":", "x":13.5, "y":2}, {"label":"\"", "x":14.5, "y":2}, {"label":"Enter", "x":15.5, "y":2, "w":2.25}, {"label":"Home", "x":17.75, "y":2}, {"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":"B", "x":9.25, "y":3}, {"label":"N", "x":10.25, "y":3}, {"label":"M", "x":11.25, "y":3}, {"label":"<", "x":12.25, "y":3}, {"label":">", "x":13.25, "y":3}, {"label":"?", "x":14.25, "y":3}, {"label":"Shift", "x":15.25, "y":3, "w":1.75}, {"label":"Up", "x":17, "y":3}, {"label":"End", "x":18, "y":3}, {"label":"Ctrl", "x":1, "y":4, "w":1.5}, {"label":"Alt", "x":3.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":2.25}, {"label":"Super", "x":7.25, "y":4, "w":1.25}, {"x":9.25, "y":4, "w":2}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Left", "x":16, "y":4}, {"label":"Down", "x":17, "y":4}, {"label":"Right", "x":18, "y":4}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [7, 0], "x": 1.75, "y": 0},
+                {"matrix": [8, 0], "x": 2.75, "y": 0},
+                {"matrix": [7, 1], "x": 3.75, "y": 0},
+                {"matrix": [8, 1], "x": 4.75, "y": 0},
+                {"matrix": [7, 2], "x": 5.75, "y": 0},
+                {"matrix": [8, 2], "x": 6.75, "y": 0},
+                {"matrix": [8, 3], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 4], "x": 9.25, "y": 0},
+                {"matrix": [7, 4], "x": 10.25, "y": 0},
+                {"matrix": [8, 4], "x": 11.25, "y": 0},
+                {"matrix": [7, 5], "x": 12.25, "y": 0},
+                {"matrix": [8, 5], "x": 13.25, "y": 0},
+                {"matrix": [7, 6], "x": 14.25, "y": 0},
+                {"matrix": [8, 6], "x": 15.25, "y": 0},
+                {"matrix": [8, 7], "x": 16.25, "y": 0},
+                {"matrix": [7, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [6, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [0, 1], "x": 3, "y": 1},
+                {"matrix": [6, 1], "x": 4, "y": 1},
+                {"matrix": [0, 2], "x": 5, "y": 1},
+                {"matrix": [6, 2], "x": 6, "y": 1},
+                {"matrix": [0, 3], "x": 7, "y": 1},
+
+                {"matrix": [7, 3], "x": 9, "y": 1},
+                {"matrix": [1, 4], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [0, 5], "x": 12, "y": 1},
+                {"matrix": [6, 5], "x": 13, "y": 1},
+                {"matrix": [0, 6], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15, "y": 1},
+                {"matrix": [0, 7], "x": 16, "y": 1, "w": 1.5},
+                {"matrix": [6, 7], "x": 17.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [1, 1], "x": 3, "y": 2},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [1, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [1, 3], "x": 7, "y": 2},
+
+                {"matrix": [6, 3], "x": 9.5, "y": 2},
+                {"matrix": [2, 4], "x": 10.5, "y": 2},
+                {"matrix": [5, 4], "x": 11.5, "y": 2},
+                {"matrix": [1, 5], "x": 12.5, "y": 2},
+                {"matrix": [5, 5], "x": 13.5, "y": 2},
+                {"matrix": [1, 6], "x": 14.5, "y": 2},
+                {"matrix": [5, 6], "x": 15.5, "y": 2, "w": 2.25},
+                {"matrix": [5, 7], "x": 17.75, "y": 2},
+
+                {"matrix": [4, 0], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [2, 1], "x": 3.25, "y": 3},
+                {"matrix": [4, 1], "x": 4.25, "y": 3},
+                {"matrix": [2, 2], "x": 5.25, "y": 3},
+                {"matrix": [4, 2], "x": 6.25, "y": 3},
+                {"matrix": [2, 3], "x": 7.25, "y": 3},
+
+                {"matrix": [5, 3], "x": 9.25, "y": 3},
+                {"matrix": [3, 4], "x": 10.25, "y": 3},
+                {"matrix": [4, 4], "x": 11.25, "y": 3},
+                {"matrix": [2, 5], "x": 12.25, "y": 3},
+                {"matrix": [4, 5], "x": 13.25, "y": 3},
+                {"matrix": [2, 6], "x": 14.25, "y": 3},
+                {"matrix": [4, 6], "x": 15.25, "y": 3, "w": 1.75},
+                {"matrix": [1, 7], "x": 17, "y": 3},
+                {"matrix": [4, 7], "x": 18, "y": 3},
+
+                {"matrix": [3, 0], "x": 1, "y": 4, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.5, "y": 4, "w": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 4, "w": 2.25},
+                {"matrix": [3, 3], "x": 7.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 9.25, "y": 4, "w": 2},
+                {"matrix": [3, 5], "x": 11.25, "y": 4, "w": 1.5},
+                {"matrix": [3, 6], "x": 16, "y": 4},
+                {"matrix": [2, 7], "x": 17, "y": 4},
+                {"matrix": [3, 7], "x": 18, "y": 4}
+            ]
         },
         "LAYOUT_alice_split_bs": {
-            "layout": [{"label":"F1", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Bsp", "x":15.25, "y":0}, {"label":"Del", "x":16.25, "y":0}, {"label":"F2", "x":0.25, "y":1}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"|", "x":16, "y":1, "w":1.5}, {"label":"F3", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":":", "x":13.5, "y":2}, {"label":"\"", "x":14.5, "y":2}, {"label":"Enter", "x":15.5, "y":2, "w":2.25}, {"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":"B", "x":9.25, "y":3}, {"label":"N", "x":10.25, "y":3}, {"label":"M", "x":11.25, "y":3}, {"label":"<", "x":12.25, "y":3}, {"label":">", "x":13.25, "y":3}, {"label":"?", "x":14.25, "y":3}, {"label":"Shift", "x":15.25, "y":3, "w":1.75}, {"label":"Up", "x":17, "y":3}, {"label":"Ctrl", "x":1, "y":4, "w":1.5}, {"label":"Alt", "x":3.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":2.25}, {"label":"Super", "x":7.25, "y":4, "w":1.25}, {"x":9.25, "y":4, "w":2}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.25, "y":4, "w":1.5}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [7, 0], "x": 1.75, "y": 0},
+                {"matrix": [8, 0], "x": 2.75, "y": 0},
+                {"matrix": [7, 1], "x": 3.75, "y": 0},
+                {"matrix": [8, 1], "x": 4.75, "y": 0},
+                {"matrix": [7, 2], "x": 5.75, "y": 0},
+                {"matrix": [8, 2], "x": 6.75, "y": 0},
+                {"matrix": [8, 3], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 4], "x": 9.25, "y": 0},
+                {"matrix": [7, 4], "x": 10.25, "y": 0},
+                {"matrix": [8, 4], "x": 11.25, "y": 0},
+                {"matrix": [7, 5], "x": 12.25, "y": 0},
+                {"matrix": [8, 5], "x": 13.25, "y": 0},
+                {"matrix": [7, 6], "x": 14.25, "y": 0},
+                {"matrix": [8, 6], "x": 15.25, "y": 0},
+                {"matrix": [8, 7], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [6, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [0, 1], "x": 3, "y": 1},
+                {"matrix": [6, 1], "x": 4, "y": 1},
+                {"matrix": [0, 2], "x": 5, "y": 1},
+                {"matrix": [6, 2], "x": 6, "y": 1},
+                {"matrix": [0, 3], "x": 7, "y": 1},
+
+                {"matrix": [7, 3], "x": 9, "y": 1},
+                {"matrix": [1, 4], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [0, 5], "x": 12, "y": 1},
+                {"matrix": [6, 5], "x": 13, "y": 1},
+                {"matrix": [0, 6], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15, "y": 1},
+                {"matrix": [0, 7], "x": 16, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [1, 1], "x": 3, "y": 2},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [1, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [1, 3], "x": 7, "y": 2},
+
+                {"matrix": [6, 3], "x": 9.5, "y": 2},
+                {"matrix": [2, 4], "x": 10.5, "y": 2},
+                {"matrix": [5, 4], "x": 11.5, "y": 2},
+                {"matrix": [1, 5], "x": 12.5, "y": 2},
+                {"matrix": [5, 5], "x": 13.5, "y": 2},
+                {"matrix": [1, 6], "x": 14.5, "y": 2},
+                {"matrix": [5, 6], "x": 15.5, "y": 2, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [2, 1], "x": 3.25, "y": 3},
+                {"matrix": [4, 1], "x": 4.25, "y": 3},
+                {"matrix": [2, 2], "x": 5.25, "y": 3},
+                {"matrix": [4, 2], "x": 6.25, "y": 3},
+                {"matrix": [2, 3], "x": 7.25, "y": 3},
+
+                {"matrix": [5, 3], "x": 9.25, "y": 3},
+                {"matrix": [3, 4], "x": 10.25, "y": 3},
+                {"matrix": [4, 4], "x": 11.25, "y": 3},
+                {"matrix": [2, 5], "x": 12.25, "y": 3},
+                {"matrix": [4, 5], "x": 13.25, "y": 3},
+                {"matrix": [2, 6], "x": 14.25, "y": 3},
+                {"matrix": [4, 6], "x": 15.25, "y": 3, "w": 1.75},
+                {"matrix": [1, 7], "x": 17, "y": 3},
+
+                {"matrix": [3, 0], "x": 1, "y": 4, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.5, "y": 4, "w": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 4, "w": 2.25},
+                {"matrix": [3, 3], "x": 7.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 9.25, "y": 4, "w": 2},
+                {"matrix": [3, 5], "x": 11.25, "y": 4, "w": 1.5},
+                {"matrix": [2, 7], "x": 16.25, "y": 4, "w": 1.5}
+            ]
         },
         "LAYOUT_alice": {
-            "layout": [{"label":"F1", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Bsp", "x":15.25, "y":0, "w":2}, {"label":"F2", "x":0.25, "y":1}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"|", "x":16, "y":1, "w":1.5}, {"label":"F3", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":":", "x":13.5, "y":2}, {"label":"\"", "x":14.5, "y":2}, {"label":"Enter", "x":15.5, "y":2, "w":2.25}, {"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":"B", "x":9.25, "y":3}, {"label":"N", "x":10.25, "y":3}, {"label":"M", "x":11.25, "y":3}, {"label":"<", "x":12.25, "y":3}, {"label":">", "x":13.25, "y":3}, {"label":"?", "x":14.25, "y":3}, {"label":"Shift", "x":15.25, "y":3, "w":1.75}, {"label":"Up", "x":17, "y":3}, {"label":"Ctrl", "x":1, "y":4, "w":1.5}, {"label":"Alt", "x":3.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":2.25}, {"label":"Super", "x":7.25, "y":4, "w":1.25}, {"x":9.25, "y":4, "w":2}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.25, "y":4, "w":1.5}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [7, 0], "x": 1.75, "y": 0},
+                {"matrix": [8, 0], "x": 2.75, "y": 0},
+                {"matrix": [7, 1], "x": 3.75, "y": 0},
+                {"matrix": [8, 1], "x": 4.75, "y": 0},
+                {"matrix": [7, 2], "x": 5.75, "y": 0},
+                {"matrix": [8, 2], "x": 6.75, "y": 0},
+                {"matrix": [8, 3], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 4], "x": 9.25, "y": 0},
+                {"matrix": [7, 4], "x": 10.25, "y": 0},
+                {"matrix": [8, 4], "x": 11.25, "y": 0},
+                {"matrix": [7, 5], "x": 12.25, "y": 0},
+                {"matrix": [8, 5], "x": 13.25, "y": 0},
+                {"matrix": [7, 6], "x": 14.25, "y": 0},
+                {"matrix": [8, 6], "x": 15.25, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [6, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [0, 1], "x": 3, "y": 1},
+                {"matrix": [6, 1], "x": 4, "y": 1},
+                {"matrix": [0, 2], "x": 5, "y": 1},
+                {"matrix": [6, 2], "x": 6, "y": 1},
+                {"matrix": [0, 3], "x": 7, "y": 1},
+
+                {"matrix": [7, 3], "x": 9, "y": 1},
+                {"matrix": [1, 4], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [0, 5], "x": 12, "y": 1},
+                {"matrix": [6, 5], "x": 13, "y": 1},
+                {"matrix": [0, 6], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15, "y": 1},
+                {"matrix": [0, 7], "x": 16, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [1, 1], "x": 3, "y": 2},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [1, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [1, 3], "x": 7, "y": 2},
+
+                {"matrix": [6, 3], "x": 9.5, "y": 2},
+                {"matrix": [2, 4], "x": 10.5, "y": 2},
+                {"matrix": [5, 4], "x": 11.5, "y": 2},
+                {"matrix": [1, 5], "x": 12.5, "y": 2},
+                {"matrix": [5, 5], "x": 13.5, "y": 2},
+                {"matrix": [1, 6], "x": 14.5, "y": 2},
+                {"matrix": [5, 6], "x": 15.5, "y": 2, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [2, 1], "x": 3.25, "y": 3},
+                {"matrix": [4, 1], "x": 4.25, "y": 3},
+                {"matrix": [2, 2], "x": 5.25, "y": 3},
+                {"matrix": [4, 2], "x": 6.25, "y": 3},
+                {"matrix": [2, 3], "x": 7.25, "y": 3},
+
+                {"matrix": [5, 3], "x": 9.25, "y": 3},
+                {"matrix": [3, 4], "x": 10.25, "y": 3},
+                {"matrix": [4, 4], "x": 11.25, "y": 3},
+                {"matrix": [2, 5], "x": 12.25, "y": 3},
+                {"matrix": [4, 5], "x": 13.25, "y": 3},
+                {"matrix": [2, 6], "x": 14.25, "y": 3},
+                {"matrix": [4, 6], "x": 15.25, "y": 3, "w": 1.75},
+                {"matrix": [1, 7], "x": 17, "y": 3},
+
+                {"matrix": [3, 0], "x": 1, "y": 4, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.5, "y": 4, "w": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 4, "w": 2.25},
+                {"matrix": [3, 3], "x": 7.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 9.25, "y": 4, "w": 2},
+                {"matrix": [3, 5], "x": 11.25, "y": 4, "w": 1.5},
+                {"matrix": [2, 7], "x": 16.25, "y": 4, "w": 1.5}
+            ]
         }
     }
 }
diff --git a/keyboards/handwired/owlet60/matrix.c b/keyboards/handwired/owlet60/matrix.c
index ad36c99039..b233dd7a52 100644
--- a/keyboards/handwired/owlet60/matrix.c
+++ b/keyboards/handwired/owlet60/matrix.c
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <stdint.h>
 #include <stdbool.h>
-#include "owlet60.h"
 #include "wait.h"
 #include "print.h"
 #include "debug.h"
diff --git a/keyboards/handwired/owlet60/owlet60.h b/keyboards/handwired/owlet60/owlet60.h
deleted file mode 100644
index b54c3df0e2..0000000000
--- a/keyboards/handwired/owlet60/owlet60.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* Copyright 2019 worthlessowl
- *
- * 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
-
-#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_owlet60_split_bsp( \
-    k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \
-    k51, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      k1e, \
-    k52, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,           k2d, \
-         k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,      k3e, \
-         k40,      k41,      k42, k43, k44,           k45,          k46,  k47,      k48 \
-) { \
-    { k50, k11, k13, k15, k07, k19, k1b, k1d}, \
-    { k51, k21, k23, k25, k17, k29, k2b, k3d}, \
-    { k52, k31, k33, k35, k27, k39, k3b, k47}, \
-    { k40, k41, k42, k43, k37, k45, k46, k48}, \
-    { k30, k32, k34, k44, k38, k3a, k3c, k3e}, \
-    { k20, k22, k24, k36, k28, k2a, k2c, k2d}, \
-    { k10, k12, k14, k26, k18, k1a, k1c, k1e}, \
-    { k00, k02, k04, k16, k08, k0a, k0c, k0f}, \
-    { k01, k03, k05, k06, k09, k0b, k0d, k0e} \
-}
-
-#define LAYOUT_owlet60_full_bsp( \
-    k50,  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,    k0d,   k0f, \
-    k51,  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      k1e, \
-    k52,  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,           k2d, \
-          k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,      k3e, \
-          k40,      k41,      k42, k43, k44,           k45,          k46,  k47,      k48 \
-) { \
-    { k50, k11, k13, k15, k07, k19, k1b, k1d}, \
-    { k51, k21, k23, k25, k17, k29, k2b, k3d}, \
-    { k52, k31, k33, k35, k27, k39, k3b, k47}, \
-    { k40, k41, k42, k43, k37, k45, k46, k48}, \
-    { k30, k32, k34, k44, k38, k3a, k3c, k3e}, \
-    { k20, k22, k24, k36, k28, k2a, k2c, k2d}, \
-    { k10, k12, k14, k26, k18, k1a, k1c, k1e}, \
-    { k00, k02, k04, k16, k08, k0a, k0c, k0f}, \
-    { k01, k03, k05, k06, k09, k0b, k0d, KC_NO} \
-}
-
-#define LAYOUT_alice_split_bs( \
-    k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k51, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
-    k52, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,           \
-         k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,      \
-         k40,      k41,      k42, k43, k44,           k45,                k47      \
-) { \
-    { k50, k11, k13, k15, k07, k19, k1b, k1d}, \
-    { k51, k21, k23, k25, k17, k29, k2b, k3d}, \
-    { k52, k31, k33, k35, k27, k39, k3b, k47}, \
-    { k40, k41, k42, k43, k37, k45, KC_NO, KC_NO}, \
-    { k30, k32, k34, k44, k38, k3a, k3c, KC_NO}, \
-    { k20, k22, k24, k36, k28, k2a, k2c, KC_NO}, \
-    { k10, k12, k14, k26, k18, k1a, k1c, KC_NO}, \
-    { k00, k02, k04, k16, k08, k0a, k0c, KC_NO}, \
-    { k01, k03, k05, k06, k09, k0b, k0d, k0e} \
-}
-
-#define LAYOUT_alice( \
-    k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,  \
-    k51, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,  \
-    k52, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,       \
-         k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,  \
-         k40,      k41,      k42, k43, k44,           k45,                k47  \
-) { \
-    { k50, k11, k13, k15, k07, k19, k1b, k1d}, \
-    { k51, k21, k23, k25, k17, k29, k2b, k3d}, \
-    { k52, k31, k33, k35, k27, k39, k3b, k47}, \
-    { k40, k41, k42, k43, k37, k45, KC_NO, KC_NO}, \
-    { k30, k32, k34, k44, k38, k3a, k3c, KC_NO}, \
-    { k20, k22, k24, k36, k28, k2a, k2c, KC_NO}, \
-    { k10, k12, k14, k26, k18, k1a, k1c, KC_NO}, \
-    { k00, k02, k04, k16, k08, k0a, k0c, KC_NO}, \
-    { k01, k03, k05, k06, k09, k0b, k0d, KC_NO} \
-}
-
-#define LAYOUT_owlet60_60_percent_split_bsp LAYOUT_alice_split_bs
-#define LAYOUT_owlet60_60_percent_full_bsp LAYOUT_alice