408 files changed, 745 insertions, 3383 deletions

diff --git a/keyboards/al1/config.h b/keyboards/al1/config.h
index ea6474dc18..07cc94a279 100644
--- a/keyboards/al1/config.h
+++ b/keyboards/al1/config.h
@@ -30,6 +30,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 16
 
+#define MATRIX_ROW_PINS { C7, B1, B2, C6, B4, B5 }
+
+#define SN74X154_ADDRESS_PINS { D4, D5, D6, D7 }
+#define SN74X154_E1_PIN D3
+
 #define LED_NUM_LOCK_PIN D0
 #define LED_CAPS_LOCK_PIN B7
 #define LED_SCROLL_LOCK_PIN D1
diff --git a/keyboards/al1/matrix.c b/keyboards/al1/matrix.c
index 1407cbc089..e3d7971f1c 100644
--- a/keyboards/al1/matrix.c
+++ b/keyboards/al1/matrix.c
@@ -1,91 +1,101 @@
-#include "matrix.h"
+/* Copyright 2022
+ *
+ * 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/>.
+ */
 
+#include "matrix.h"
 #include "gpio.h"
+#include "sn74x154.h"
 
-static uint8_t read_rows(void) {
-    return (readPin(C7) ? 0 : 1) |
-           (readPin(B1) ? 0 : 2) |
-           (readPin(B2) ? 0 : 4) |
-           (readPin(C6) ? 0 : 8) |
-           (readPin(B4) ? 0 : 16) |
-           (readPin(B5) ? 0 : 32);
-}
+static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
 
+/* All columns use a 74HC154 4-to-16 demultiplexer.
+ * D3 is the enable pin, must be set high to use it.
+ *
+ *     A3   A2   A1   A0
+ *     D7   D6   D5   D4
+ * 0:   0    0    0    0
+ * 1:   0    0    0    1
+ * 2:   0    0    1    0
+ * 3:   0    0    1    1
+ * 4:   0    1    0    0
+ * 5:   0    1    0    1
+ * 6:   0    1    1    0
+ * 7:   0    1    1    1
+ * 8:   1    0    0    0
+ * 9:   1    0    0    1
+ * 10:  1    0    1    0
+ * 11:  1    0    1    1
+ * 12:  1    1    0    0
+ * 13:  1    1    0    1
+ * 14:  1    1    1    0
+ * 15:  1    1    1    1
+ */
 static void select_col(uint8_t col) {
-    writePinLow(D3);
-
-    writePin(D4, (col & 1));
-    writePin(D5, (col & 2));
-    writePin(D6, (col & 4));
-    writePin(D7, (col & 8));
+    sn74x154_set_addr(col);
 }
 
-static void  unselect_cols(void) {
-    writePinHigh(D3);
+static void init_pins(void) {
+    for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
+        setPinInputHigh(row_pins[x]);
+    }
 }
 
-void matrix_init_custom(void) {
-    /* 74HC154 col pin configuration
-     * pin:     D3  D7  D6  D5  D4
-     * row: off  0   x   x   x   x
-     *      0    1   0   0   0   0
-     *      1    1   0   0   0   1
-     *      2    1   0   0   1   0
-     *      3    1   0   0   1   1
-     *      4    1   0   1   0   0
-     *      5    1   0   1   0   1
-     *      6    1   0   1   1   0
-     *      7    1   0   1   1   1
-     *      8    1   1   0   0   0
-     *      9    1   1   0   0   1
-     *      10   1   1   0   1   0
-     *      11   1   1   0   1   1
-     *      12   1   1   1   0   0
-     *      13   1   1   1   0   1
-     *      14   1   1   1   1   0
-     *      15   1   1   1   1   1
-     */
-    setPinOutput(D3);
-    writePinHigh(D3);
+static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
+    bool matrix_changed = false;
+
+    // Select col and wait for col seleciton to stabilize
+    select_col(current_col);
+    matrix_io_delay();
 
-    setPinOutput(D4);
-    setPinOutput(D5);
-    setPinOutput(D6);
-    setPinOutput(D7);
+    // For each row...
+    for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) {
+        // Store last value of row prior to reading
+        matrix_row_t last_row_value = current_matrix[row_index];
 
+        // Check row pin state
+        if (readPin(row_pins[row_index]) == 0) {
+            // Pin LO, set col bit
+            current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col);
+        } else {
+            // Pin HI, clear col bit
+            current_matrix[row_index] &= ~(MATRIX_ROW_SHIFTER << current_col);
+        }
 
-    /* Row pin configuration
-     *
-     * row:  0  1  2  3  4  5
-     * pin: C7 B1 B2 C6 B4 B5
-     *
-     */
-    setPinInputHigh(C7);
-    setPinInputHigh(B1);
-    setPinInputHigh(B2);
-    setPinInputHigh(C6);
-    setPinInputHigh(B4);
-    setPinInputHigh(B5);
+        // Determine if the matrix changed state
+        if ((last_row_value != current_matrix[row_index]) && !(matrix_changed)) {
+            matrix_changed = true;
+        }
+    }
+
+    return matrix_changed;
+}
+
+void matrix_init_custom(void) {
+    // initialize demultiplexer
+    sn74x154_init();
+    sn74x154_set_enabled(true);
+    // initialize key pins
+    init_pins();
 }
 
 bool matrix_scan_custom(matrix_row_t current_matrix[]) {
     bool changed = false;
 
-    for (uint8_t col = 0; col < MATRIX_COLS; col++) {
-        select_col(col);
-        matrix_io_delay();
-        uint8_t rows = read_rows();
-
-        for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-            bool prev_bit = current_matrix[row] & ((matrix_row_t)1 << col);
-            bool curr_bit = rows & (1 << row);
-
-            if (prev_bit != curr_bit) {
-                current_matrix[row] ^= ((matrix_row_t)1 << col);
-                changed = true;
-            }
-        }
-        unselect_cols();
+    // Set col, read rows
+    for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
+        changed |= read_rows_on_col(current_matrix, current_col);
     }
 
     return changed;
diff --git a/keyboards/al1/rules.mk b/keyboards/al1/rules.mk
index 670712f661..1f8e81de20 100644
--- a/keyboards/al1/rules.mk
+++ b/keyboards/al1/rules.mk
@@ -18,4 +18,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 CUSTOM_MATRIX = lite
-SRC += matrix.c
+VPATH += drivers/gpio
+SRC += matrix.c sn74x154.c
diff --git a/keyboards/amj40/amj40.c b/keyboards/amjkeyboard/amj40/amj40.c
index f0f3121c6a..f0f3121c6a 100755
--- a/keyboards/amj40/amj40.c
+++ b/keyboards/amjkeyboard/amj40/amj40.c
diff --git a/keyboards/amj40/amj40.h b/keyboards/amjkeyboard/amj40/amj40.h
index 14ea383811..14ea383811 100755
--- a/keyboards/amj40/amj40.h
+++ b/keyboards/amjkeyboard/amj40/amj40.h
diff --git a/keyboards/amj40/config.h b/keyboards/amjkeyboard/amj40/config.h
index 71a8d34413..2f472eac01 100755
--- a/keyboards/amj40/config.h
+++ b/keyboards/amjkeyboard/amj40/config.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x00D8 //A+M+J
 #define PRODUCT_ID      0x6072
 #define DEVICE_VER      0x0002
 #define MANUFACTURER    Han Chen
diff --git a/keyboards/amj40/info.json b/keyboards/amjkeyboard/amj40/info.json
index 575fd1b034..575fd1b034 100644
--- a/keyboards/amj40/info.json
+++ b/keyboards/amjkeyboard/amj40/info.json
diff --git a/keyboards/amj40/keymaps/default/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/default/keymap.c
index 658b4b3c55..658b4b3c55 100755
--- a/keyboards/amj40/keymaps/default/keymap.c
+++ b/keyboards/amjkeyboard/amj40/keymaps/default/keymap.c
diff --git a/keyboards/amj40/keymaps/default/readme.md b/keyboards/amjkeyboard/amj40/keymaps/default/readme.md
index 2659292ae5..2659292ae5 100755
--- a/keyboards/amj40/keymaps/default/readme.md
+++ b/keyboards/amjkeyboard/amj40/keymaps/default/readme.md
diff --git a/keyboards/amj40/keymaps/default_625u_space/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/default_625u_space/keymap.c
index f5b33ad84f..f5b33ad84f 100644
--- a/keyboards/amj40/keymaps/default_625u_space/keymap.c
+++ b/keyboards/amjkeyboard/amj40/keymaps/default_625u_space/keymap.c
diff --git a/keyboards/amj40/keymaps/default_ortho_275u_space/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/default_ortho_275u_space/keymap.c
index fe99884696..fe99884696 100644
--- a/keyboards/amj40/keymaps/default_ortho_275u_space/keymap.c
+++ b/keyboards/amjkeyboard/amj40/keymaps/default_ortho_275u_space/keymap.c
diff --git a/keyboards/amj40/keymaps/default_ortho_600u_space/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/default_ortho_600u_space/keymap.c
index 527390cd1e..527390cd1e 100644
--- a/keyboards/amj40/keymaps/default_ortho_600u_space/keymap.c
+++ b/keyboards/amjkeyboard/amj40/keymaps/default_ortho_600u_space/keymap.c
diff --git a/keyboards/amj40/keymaps/fabian/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/fabian/keymap.c
index a35337a4e2..a35337a4e2 100755
--- a/keyboards/amj40/keymaps/fabian/keymap.c
+++ b/keyboards/amjkeyboard/amj40/keymaps/fabian/keymap.c
diff --git a/keyboards/amj40/keymaps/fabian/rules.mk b/keyboards/amjkeyboard/amj40/keymaps/fabian/rules.mk
index 59a2cb09a8..59a2cb09a8 100644
--- a/keyboards/amj40/keymaps/fabian/rules.mk
+++ b/keyboards/amjkeyboard/amj40/keymaps/fabian/rules.mk
diff --git a/keyboards/amj40/keymaps/jetpacktuxedo/config.h b/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/config.h
index 7311833201..7311833201 100644
--- a/keyboards/amj40/keymaps/jetpacktuxedo/config.h
+++ b/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/config.h
diff --git a/keyboards/amj40/keymaps/jetpacktuxedo/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/keymap.c
index caf6700bc3..caf6700bc3 100755
--- a/keyboards/amj40/keymaps/jetpacktuxedo/keymap.c
+++ b/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/keymap.c
diff --git a/keyboards/amj40/keymaps/jetpacktuxedo/readme.md b/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/readme.md
index 64ae16c7eb..64ae16c7eb 100755
--- a/keyboards/amj40/keymaps/jetpacktuxedo/readme.md
+++ b/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/readme.md
diff --git a/keyboards/amj40/keymaps/jetpacktuxedo/rules.mk b/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/rules.mk
index 780d48a438..780d48a438 100644
--- a/keyboards/amj40/keymaps/jetpacktuxedo/rules.mk
+++ b/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/rules.mk
diff --git a/keyboards/amj40/keymaps/myee/build.sh b/keyboards/amjkeyboard/amj40/keymaps/myee/build.sh
index 6b4b4568f5..6b4b4568f5 100644
--- a/keyboards/amj40/keymaps/myee/build.sh
+++ b/keyboards/amjkeyboard/amj40/keymaps/myee/build.sh
diff --git a/keyboards/amj40/keymaps/myee/config.h b/keyboards/amjkeyboard/amj40/keymaps/myee/config.h
index 8e6c4dfa43..8e6c4dfa43 100644
--- a/keyboards/amj40/keymaps/myee/config.h
+++ b/keyboards/amjkeyboard/amj40/keymaps/myee/config.h
diff --git a/keyboards/amj40/keymaps/myee/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/myee/keymap.c
index ec8cdd87db..ec8cdd87db 100644
--- a/keyboards/amj40/keymaps/myee/keymap.c
+++ b/keyboards/amjkeyboard/amj40/keymaps/myee/keymap.c
diff --git a/keyboards/amj40/keymaps/myee/readme.md b/keyboards/amjkeyboard/amj40/keymaps/myee/readme.md
index 2659292ae5..2659292ae5 100644
--- a/keyboards/amj40/keymaps/myee/readme.md
+++ b/keyboards/amjkeyboard/amj40/keymaps/myee/readme.md
diff --git a/keyboards/amj40/keymaps/myee/rules.mk b/keyboards/amjkeyboard/amj40/keymaps/myee/rules.mk
index b8cc8b42c7..b8cc8b42c7 100644
--- a/keyboards/amj40/keymaps/myee/rules.mk
+++ b/keyboards/amjkeyboard/amj40/keymaps/myee/rules.mk
diff --git a/keyboards/amj40/keymaps/myee/updatemerge.sh b/keyboards/amjkeyboard/amj40/keymaps/myee/updatemerge.sh
index da5457e195..da5457e195 100644
--- a/keyboards/amj40/keymaps/myee/updatemerge.sh
+++ b/keyboards/amjkeyboard/amj40/keymaps/myee/updatemerge.sh
diff --git a/keyboards/amj40/readme.md b/keyboards/amjkeyboard/amj40/readme.md
index 1d7316fcf5..f557b9df49 100755
--- a/keyboards/amj40/readme.md
+++ b/keyboards/amjkeyboard/amj40/readme.md
@@ -12,11 +12,11 @@ DIY/Assembled compact 40% keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make amj40:default
+    make amjkeyboard/amj40:default
 
 Flashing example for this keyboard:
 
-    make amj40:default:flash
+    make amjkeyboard/amj40:default:flash
 
 To reset the board into bootloader mode, hold the key at the top left of the keyboard while connecting the USB cable (also erases persistent settings).
 
diff --git a/keyboards/amj40/rules.mk b/keyboards/amjkeyboard/amj40/rules.mk
index b27013f863..b27013f863 100755
--- a/keyboards/amj40/rules.mk
+++ b/keyboards/amjkeyboard/amj40/rules.mk
diff --git a/keyboards/amj60/amj60.c b/keyboards/amjkeyboard/amj60/amj60.c
index af0539a679..af0539a679 100644
--- a/keyboards/amj60/amj60.c
+++ b/keyboards/amjkeyboard/amj60/amj60.c
diff --git a/keyboards/amj60/amj60.h b/keyboards/amjkeyboard/amj60/amj60.h
index feda680030..feda680030 100644
--- a/keyboards/amj60/amj60.h
+++ b/keyboards/amjkeyboard/amj60/amj60.h
diff --git a/keyboards/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h
index 1c25e4fea0..4e894a45fc 100644
--- a/keyboards/amj60/config.h
+++ b/keyboards/amjkeyboard/amj60/config.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x00D8 //A+M+J
 #define PRODUCT_ID      0x6066
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    Han Chen
diff --git a/keyboards/amj60/info.json b/keyboards/amjkeyboard/amj60/info.json
index 2c1781738e..2c1781738e 100644
--- a/keyboards/amj60/info.json
+++ b/keyboards/amjkeyboard/amj60/info.json
diff --git a/keyboards/amj60/keymaps/default/keymap.c b/keyboards/amjkeyboard/amj60/keymaps/default/keymap.c
index 6a0a394f54..6a0a394f54 100644
--- a/keyboards/amj60/keymaps/default/keymap.c
+++ b/keyboards/amjkeyboard/amj60/keymaps/default/keymap.c
diff --git a/keyboards/amj60/readme.md b/keyboards/amjkeyboard/amj60/readme.md
index 50cf3cfcb2..8f276bd89f 100644
--- a/keyboards/amj60/readme.md
+++ b/keyboards/amjkeyboard/amj60/readme.md
@@ -11,11 +11,11 @@ A 60% keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make amj60:default
+    make amjkeyboard/amj60:default
 
 Flashing example for this keyboard:
 
-    make amj60:default:flash
+    make amjkeyboard/amj60:default:flash
 
 To reset the board into bootloader mode, tap the Reset switch mounted on the bottom side of the PCB.
 
diff --git a/keyboards/amj60/rules.mk b/keyboards/amjkeyboard/amj60/rules.mk
index 602667e948..602667e948 100644
--- a/keyboards/amj60/rules.mk
+++ b/keyboards/amjkeyboard/amj60/rules.mk
diff --git a/keyboards/amjkeyboard/amj66/config.h b/keyboards/amjkeyboard/amj66/config.h
index 1f8a930a6a..cc84524b0b 100644
--- a/keyboards/amjkeyboard/amj66/config.h
+++ b/keyboards/amjkeyboard/amj66/config.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x00D8 //A+M+J
 #define PRODUCT_ID      0xBD66
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    AMJKeyboard
diff --git a/keyboards/amj96/amj96.c b/keyboards/amjkeyboard/amj96/amj96.c
index 65fca6f12a..65fca6f12a 100644
--- a/keyboards/amj96/amj96.c
+++ b/keyboards/amjkeyboard/amj96/amj96.c
diff --git a/keyboards/amj96/amj96.h b/keyboards/amjkeyboard/amj96/amj96.h
index bd4e688360..bd4e688360 100644
--- a/keyboards/amj96/amj96.h
+++ b/keyboards/amjkeyboard/amj96/amj96.h
diff --git a/keyboards/amj96/config.h b/keyboards/amjkeyboard/amj96/config.h
index f5b26220b7..67b3699047 100644
--- a/keyboards/amj96/config.h
+++ b/keyboards/amjkeyboard/amj96/config.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x00D8 //A+M+J
 #define PRODUCT_ID      0x6074
 #define DEVICE_VER      0x0002
 #define MANUFACTURER    Han Chen
diff --git a/keyboards/amj96/info.json b/keyboards/amjkeyboard/amj96/info.json
index b2aac215c0..b2aac215c0 100644
--- a/keyboards/amj96/info.json
+++ b/keyboards/amjkeyboard/amj96/info.json
diff --git a/keyboards/amj96/keymaps/default/keymap.c b/keyboards/amjkeyboard/amj96/keymaps/default/keymap.c
index baa4bef9dc..baa4bef9dc 100644
--- a/keyboards/amj96/keymaps/default/keymap.c
+++ b/keyboards/amjkeyboard/amj96/keymaps/default/keymap.c
diff --git a/keyboards/amj96/matrix.c b/keyboards/amjkeyboard/amj96/matrix.c
index 2999c6241b..2999c6241b 100644
--- a/keyboards/amj96/matrix.c
+++ b/keyboards/amjkeyboard/amj96/matrix.c
diff --git a/keyboards/amj96/readme.md b/keyboards/amjkeyboard/amj96/readme.md
index 8cd4ea94a1..0941b6f3e1 100644
--- a/keyboards/amj96/readme.md
+++ b/keyboards/amjkeyboard/amj96/readme.md
@@ -8,11 +8,11 @@ The AMD96 is a 96 key custom keyboard with anodized aluminum case, twin usb port
 
 Make example for this keyboard (after setting up your build environment):
 
-    make amj96:default
+    make amjkeyboard/amj96:default
 
 Flashing example for this keyboard:
 
-    make amj96:default:flash
+    make amjkeyboard/amj96:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
diff --git a/keyboards/amj96/rules.mk b/keyboards/amjkeyboard/amj96/rules.mk
index 9e9f03f764..9e9f03f764 100644
--- a/keyboards/amj96/rules.mk
+++ b/keyboards/amjkeyboard/amj96/rules.mk
diff --git a/keyboards/amjpad/amjpad.c b/keyboards/amjkeyboard/amjpad/amjpad.c
index 83cdedf688..83cdedf688 100644
--- a/keyboards/amjpad/amjpad.c
+++ b/keyboards/amjkeyboard/amjpad/amjpad.c
diff --git a/keyboards/amjpad/amjpad.h b/keyboards/amjkeyboard/amjpad/amjpad.h
index 976a7ab041..976a7ab041 100644
--- a/keyboards/amjpad/amjpad.h
+++ b/keyboards/amjkeyboard/amjpad/amjpad.h
diff --git a/keyboards/amjpad/config.h b/keyboards/amjkeyboard/amjpad/config.h
index dd8ed34e47..fe621b7bf3 100644
--- a/keyboards/amjpad/config.h
+++ b/keyboards/amjkeyboard/amjpad/config.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x00D8 //A+M+J
 #define PRODUCT_ID      0x6060
 #define DEVICE_VER      0x0003
 #define MANUFACTURER    AMJ
diff --git a/keyboards/amjpad/info.json b/keyboards/amjkeyboard/amjpad/info.json
index 76147716d2..76147716d2 100644
--- a/keyboards/amjpad/info.json
+++ b/keyboards/amjkeyboard/amjpad/info.json
diff --git a/keyboards/amjpad/keymaps/default/keymap.c b/keyboards/amjkeyboard/amjpad/keymaps/default/keymap.c
index 9df4317bb0..9df4317bb0 100644
--- a/keyboards/amjpad/keymaps/default/keymap.c
+++ b/keyboards/amjkeyboard/amjpad/keymaps/default/keymap.c
diff --git a/keyboards/amjpad/keymaps/max/keymap.c b/keyboards/amjkeyboard/amjpad/keymaps/max/keymap.c
index 7bfaed5999..7bfaed5999 100644
--- a/keyboards/amjpad/keymaps/max/keymap.c
+++ b/keyboards/amjkeyboard/amjpad/keymaps/max/keymap.c
diff --git a/keyboards/amjpad/keymaps/ortho_left/keymap.c b/keyboards/amjkeyboard/amjpad/keymaps/ortho_left/keymap.c
index 815ac2a681..815ac2a681 100644
--- a/keyboards/amjpad/keymaps/ortho_left/keymap.c
+++ b/keyboards/amjkeyboard/amjpad/keymaps/ortho_left/keymap.c
diff --git a/keyboards/amjpad/keymaps/ortho_right/keymap.c b/keyboards/amjkeyboard/amjpad/keymaps/ortho_right/keymap.c
index cbb81a2eab..cbb81a2eab 100644
--- a/keyboards/amjpad/keymaps/ortho_right/keymap.c
+++ b/keyboards/amjkeyboard/amjpad/keymaps/ortho_right/keymap.c
diff --git a/keyboards/amjpad/readme.md b/keyboards/amjkeyboard/amjpad/readme.md
index c069af25ad..98af32edef 100644
--- a/keyboards/amjpad/readme.md
+++ b/keyboards/amjkeyboard/amjpad/readme.md
@@ -9,6 +9,6 @@ Hardware Availability: https://geekhack.org/index.php?topic=83546.0
 
 Make example for this keyboard (after setting up your build environment):
 
-    make amjpad:default
+    make amjkeyboard/amjpad:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/keyboards/amjpad/rules.mk b/keyboards/amjkeyboard/amjpad/rules.mk
index c56fff39b3..c56fff39b3 100644
--- a/keyboards/amjpad/rules.mk
+++ b/keyboards/amjkeyboard/amjpad/rules.mk
diff --git a/keyboards/bt66tech/bt66tech60/chconf.h b/keyboards/bt66tech/bt66tech60/chconf.h
deleted file mode 100644
index 93c4ebe405..0000000000
--- a/keyboards/bt66tech/bt66tech60/chconf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2020 QMK
- *
- * 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/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/bt66tech/bt66tech60/chconf.h -r platforms/chibios/common/configs/chconf.h`
- */
-
-#pragma once
-
-#define CH_CFG_ST_TIMEDELTA 0
-
-#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-
-#include_next <chconf.h>
-
diff --git a/keyboards/cannonkeys/ortho48/chconf.h b/keyboards/cannonkeys/ortho48/chconf.h
deleted file mode 100644
index 583eb9febf..0000000000
--- a/keyboards/cannonkeys/ortho48/chconf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2020 QMK
- *
- * 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/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/cannonkeys/ortho48/chconf.h -r platforms/chibios/common/configs/chconf.h`
- */
-
-#pragma once
-
-#define CH_CFG_ST_TIMEDELTA 0
-
-#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-
-#include_next <chconf.h>
-
diff --git a/keyboards/cannonkeys/ortho60/chconf.h b/keyboards/cannonkeys/ortho60/chconf.h
deleted file mode 100644
index ae16c0f747..0000000000
--- a/keyboards/cannonkeys/ortho60/chconf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2020 QMK
- *
- * 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/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/cannonkeys/ortho60/chconf.h -r platforms/chibios/common/configs/chconf.h`
- */
-
-#pragma once
-
-#define CH_CFG_ST_TIMEDELTA 0
-
-#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-
-#include_next <chconf.h>
-
diff --git a/keyboards/cannonkeys/ortho75/chconf.h b/keyboards/cannonkeys/ortho75/chconf.h
deleted file mode 100644
index 2bf13952d9..0000000000
--- a/keyboards/cannonkeys/ortho75/chconf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2020 QMK
- *
- * 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/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/cannonkeys/ortho75/chconf.h -r platforms/chibios/common/configs/chconf.h`
- */
-
-#pragma once
-
-#define CH_CFG_ST_TIMEDELTA 0
-
-#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-
-#include_next <chconf.h>
-
diff --git a/keyboards/cannonkeys/practice60/chconf.h b/keyboards/cannonkeys/practice60/chconf.h
deleted file mode 100644
index ddf9c24df7..0000000000
--- a/keyboards/cannonkeys/practice60/chconf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2020 QMK
- *
- * 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/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/cannonkeys/practice60/chconf.h -r platforms/chibios/common/configs/chconf.h`
- */
-
-#pragma once
-
-#define CH_CFG_ST_TIMEDELTA 0
-
-#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-
-#include_next <chconf.h>
-
diff --git a/keyboards/cannonkeys/practice65/chconf.h b/keyboards/cannonkeys/practice65/chconf.h
deleted file mode 100644
index 0f412cfbf4..0000000000
--- a/keyboards/cannonkeys/practice65/chconf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2020 QMK
- *
- * 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/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/cannonkeys/practice65/chconf.h -r platforms/chibios/common/configs/chconf.h`
- */
-
-#pragma once
-
-#define CH_CFG_ST_TIMEDELTA 0
-
-#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-
-#include_next <chconf.h>
-
diff --git a/keyboards/converter/siemens_tastatur/chconf.h b/keyboards/converter/siemens_tastatur/chconf.h
deleted file mode 100644
index eed5776e77..0000000000
--- a/keyboards/converter/siemens_tastatur/chconf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2020 QMK
- *
- * 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/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/converter/siemens_tastatur/chconf.h -r platforms/chibios/common/configs/chconf.h`
- */
-
-#pragma once
-
-#define CH_CFG_ST_TIMEDELTA 0
-
-#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-
-#include_next <chconf.h>
-
diff --git a/keyboards/draculad/config.h b/keyboards/draculad/config.h
index abcdc76b4b..3060f801c6 100644
--- a/keyboards/draculad/config.h
+++ b/keyboards/draculad/config.h
@@ -61,7 +61,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_PAD_A {B2 , B4}
 #define ENCODERS_PAD_B {B6 , B5}
 
-#define ENCODER_RESOLUTIONS { 4, 4, 4, 1}
+#define ENCODER_RESOLUTIONS { 4, 4 }
+#define ENCODER_RESOLUTIONS_RIGHT { 4, 1 }
 #define UNUSED_PINS
 
 #define EE_HANDS
diff --git a/keyboards/evyd13/wasdat/matrix.c b/keyboards/evyd13/wasdat/matrix.c
index c97dd84694..60a1ea235a 100644
--- a/keyboards/evyd13/wasdat/matrix.c
+++ b/keyboards/evyd13/wasdat/matrix.c
@@ -24,27 +24,28 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
 static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
 
-/* col 0: C7
- * col 1: B6
- * col 2: C6
- * col 3: B4
- * col 4: B5
- * col 5: D7
+/* Columns 6-12 use a 74HC138 3-to-8 demultiplexer.
  *
- * These columns use a 74HC138 3 to 8 bit demultiplexer.
- *                A2   A1   A0
- * col / pin:    PD0  PD1  PD2
- * 6:              1    1    1
- * 7:              1    1    0
- * 8:              1    0    1
- * 9:              1    0    0
- * 10:             0    1    1
- * 11:             0    1    0
- * 12:             0    0    1
+ * 0:  C7
+ * 1:  B6
+ * 2:  C6
+ * 3:  B4
+ * 4:  B5
+ * 5:  D7
  *
- * col 13: D3
- * col 14: B7
- * col 15: B3
+ *     A2   A1   A0
+ *     D0   D1   D2
+ * 6:   1    1    1
+ * 7:   1    1    0
+ * 8:   1    0    1
+ * 9:   1    0    0
+ * 10:  0    1    1
+ * 11:  0    1    0
+ * 12:  0    0    1
+ *
+ * 13: D3
+ * 14: B7
+ * 15: B3
  */
 static void select_col(uint8_t col) {
     if (col_pins[col] != NO_PIN) {
@@ -117,10 +118,10 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
 }
 
 void matrix_init_custom(void) {
-    // initialize key pins
-    init_pins();
     // initialize demultiplexer
     sn74x138_init();
+    // initialize key pins
+    init_pins();
 }
 
 bool matrix_scan_custom(matrix_row_t current_matrix[]) {
diff --git a/keyboards/evyd13/wasdat_code/config.h b/keyboards/evyd13/wasdat_code/config.h
index ae009c1c29..a8b5c032ca 100644
--- a/keyboards/evyd13/wasdat_code/config.h
+++ b/keyboards/evyd13/wasdat_code/config.h
@@ -41,22 +41,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
 */
 #define MATRIX_ROW_PINS { E6, C7, C6, B6, B5, B4, D7, D6 }
-#define MATRIX_COL_PINS { }
+#define MATRIX_COL_PINS { F7, F5, F6, F1, F4, F0, NO_PIN, D5, D3, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN } // Columns 6 and 9-15 controlled by demux
 #define UNUSED_PINS
 
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
+#define SN74X138_ADDRESS_PINS { D2, D1, D0 }
+#define SN74X138_E3_PIN D4
 
 // For QMK DFU
 #define QMK_ESC_OUTPUT E6
 #define QMK_ESC_INPUT F0
 #define QMK_LED B1
 
-/*
- * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
- */
-//#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
-
 #define LED_NUM_LOCK_PIN B3
 #define LED_CAPS_LOCK_PIN B1
 #define LED_SCROLL_LOCK_PIN B2
diff --git a/keyboards/evyd13/wasdat_code/matrix.c b/keyboards/evyd13/wasdat_code/matrix.c
index 7844db7ab7..f30ea3355a 100644
--- a/keyboards/evyd13/wasdat_code/matrix.c
+++ b/keyboards/evyd13/wasdat_code/matrix.c
@@ -14,280 +14,70 @@ 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/>.
 */
+
 #include <stdint.h>
 #include <stdbool.h>
-#include "wait.h"
-#include "util.h"
 #include "matrix.h"
-#include "debounce.h"
 #include "quantum.h"
+#include "sn74x138.h"
 
-#ifdef DIRECT_PINS
-static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS;
-#elif (DIODE_DIRECTION == ROW2COL) || (DIODE_DIRECTION == COL2ROW)
 static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
-//static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
-#endif
-
-// matrix code
-
-#ifdef DIRECT_PINS
-
-static void init_pins(void) {
-    for (int row = 0; row < MATRIX_ROWS; row++) {
-        for (int col = 0; col < MATRIX_COLS; col++) {
-            pin_t pin = direct_pins[row][col];
-            if (pin != NO_PIN) {
-                setPinInputHigh(pin);
-            }
-        }
-    }
-}
-
-static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
-    matrix_row_t last_row_value = current_matrix[current_row];
-    current_matrix[current_row] = 0;
-
-    for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
-        pin_t pin = direct_pins[current_row][col_index];
-        if (pin != NO_PIN) {
-            current_matrix[current_row] |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index);
-        }
-    }
-
-    return (last_row_value != current_matrix[current_row]);
-}
-
-#elif (DIODE_DIRECTION == COL2ROW)
-
-static void select_row(uint8_t row) {
-    setPinOutput(row_pins[row]);
-    writePinLow(row_pins[row]);
-}
-
-static void unselect_row(uint8_t row) { setPinInputHigh(row_pins[row]); }
-
-static void unselect_rows(void) {
-    for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
-        setPinInputHigh(row_pins[x]);
-    }
-}
-
-static void init_pins(void) {
-    unselect_rows();
-    for (uint8_t x = 0; x < MATRIX_COLS; x++) {
-        setPinInputHigh(col_pins[x]);
-    }
-}
-
-static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
-    // Store last value of row prior to reading
-    matrix_row_t last_row_value = current_matrix[current_row];
-
-    // Clear data in matrix row
-    current_matrix[current_row] = 0;
-
-    // Select row and wait for row selecton to stabilize
-    select_row(current_row);
-    wait_us(30);
-
-    // For each col...
-    for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
-
-        // Select the col pin to read (active low)
-        uint8_t pin_state = readPin(col_pins[col_index]);
-
-        // Populate the matrix row with the state of the col pin
-        current_matrix[current_row] |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
-    }
-
-    // Unselect row
-    unselect_row(current_row);
-
-    return (last_row_value != current_matrix[current_row]);
-}
-
-#elif (DIODE_DIRECTION == ROW2COL)
-
-/* Cols 0 - 15
- * col 0: F7
- * col 1: F5
- * col 2: F6
- * col 3: F1
- * col 4: F4
- * col 5: F0
- * These columns use a 74HC237D 3 to 8 bit demultiplexer. D4 is the enable pin, must be set high to use it.
- *                A0   A1   A2
- * col / pin:    PD2  PD1  PD0
- * 6:             1    1    1
- * col 7:  D3
- * col 8:  B7
- * 9:             0    1    1
- * 10:            1    0    1
- * 11:            0    0    1
- * 12:            1    1    0
- * 13:            0    1    0
- * 14:            1    0    0
- * 15:            0    0    0
+static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+
+/* Columns 6 and 9-15 use a 74HC138 3-to-8 demultiplexer.
+ * D4 is the enable pin, must be set high to use it.
+ *
+ * 0:  F7
+ * 1:  F5
+ * 2:  F6
+ * 3:  F1
+ * 4:  F4
+ * 5:  F0
+ *
+ *     A2   A1   A0
+ *     D0   D1   D2
+ * 6:   1    1    1
+ *
+ * 7:  D5
+ * 8:  D3
+ *
+ * 9:   1    1    0
+ * 10:  1    0    1
+ * 11:  1    0    0
+ * 12:  0    1    1
+ * 13:  0    1    0
+ * 14:  0    0    1
+ * 15:  0    0    0
  */
 static void select_col(uint8_t col) {
-    switch (col) {
-        case 0:
-            writePinLow(F7);
-            break;
-        case 1:
-            writePinLow(F5);
-            break;
-        case 2:
-            writePinLow(F6);
-            break;
-        case 3:
-            writePinLow(F1);
-            break;
-        case 4:
-            writePinLow(F4);
-            break;
-        case 5:
-            writePinLow(F0);
-            break;
-        case 6:
-            writePinHigh(D4);
-            writePinHigh(D2);
-            writePinHigh(D1);
-            writePinHigh(D0);
-            break;
-        case 7:
-            writePinLow(D5);
-            break;
-        case 8:
-            writePinLow(D3);
-            break;
-        case 9:
-            writePinHigh(D4);
-            writePinHigh(D1);
-            writePinHigh(D0);
-            break;
-        case 10:
-            writePinHigh(D4);
-            writePinHigh(D2);
-            writePinHigh(D0);
-            break;
-        case 11:
-            writePinHigh(D4);
-            writePinHigh(D0);
-            break;
-        case 12:
-            writePinHigh(D4);
-            writePinHigh(D2);
-            writePinHigh(D1);
-            break;
-        case 13:
-            writePinHigh(D4);
-            writePinHigh(D1);
-            break;
-        case 14:
-            writePinHigh(D4);
-            writePinHigh(D2);
-            break;
-        case 15:
-            writePinHigh(D4);
-            break;
+    if (col_pins[col] != NO_PIN) {
+        writePinLow(col_pins[col]);
+    } else {
+        sn74x138_set_addr((col == 6) ? 7 : 15 - col);
+        sn74x138_set_enabled(true);
     }
 }
 
 static void unselect_col(uint8_t col) {
-    switch (col) {
-        case 0:
-            writePinHigh(F7);
-            break;
-        case 1:
-            writePinHigh(F5);
-            break;
-        case 2:
-            writePinHigh(F6);
-            break;
-        case 3:
-            writePinHigh(F1);
-            break;
-        case 4:
-            writePinHigh(F4);
-            break;
-        case 5:
-            writePinHigh(F0);
-            break;
-        case 6:
-            writePinLow(D4);
-            writePinLow(D2);
-            writePinLow(D1);
-            writePinLow(D0);
-            break;
-        case 7:
-            writePinHigh(D5);
-            break;
-        case 8:
-            writePinHigh(D3);
-            break;
-        case 9:
-            writePinLow(D4);
-            writePinLow(D2);
-            writePinLow(D1);
-            writePinLow(D0);
-            break;
-        case 10:
-            writePinLow(D4);
-            writePinLow(D2);
-            writePinLow(D1);
-            writePinLow(D0);
-            break;
-        case 11:
-            writePinLow(D4);
-            writePinLow(D2);
-            writePinLow(D1);
-            writePinLow(D0);
-            break;
-        case 12:
-            writePinLow(D4);
-            writePinLow(D2);
-            writePinLow(D1);
-            writePinLow(D0);
-            break;
-        case 13:
-            writePinLow(D4);
-            writePinLow(D2);
-            writePinLow(D1);
-            writePinLow(D0);
-            break;
-        case 14:
-            writePinLow(D4);
-            writePinLow(D2);
-            writePinLow(D1);
-            writePinLow(D0);
-            break;
-        case 15:
-            writePinLow(D4);
-            writePinLow(D2);
-            writePinLow(D1);
-            writePinLow(D0);
-            break;
+    if (col_pins[col] != NO_PIN) {
+        setPinOutput(col_pins[col]);
+        writePinHigh(col_pins[col]);
+    } else {
+        sn74x138_set_enabled(false);
     }
 }
 
 static void unselect_cols(void) {
-    //Native
-    writePinHigh(F7);
-    writePinHigh(F5);
-    writePinHigh(F6);
-    writePinHigh(F1);
-    writePinHigh(F4);
-    writePinHigh(F0);
-    writePinHigh(D3);
-    writePinHigh(D5);
+    // Native
+    for (uint8_t x = 0; x < MATRIX_COLS; x++) {
+        if (col_pins[x] != NO_PIN) {
+            setPinOutput(col_pins[x]);
+            writePinHigh(col_pins[x]);
+        }
+    }
 
-    //Demultiplexer
-    writePinLow(D4);
-    writePinLow(D2);
-    writePinLow(D1);
-    writePinLow(D0);
+    // Demultiplexer
+    sn74x138_set_enabled(false);
 }
 
 static void init_pins(void) {
@@ -295,27 +85,14 @@ static void init_pins(void) {
     for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
         setPinInputHigh(row_pins[x]);
     }
-    setPinOutput(D0);
-    setPinOutput(D1);
-    setPinOutput(D2);
-    setPinOutput(D3);
-    setPinOutput(F7);
-    setPinOutput(F5);
-    setPinOutput(F6);
-    setPinOutput(F1);
-    setPinOutput(F4);
-    setPinOutput(F0);
-    setPinOutput(D3);
-    setPinOutput(D5);
-    setPinOutput(D4);
 }
 
 static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
     bool matrix_changed = false;
 
-    // Select col and wait for col selecton to stabilize
+    // Select col and wait for col selection to stabilize
     select_col(current_col);
-    wait_us(30);
+    matrix_io_delay();
 
     // For each row...
     for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) {
@@ -343,9 +120,9 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
     return matrix_changed;
 }
 
-#endif
-
 void matrix_init_custom(void) {
+    // initialize demultiplexer
+    sn74x138_init();
     // initialize key pins
     init_pins();
 }
@@ -353,17 +130,10 @@ void matrix_init_custom(void) {
 bool matrix_scan_custom(matrix_row_t current_matrix[]) {
     bool changed = false;
 
-#if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW)
-    // Set row, read cols
-    for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) {
-        changed |= read_cols_on_row(current_matrix, current_row);
-    }
-#elif (DIODE_DIRECTION == ROW2COL)
     // Set col, read rows
     for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
         changed |= read_rows_on_col(current_matrix, current_col);
     }
-#endif
 
     return changed;
 }
diff --git a/keyboards/evyd13/wasdat_code/rules.mk b/keyboards/evyd13/wasdat_code/rules.mk
index 6fd1fce10e..b37dfa459c 100644
--- a/keyboards/evyd13/wasdat_code/rules.mk
+++ b/keyboards/evyd13/wasdat_code/rules.mk
@@ -18,6 +18,7 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 CUSTOM_MATRIX = lite
-SRC += matrix.c
+VPATH += drivers/gpio
+SRC += matrix.c sn74x138.c
 
 LAYOUTS = fullsize_ansi fullsize_iso tkl_ansi tkl_iso
diff --git a/keyboards/ramonimbao/squishyfrl/chconf.h b/keyboards/gmmk/pro/ansi/keymaps/andrewcharnley/config.h
index ce018f56a7..aee1ba39d5 100644
--- a/keyboards/ramonimbao/squishyfrl/chconf.h
+++ b/keyboards/gmmk/pro/ansi/keymaps/andrewcharnley/config.h
@@ -1,4 +1,4 @@
-/* Copyright 2020 QMK
+/* Copyright 2021 Andrew Charnley
  *
  * 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
@@ -14,11 +14,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #pragma once
 
-#define CH_CFG_ST_TIMEDELTA 0
+#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_LIGHT
+#define RGBLIGHT_DEFAULT_SAT 0
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
 
-#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#include_next <chconf.h>
diff --git a/keyboards/gmmk/pro/ansi/keymaps/andrewcharnley/keymap.c b/keyboards/gmmk/pro/ansi/keymaps/andrewcharnley/keymap.c
new file mode 100644
index 0000000000..d044008a23
--- /dev/null
+++ b/keyboards/gmmk/pro/ansi/keymaps/andrewcharnley/keymap.c
@@ -0,0 +1,87 @@
+/* Copyright 2021 Andrew Charnley
+ *
+ * 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/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Windows key changed to second FN key. Use KC_LGUI to revert.
+
+enum userspace_layers {
+  QWERTY,
+  FNLAYER
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    // The FN key by default maps to a momentary toggle to layer 1 to provide access to the RESET key (to put the board into bootloader mode). Without
+    // this mapping, you have to open the case to hit the button on the bottom of the PCB (near the USB cable attachment) while plugging in the USB
+    // cable to get the board into bootloader mode - definitely not fun when you're working on your QMK builds. Remove this and put it back to KC_RGUI
+    // if that's your preference.
+    //
+    // To put the keyboard in bootloader mode, use FN+backslash. If you accidentally put it into bootloader, you can just unplug the USB cable and
+    // it'll be back to normal when you plug it back in.
+
+    [QWERTY] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,          KC_MUTE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, MO(FNLAYER), KC_LALT,                            KC_SPC,                       KC_RALT, MO(FNLAYER),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [FNLAYER] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_MEDIA_PLAY_PAUSE,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET  ,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, RGB_VAI, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, RGB_VAD, _______
+    ),
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+  if(IS_LAYER_ON(FNLAYER)) {
+     if (clockwise) {
+       tap_code(KC_MEDIA_NEXT_TRACK);
+     } else {
+       tap_code(KC_MEDIA_PREV_TRACK);
+     }
+  } else {
+     if (clockwise) {
+       tap_code(KC_VOLU);
+     } else {
+       tap_code(KC_VOLD);
+     }
+  }
+  return false;
+}
+
+static uint8_t val;
+
+void keyboard_post_init_user(void) {
+
+  val = rgb_matrix_get_val();
+}
+
+void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+
+  if (host_keyboard_led_state().caps_lock) {
+    rgb_matrix_set_color_all(val,0,0);
+  } else {
+    rgb_matrix_set_color_all(val, val, val);
+    val = rgb_matrix_get_val();
+  }
+}
diff --git a/keyboards/gmmk/pro/ansi/keymaps/andrewcharnley/readme.md b/keyboards/gmmk/pro/ansi/keymaps/andrewcharnley/readme.md
new file mode 100644
index 0000000000..e064edd83a
--- /dev/null
+++ b/keyboards/gmmk/pro/ansi/keymaps/andrewcharnley/readme.md
@@ -0,0 +1,18 @@
+# Description
+A keymap designed to be functional for development purposes - no flashing lights or gimmicks. PRTSC and DEL key in the top right corner.
+Solid backlight that changes red if CAPS is on and reverts back afterwards. Brightness retained in both cases.
+Backlight is disabled on suspend and restored upon wake-up.
+The 'Windows' key is a second FN key. This makes it more natural to use the encoder wheel (good luck trying to do it with one hand).
+
+Compile using `qmk compile -kb gmmk/pro/ansi -km andrewcharnley`
+
+# Encoder
+FN + Encoder scroll = media next/prev
+FN + Encoder press = media pause
+default encoder behavior = volume up/down
+
+# Function Layer
+FN + Up = increase brightness
+FN + Down = decrease brightness
+FN + Backslash = bootloader
+
diff --git a/keyboards/handwired/battleship_gamepad/battleship_gamepad.c b/keyboards/handwired/battleship_gamepad/battleship_gamepad.c
index 918a3852d0..2c9de15a9f 100644
--- a/keyboards/handwired/battleship_gamepad/battleship_gamepad.c
+++ b/keyboards/handwired/battleship_gamepad/battleship_gamepad.c
@@ -15,8 +15,6 @@
  */
 
 #include "battleship_gamepad.h"
-#include "joystick.h"
-#include "analog.h"
 
 /* joystick config */
 joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {
diff --git a/keyboards/handwired/misterdeck/keymaps/default/keymap.c b/keyboards/handwired/misterdeck/keymaps/default/keymap.c
index 217d25551c..b8ed3cb9d9 100644
--- a/keyboards/handwired/misterdeck/keymaps/default/keymap.c
+++ b/keyboards/handwired/misterdeck/keymaps/default/keymap.c
@@ -16,8 +16,6 @@
 
 #include QMK_KEYBOARD_H
 
-#include "joystick.h"
-
 enum layer_names {
   NORMAL_LAYER = 0
 };
diff --git a/keyboards/handwired/misterdeck/keymaps/nobuttons/keymap.c b/keyboards/handwired/misterdeck/keymaps/nobuttons/keymap.c
index d4c52be35d..5c69d2bc21 100644
--- a/keyboards/handwired/misterdeck/keymaps/nobuttons/keymap.c
+++ b/keyboards/handwired/misterdeck/keymaps/nobuttons/keymap.c
@@ -16,8 +16,6 @@
 
 #include QMK_KEYBOARD_H
 
-#include "joystick.h"
-
 enum layer_names {
   NORMAL_LAYER = 0
 };
diff --git a/keyboards/handwired/ms_sculpt_mobile/astar/config.h b/keyboards/handwired/ms_sculpt_mobile/astar/config.h
new file mode 100644
index 0000000000..c34b86acb2
--- /dev/null
+++ b/keyboards/handwired/ms_sculpt_mobile/astar/config.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#define PRODUCT sculpt mobile astar
+
+#define MATRIX_ROW_PINS { D7, C6, D4, D0, D1, D3, D2, E2 }
+#define MATRIX_COL_PINS { B4, B5, E6, B7, B6, D6, C7, F7, F6, F4, F5, F1, F0, D5, B0, B1, B2, B3 }
diff --git a/keyboards/handwired/ms_sculpt_mobile/astar/rules.mk b/keyboards/handwired/ms_sculpt_mobile/astar/rules.mk
new file mode 100644
index 0000000000..cf663a7ed6
--- /dev/null
+++ b/keyboards/handwired/ms_sculpt_mobile/astar/rules.mk
@@ -0,0 +1,5 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
diff --git a/keyboards/handwired/ms_sculpt_mobile/config.h b/keyboards/handwired/ms_sculpt_mobile/config.h
index 13f5a588b6..df478e6d8a 100644
--- a/keyboards/handwired/ms_sculpt_mobile/config.h
+++ b/keyboards/handwired/ms_sculpt_mobile/config.h
@@ -29,23 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 18
 
-#ifdef ASTAR
-#define PRODUCT         sculpt mobile astar
-                        /*0   1   2   3    4   5  6   7   8 */
-#define MATRIX_ROW_PINS {D7, C6, D4, D0, D1, D3, D2, E2}
-/*                        A  B   C   D   E   F   G   H   I   J  K   L   M   N   O   P   Q  R  */
-#define MATRIX_COL_PINS {B4, B5, E6, B7, B6, D6,  C7, F7, F6, F4,F5, F1,F0, D5, B0, B1, B2, B3}
-
-#else
-#define PRODUCT         sculpt mobile teensypp
-/* 			0  1  2  3  4 5  6   7 */
-#define MATRIX_ROW_PINS { F7,F6,F4,F5,F3,F2,F1,F0}
-/*                        A   B   C   D   E   F   G   H   I   J  K  L   M   N   O   P   Q  R  */
-#define MATRIX_COL_PINS { B7, D0, D1, D2, D3, D4, D5, D6, D7, E0,E1,C1, C0, C3, C2, C5, C4,C7}
-#define UNUSED_PINS { B6,B5,B4,B3,B2,B1,B0 }
-
-#endif
-
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
 
diff --git a/keyboards/handwired/ms_sculpt_mobile/info.json b/keyboards/handwired/ms_sculpt_mobile/info.json
index 98137e84f8..1c171af8f3 100644
--- a/keyboards/handwired/ms_sculpt_mobile/info.json
+++ b/keyboards/handwired/ms_sculpt_mobile/info.json
@@ -1,94 +1,99 @@
 {
-  "keyboard_name": "MS Sculpt Mobile",
-  "url": "",
-  "maintainer": "qmk",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"label":"Esc", "x":0, "y":0},
-        {"label":"F1", "x":1, "y":0},
-        {"label":"F2", "x":2, "y":0},
-        {"label":"F3", "x":3, "y":0},
-        {"label":"F4", "x":4, "y":0},
-        {"label":"F5", "x":5, "y":0},
-        {"label":"F6", "x":6, "y":0},
-        {"label":"F7", "x":7, "y":0},
-        {"label":"F8", "x":8, "y":0},
-        {"label":"F9", "x":9, "y":0},
-        {"label":"F10", "x":10, "y":0},
-        {"label":"F11", "x":11, "y":0},
-        {"label":"F12", "x":12, "y":0},
-        {"label":"PrtSc", "x":13, "y":0},
-        {"label":"Home", "x":14, "y":0},
-        {"label":"End", "x":15, "y":0},
-        {"label":"`", "x":0, "y":1},
-        {"label":"1", "x":1, "y":1},
-        {"label":"2", "x":2, "y":1},
-        {"label":"3", "x":3, "y":1},
-        {"label":"4", "x":4, "y":1},
-        {"label":"5", "x":5, "y":1},
-        {"label":"6", "x":6, "y":1},
-        {"label":"7", "x":7, "y":1},
-        {"label":"8", "x":8, "y":1},
-        {"label":"9", "x":9, "y":1},
-        {"label":"0", "x":10, "y":1},
-        {"label":"-", "x":11, "y":1},
-        {"label":"=", "x":12, "y":1},
-        {"label":"Backspace", "x":13, "y":1, "w":2},
-        {"label":"Del", "x":15, "y":1, "h":1.6},
-        {"label":"Tab", "x":0, "y":2, "w":1.5},
-        {"label":"Q", "x":1.5, "y":2},
-        {"label":"W", "x":2.5, "y":2},
-        {"label":"E", "x":3.5, "y":2},
-        {"label":"R", "x":4.5, "y":2},
-        {"label":"T", "x":5.5, "y":2},
-        {"label":"Y", "x":6.5, "y":2},
-        {"label":"U", "x":7.5, "y":2},
-        {"label":"I", "x":8.5, "y":2},
-        {"label":"O", "x":9.5, "y":2},
-        {"label":"P", "x":10.5, "y":2},
-        {"label":"[", "x":11.5, "y":2},
-        {"label":"]", "x":12.5, "y":2},
-        {"label":"\\", "x":13.5, "y":2, "w":1.5},
-        {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-        {"label":"A", "x":1.75, "y":3},
-        {"label":"S", "x":2.75, "y":3},
-        {"label":"D", "x":3.75, "y":3},
-        {"label":"F", "x":4.75, "y":3},
-        {"label":"G", "x":5.75, "y":3},
-        {"label":"H", "x":6.75, "y":3},
-        {"label":"J", "x":7.75, "y":3},
-        {"label":"K", "x":8.75, "y":3},
-        {"label":"L", "x":9.75, "y":3},
-        {"label":";", "x":10.75, "y":3},
-        {"label":"'", "x":11.75, "y":3},
-        {"label":"Enter", "x":12.75, "y":3, "w":2.25},
-        {"label":"PgUp", "x":15, "y":2.6, "h":1.2},
-        {"label":"LShift", "x":0, "y":4, "w":2.25},
-        {"label":"Z", "x":2.25, "y":4},
-        {"label":"X", "x":3.25, "y":4},
-        {"label":"C", "x":4.25, "y":4},
-        {"label":"V", "x":5.25, "y":4},
-        {"label":"B", "x":6.25, "y":4},
-        {"label":"N", "x":7.25, "y":4},
-        {"label":"M", "x":8.25, "y":4},
-        {"label":",", "x":9.25, "y":4},
-        {"label":".", "x":10.25, "y":4},
-        {"label":"/", "x":11.25, "y":4},
-        {"label":"RShift", "x":12.25, "y":4, "w":1.75},
-        {"label":"Up", "x":14, "y":4},
-        {"label":"PgDn", "x":15, "y":3.8, "h":1.2},
-        {"label":"LCtrl", "x":0, "y":5, "w":1.25},
-        {"label":"LWin", "x":1.25, "y":5, "w":1.25},
-        {"label":"LAlt", "x":2.5, "y":5, "w":1.25},
-        {"label":"Space", "x":3.75, "y":5, "w":5.5},
-        {"label":"RAlt", "x":9.25, "y":5, "w":1.25},
-        {"label":"Fn", "x":10.5, "y":5, "w":1.25},
-        {"label":"RCtrl", "x":11.75, "y":5, "w":1.25},
-        {"label":"Left", "x":13, "y":5},
-        {"label":"Down", "x":14, "y":5},
-        {"label":"Right", "x":15, "y":5}
-      ]
+    "keyboard_name": "MS Sculpt Mobile",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT": {
+            "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": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15, "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": 12, "y": 1},
+                {"x": 13, "y": 1, "w": 2},
+                {"x": 15, "y": 1, "h": 1.6},
+
+                {"x": 0, "y": 2, "w": 1.5},
+                {"x": 1.5, "y": 2},
+                {"x": 2.5, "y": 2},
+                {"x": 3.5, "y": 2},
+                {"x": 4.5, "y": 2},
+                {"x": 5.5, "y": 2},
+                {"x": 6.5, "y": 2},
+                {"x": 7.5, "y": 2},
+                {"x": 8.5, "y": 2},
+                {"x": 9.5, "y": 2},
+                {"x": 10.5, "y": 2},
+                {"x": 11.5, "y": 2},
+                {"x": 12.5, "y": 2},
+                {"x": 13.5, "y": 2, "w": 1.5},
+
+                {"x": 0, "y": 3, "w": 1.75},
+                {"x": 1.75, "y": 3},
+                {"x": 2.75, "y": 3},
+                {"x": 3.75, "y": 3},
+                {"x": 4.75, "y": 3},
+                {"x": 5.75, "y": 3},
+                {"x": 6.75, "y": 3},
+                {"x": 7.75, "y": 3},
+                {"x": 8.75, "y": 3},
+                {"x": 9.75, "y": 3},
+                {"x": 10.75, "y": 3},
+                {"x": 11.75, "y": 3},
+                {"x": 12.75, "y": 3, "w": 2.25},
+                {"x": 15, "y": 2.6, "h": 1.2},
+
+                {"x": 0, "y": 4, "w": 2.25},
+                {"x": 2.25, "y": 4},
+                {"x": 3.25, "y": 4},
+                {"x": 4.25, "y": 4},
+                {"x": 5.25, "y": 4},
+                {"x": 6.25, "y": 4},
+                {"x": 7.25, "y": 4},
+                {"x": 8.25, "y": 4},
+                {"x": 9.25, "y": 4},
+                {"x": 10.25, "y": 4},
+                {"x": 11.25, "y": 4},
+                {"x": 12.25, "y": 4, "w": 1.75},
+                {"x": 14, "y": 4},
+                {"x": 15, "y": 3.8, "h": 1.2},
+
+                {"x": 0, "y": 5, "w": 1.25},
+                {"x": 1.25, "y": 5, "w": 1.25},
+                {"x": 2.5, "y": 5, "w": 1.25},
+                {"x": 3.75, "y": 5, "w": 5.5},
+                {"x": 9.25, "y": 5, "w": 1.25},
+                {"x": 10.5, "y": 5, "w": 1.25},
+                {"x": 11.75, "y": 5, "w": 1.25},
+                {"x": 13, "y": 5},
+                {"x": 14, "y": 5},
+                {"x": 15, "y": 5}
+            ]
+        }
     }
-  }
 }
diff --git a/keyboards/handwired/ms_sculpt_mobile/keymaps/default/rules.mk b/keyboards/handwired/ms_sculpt_mobile/keymaps/default/rules.mk
index 3224016bbe..a9c1087a2a 100644
--- a/keyboards/handwired/ms_sculpt_mobile/keymaps/default/rules.mk
+++ b/keyboards/handwired/ms_sculpt_mobile/keymaps/default/rules.mk
@@ -1,9 +1,3 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
+MOUSEKEY_ENABLE = yes
+CONSOLE_ENABLE = no
 NKRO_ENABLE = yes
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
diff --git a/keyboards/handwired/ms_sculpt_mobile/readme.md b/keyboards/handwired/ms_sculpt_mobile/readme.md
index 98fd1f8d1a..0345ded36b 100644
--- a/keyboards/handwired/ms_sculpt_mobile/readme.md
+++ b/keyboards/handwired/ms_sculpt_mobile/readme.md
@@ -46,8 +46,6 @@ The Astar mini has all pins exposed , so you can do 18x8
 If you want a speaker, LEDs, etc., you'll need to free up a pin.  I recommend joining columns
 R and L to the same pin.
 
-Building - add ASTAR=1 to the compile line or leave out for teensy2++
-
 Make example for this keyboard (after setting up your build environment):
 
     make handwired/ms_sculpt_mobile:default
diff --git a/keyboards/handwired/ms_sculpt_mobile/rules.mk b/keyboards/handwired/ms_sculpt_mobile/rules.mk
index 6498fa6c76..6fd84c8244 100644
--- a/keyboards/handwired/ms_sculpt_mobile/rules.mk
+++ b/keyboards/handwired/ms_sculpt_mobile/rules.mk
@@ -1,26 +1,14 @@
-# MCU name
-ifdef ASTAR
-    MCU = atmega32u4
-    CFLAGS = -D ASTAR
-else
-    MCU = at90usb1286
-endif
-
-# Bootloader selection
-ifdef ASTAR
-    BOOTLOADER = caterina
-else
-    BOOTLOADER = atmel-dfu
-endif
-
 # Build Options
 #   change yes to no to disable
 #
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
+MOUSEKEY_ENABLE = no        # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
 COMMAND_ENABLE = yes        # Commands for debug and configuration
 NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
+
+DEFAULT_FOLDER = handwired/ms_sculpt_mobile/teensy2pp
diff --git a/keyboards/handwired/ms_sculpt_mobile/teensy2pp/config.h b/keyboards/handwired/ms_sculpt_mobile/teensy2pp/config.h
new file mode 100644
index 0000000000..a69d3fd3b0
--- /dev/null
+++ b/keyboards/handwired/ms_sculpt_mobile/teensy2pp/config.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#define PRODUCT sculpt mobile teensypp
+
+#define MATRIX_ROW_PINS { F7, F6, F4, F5, F3, F2, F1, F0 }
+#define MATRIX_COL_PINS { B7, D0, D1, D2, D3, D4, D5, D6, D7, E0, E1, C1, C0, C3, C2, C5, C4, C7 }
diff --git a/keyboards/handwired/ms_sculpt_mobile/teensy2pp/rules.mk b/keyboards/handwired/ms_sculpt_mobile/teensy2pp/rules.mk
new file mode 100644
index 0000000000..149471682d
--- /dev/null
+++ b/keyboards/handwired/ms_sculpt_mobile/teensy2pp/rules.mk
@@ -0,0 +1,5 @@
+# MCU name
+MCU = at90usb1286
+
+# Bootloader selection
+BOOTLOADER = halfkay
diff --git a/keyboards/handwired/onekey/blackpill_f401/blackpill_f401.c b/keyboards/handwired/onekey/blackpill_f401/blackpill_f401.c
deleted file mode 100644
index 1287614a8b..0000000000
--- a/keyboards/handwired/onekey/blackpill_f401/blackpill_f401.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2020 Sergey Vlasov (sigprof)
- *
- * 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-void board_init(void) {
-    // B9 is configured as I2C1_SDA_PIN in the board file; that function must be
-    // disabled before using B7 as I2C1_SDA.
-    setPinInputHigh(B9);
-}
diff --git a/keyboards/handwired/onekey/bluepill/chconf.h b/keyboards/handwired/onekey/bluepill/chconf.h
deleted file mode 100644
index 63236f2c2c..0000000000
--- a/keyboards/handwired/onekey/bluepill/chconf.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2020 QMK
- *
- * 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/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/bluepill/chconf.h -r platforms/chibios/common/configs/chconf.h`
- */
-
-#pragma once
-
-#define CH_CFG_ST_TIMEDELTA 0
-
-#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-
-#include_next <chconf.h>
diff --git a/keyboards/handwired/onekey/keymaps/hardware_id/keymap.c b/keyboards/handwired/onekey/keymaps/hardware_id/keymap.c
new file mode 100644
index 0000000000..bcec8b3ca1
--- /dev/null
+++ b/keyboards/handwired/onekey/keymaps/hardware_id/keymap.c
@@ -0,0 +1,28 @@
+#include QMK_KEYBOARD_H
+#include "hardware_id.h"
+#include <stdio.h>
+enum custom_keycodes {
+    DUMP_ID = SAFE_RANGE,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    LAYOUT_ortho_1x1(DUMP_ID)
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case DUMP_ID:
+            if (record->event.pressed) {
+                hardware_id_t id = get_hardware_id();
+                char buffer[100];
+                sprintf(buffer, "ID:%lu:%lu:%lu:%lu\n", id.data[0], id.data[1], id.data[2], id.data[3]);
+#ifdef CONSOLE_ENABLE
+                    printf(buffer);
+#else
+                    send_string(buffer);
+#endif
+            }
+            break;
+    }
+    return false;
+};
diff --git a/keyboards/handwired/onekey/keymaps/joystick/keymap.c b/keyboards/handwired/onekey/keymaps/joystick/keymap.c
index f427b9d77d..7a2f138b28 100644
--- a/keyboards/handwired/onekey/keymaps/joystick/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/joystick/keymap.c
@@ -1,7 +1,5 @@
 #include QMK_KEYBOARD_H
 
-#include "joystick.h"
-
 #ifndef ADC_PIN
 #    define ADC_PIN F6
 #endif
diff --git a/keyboards/handwired/pill60/bluepill/chconf.h b/keyboards/handwired/pill60/bluepill/chconf.h
deleted file mode 100644
index c92d2a276d..0000000000
--- a/keyboards/handwired/pill60/bluepill/chconf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2020 QMK
- *
- * 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/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/handwired/pill60/bluepill/chconf.h -r platforms/chibios/common/configs/chconf.h`
- */
-
-#pragma once
-
-#define CH_CFG_ST_TIMEDELTA 0
-
-#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-
-#include_next <chconf.h>
-
diff --git a/keyboards/handwired/sono1/stm32f103/chconf.h b/keyboards/handwired/sono1/stm32f103/chconf.h
deleted file mode 100644
index 63236f2c2c..0000000000
--- a/keyboards/handwired/sono1/stm32f103/chconf.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2020 QMK
- *
- * 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/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/bluepill/chconf.h -r platforms/chibios/common/configs/chconf.h`
- */
-
-#pragma once
-
-#define CH_CFG_ST_TIMEDELTA 0
-
-#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-
-#include_next <chconf.h>
diff --git a/keyboards/handwired/t111/chconf.h b/keyboards/handwired/t111/chconf.h
deleted file mode 100644
index 962653ec4c..0000000000
--- a/keyboards/handwired/t111/chconf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2020 QMK
- *
- * 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/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/handwired/t111/chconf.h -r platforms/chibios/common/configs/chconf.h`
- */
-
-#pragma once
-
-#define CH_CFG_ST_TIMEDELTA 0
-
-#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-
-#include_next <chconf.h>
-
diff --git a/keyboards/handwired/uthol/rev3/rev3.c b/keyboards/handwired/uthol/rev3/rev3.c
index 2ababdfbe8..6c06387ee8 100644
--- a/keyboards/handwired/uthol/rev3/rev3.c
+++ b/keyboards/handwired/uthol/rev3/rev3.c
@@ -16,5 +16,3 @@
  */
 
 #include QMK_KEYBOARD_H
-
-void board_init(void) { setPinInputHigh(B9); }
diff --git a/keyboards/handwired/wakizashi40/config.h b/keyboards/handwired/wakizashi40/config.h
index 78f85f2197..e9976616ec 100644
--- a/keyboards/handwired/wakizashi40/config.h
+++ b/keyboards/handwired/wakizashi40/config.h
@@ -17,4 +17,3 @@
 #pragma once
 
 #include "config_common.h"
-#define DYNAMIC_KEYMAP_LAYER_COUNT 12
diff --git a/keyboards/handwired/wakizashi40/info.json b/keyboards/handwired/wakizashi40/info.json
index 58eadb29e6..b97d61171b 100644
--- a/keyboards/handwired/wakizashi40/info.json
+++ b/keyboards/handwired/wakizashi40/info.json
@@ -1,9 +1,9 @@
 {
-  "manufacturer": "fumbucker",
+  "manufacturer": "xia0",
   "keyboard_name": "Wakizashi 40",
-  "maintainer": "fumbucker",
+  "maintainer": "xia0",
   "debounce": 5,
-  "processor": "at90usb1286",
+  "processor": "atmega32u4",
   "diode_direction": "COL2ROW",
   "features": {
     "audio": false,
@@ -20,8 +20,8 @@
     "unicode": false
   },
   "matrix_pins": {
-    "cols": ["C5", "C4", "D2", "D3", "D4", "D5", "C6", "D7", "B0", "B1", "B2", "B3", "B4"],
-    "rows": ["C0", "C1", "C2", "C3"]
+    "cols": ["F4", "F6", "F7", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4"],
+    "rows": ["D3", "D2", "D1", "D0"]
   },
   "usb": {
     "vid": "0x6662",
diff --git a/keyboards/handwired/wakizashi40/keymaps/via/keymap.c b/keyboards/handwired/wakizashi40/keymaps/via/keymap.c
index d456b8b40a..fb9d37ac20 100644
--- a/keyboards/handwired/wakizashi40/keymaps/via/keymap.c
+++ b/keyboards/handwired/wakizashi40/keymaps/via/keymap.c
@@ -16,77 +16,27 @@
 
 #include QMK_KEYBOARD_H
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	[0] = LAYOUT_all(
-		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
-		MO(3), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
-		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ESC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
-		KC_LCTL, KC_LGUI, KC_LALT, LT(1, KC_SPC), LT(2, KC_SPC), KC_LALT, KC_MENU, KC_LCTL),
-
-	[1] = LAYOUT_all(
-		KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F5, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
-		MO(11), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_TRNS, KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS),
-
-	[2] = LAYOUT_all(
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS,
-		MO(11), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_TRNS, KC_QUOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS),
-
-	[3] = LAYOUT_all(
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_QUOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-	[4] = LAYOUT_all(
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-	[5] = LAYOUT_all(
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-	[6] = LAYOUT_all(
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-	[7] = LAYOUT_all(
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-	[8] = LAYOUT_all(
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-	[9] = LAYOUT_all(
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-	[10] = LAYOUT_all(
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-	[11] = LAYOUT_all(
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-
+  [0] = LAYOUT_all(
+    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+    MO(3), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
+    KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ESC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+    KC_LCTL, KC_LGUI, KC_LALT, LT(1, KC_SPC), LT(2, KC_SPC), KC_LALT, KC_MENU, KC_LCTL),
+
+  [1] = LAYOUT_all(
+    KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F5, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
+    MO(3), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_TRNS, KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS),
+
+  [2] = LAYOUT_all(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS,
+    MO(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_TRNS, KC_QUOT,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS),
+
+  [3] = LAYOUT_all(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_QUOT,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 };
diff --git a/keyboards/handwired/wakizashi40/readme.md b/keyboards/handwired/wakizashi40/readme.md
index d94a75651c..8bb6c2aebc 100644
--- a/keyboards/handwired/wakizashi40/readme.md
+++ b/keyboards/handwired/wakizashi40/readme.md
@@ -1,12 +1,12 @@
 # Wakizashi 40
 
-![Wakizashi40](https://cdn.thingiverse.com/renders/51/50/81/13/a9/7078248666f70b422127c6662cf79563_preview_featured.jpg)
+![Wakizashi40](https://i.imgur.com/TVTfa0X.jpg)
 
 Reverse stagger 40% keyboard based on the Katana 60.
 
-* Keyboard Maintainer: [fumbucker](https://github.com/xia0)
-* Hardware Supported: Teensy2++
-* Hardware Availability: [thingiverse](https://www.thingiverse.com/thing:3467930)
+* Keyboard Maintainer: [xia0](https://github.com/xia0)
+* Hardware Supported: ATmega32u4
+* Hardware Availability: [prusaprinters.org](https://www.prusaprinters.org/prints/128575-wakizashi-40-keyboard)
 
 Make example for this keyboard (after setting up your build environment):
 
@@ -16,4 +16,6 @@ See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools)
 
 ## Bootloader
 
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available (Capslock + R).
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/handwired/xealous/info.json b/keyboards/handwired/xealous/info.json
index 7113c311f2..9cd634a210 100644
--- a/keyboards/handwired/xealous/info.json
+++ b/keyboards/handwired/xealous/info.json
@@ -3,7 +3,7 @@
   "url": "",
   "maintainer": "alex-ong",
   "layouts": {
-    "LAYOUT_ANSI_DEFAULT": {
+    "LAYOUT": {
       "layout": [
         {"label":"Esc", "x":0, "y":0},
         {"label":"1", "x":1, "y":0},
@@ -25,11 +25,7 @@
         {"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":"R", "x": 4.5,"y":1},
         {"label":"T", "x":5.5, "y":1},
 
         {"label":"Y", "x":6.5, "y":1},
@@ -73,15 +69,14 @@
         {"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":2.75},
-        {"x":6.5, "y":4, "w":1.25},
+        {"x":3.75, "y":4, "w":1.25},
+        {"x":5, "y":4, "w":2.25},
 
-        {"x":7.75, "y":4, "w":1.25},
-        {"x":9, "y":4, "w":2.0},
-        {"label":"Alt", "x":11, "y":4},
-        {"label":"Win", "x":12, "y":4},
-        {"label":"Menu", "x":13, "y":4},
-        {"label":"Ctrl", "x":14, "y":4}
+        {"x":7.25, "y":4, "w":2.75},
+        {"label":"Alt", "x":10, "y":4, "w":1.25},
+        {"label":"Win", "x":11.25, "y":4, "w":1.25},
+        {"label":"Menu", "x":12.5, "y":4, "w":1.25},
+        {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
       ]
     }
   }
diff --git a/keyboards/handwired/xealous/keymaps/default/keymap.c b/keyboards/handwired/xealous/keymaps/default/keymap.c
index bf7caef622..c0ce72214d 100644
--- a/keyboards/handwired/xealous/keymaps/default/keymap.c
+++ b/keyboards/handwired/xealous/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------'
    */
   /* Layer 0: Qwerty */
-  [_QWERTY] = LAYOUT_split60(
+  [_QWERTY] = LAYOUT(
     KC_ESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
     KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         FN,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 
   /* Layer 1: Numpad */
-  [_NUMPAD] = LAYOUT_split60(
+  [_NUMPAD] = LAYOUT(
     _______,  _______,  _______, _______,  _______,  _______,  _______,   KC_NLCK,  KC_PSLS,  KC_PAST,    KC_MINUS,  _______, _______,  KC_BSPC,
     _______,  _______,  _______, _______,  _______,  _______,  _______,     KC_P7,  KC_P8,        KC_P9,    KC_PLUS,  _______, _______,   KC_BSLS,
     _______,  _______,  _______, _______,  _______,  _______,  _______,     KC_P4,  KC_P5,        KC_P6,    KC_BSPC, _______,          _______,
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 
   /* Layer 2: RAISE */
-  [_FN] = LAYOUT_split60(
+  [_FN] = LAYOUT(
      KC_GRV,    KC_F1,    KC_F2,   KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,  KC_F11,   KC_F12,   KC_DEL,
     KC_CAPS,  KC_PGUP,    KC_UP, KC_PGDN,  _______,  _______,  _______,  KC_PGUP,    KC_UP,  KC_PGDN,    KC_PSCR, KC_SLCK,  KC_PAUS,  _______,
     _______,  KC_LEFT,  KC_DOWN,KC_RIGHT,  _______,  KC_HOME,  KC_HOME,  KC_LEFT,  KC_DOWN, KC_RIGHT,    KC_INS,  KC_DEL,             _______,
@@ -96,6 +96,3 @@ layer_state_t default_layer_state_set_kb(layer_state_t state) {
     return state;
 }
 #endif
-
-void led_set_keymap(uint8_t usb_led) {  
-}
diff --git a/keyboards/handwired/xealous/rev1/rev1.h b/keyboards/handwired/xealous/rev1/rev1.h
index 88e5ef376e..ce8d68c2c1 100644
--- a/keyboards/handwired/xealous/rev1/rev1.h
+++ b/keyboards/handwired/xealous/rev1/rev1.h
@@ -22,5 +22,3 @@
     { R30, R31, R32, R33, R34, R35, XXX, XXX }, \
     { R40, R41, R42, R43, R44, XXX, XXX, XXX } \
 }
-
-#define LAYOUT_split60 LAYOUT
diff --git a/keyboards/handwired/z150/chconf.h b/keyboards/handwired/z150/chconf.h
deleted file mode 100644
index 975667df0e..0000000000
--- a/keyboards/handwired/z150/chconf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2020 QMK
- *
- * 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/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/handwired/z150/chconf.h -r platforms/chibios/common/configs/chconf.h`
- */
-
-#pragma once
-
-#define CH_CFG_ST_TIMEDELTA 0
-
-#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-
-#include_next <chconf.h>
-
diff --git a/keyboards/helix/local_drivers/i2c.c b/keyboards/helix/local_drivers/i2c.c
deleted file mode 100644
index 9221429e96..0000000000
--- a/keyboards/helix/local_drivers/i2c.c
+++ /dev/null
@@ -1,159 +0,0 @@
-#include <util/twi.h>
-#include <avr/io.h>
-#include <stdlib.h>
-#include <avr/interrupt.h>
-#include <util/twi.h>
-#include <stdbool.h>
-#include "i2c.h"
-
-// Limits the amount of we wait for any one i2c transaction.
-// Since were running SCL line 100kHz (=> 10μs/bit), and each transactions is
-// 9 bits, a single transaction will take around 90μs to complete.
-//
-// (F_CPU/SCL_CLOCK)  =>  # of μC cycles to transfer a bit
-// poll loop takes at least 8 clock cycles to execute
-#define I2C_LOOP_TIMEOUT (9+1)*(F_CPU/SCL_CLOCK)/8
-
-#define BUFFER_POS_INC() (slave_buffer_pos = (slave_buffer_pos+1)%SLAVE_BUFFER_SIZE)
-
-volatile uint8_t i2c_slave_buffer[SLAVE_BUFFER_SIZE];
-
-static volatile uint8_t slave_buffer_pos;
-static volatile bool slave_has_register_set = false;
-
-// Wait for an i2c operation to finish
-inline static
-void i2c_delay(void) {
-  uint16_t lim = 0;
-  while(!(TWCR & (1<<TWINT)) && lim < I2C_LOOP_TIMEOUT)
-    lim++;
-
-  // easier way, but will wait slightly longer
-  // _delay_us(100);
-}
-
-// Setup twi to run at 100kHz or 400kHz (see ./i2c.h SCL_CLOCK)
-void i2c_master_init(void) {
-  // no prescaler
-  TWSR = 0;
-  // Set TWI clock frequency to SCL_CLOCK. Need TWBR>10.
-  // Check datasheets for more info.
-  TWBR = ((F_CPU/SCL_CLOCK)-16)/2;
-}
-
-// Start a transaction with the given i2c slave address. The direction of the
-// transfer is set with I2C_READ and I2C_WRITE.
-// returns: 0 => success
-//          1 => error
-uint8_t i2c_master_start(uint8_t address) {
-  TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTA);
-
-  i2c_delay();
-
-  // check that we started successfully
-  if ( (TW_STATUS != TW_START) && (TW_STATUS != TW_REP_START))
-    return 1;
-
-  TWDR = address;
-  TWCR = (1<<TWINT) | (1<<TWEN);
-
-  i2c_delay();
-
-  if ( (TW_STATUS != TW_MT_SLA_ACK) && (TW_STATUS != TW_MR_SLA_ACK) )
-    return 1; // slave did not acknowledge
-  else
-    return 0; // success
-}
-
-
-// Finish the i2c transaction.
-void i2c_master_stop(void) {
-  TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTO);
-
-  uint16_t lim = 0;
-  while(!(TWCR & (1<<TWSTO)) && lim < I2C_LOOP_TIMEOUT)
-    lim++;
-}
-
-// Write one byte to the i2c slave.
-// returns 0 => slave ACK
-//         1 => slave NACK
-uint8_t i2c_master_write(uint8_t data) {
-  TWDR = data;
-  TWCR = (1<<TWINT) | (1<<TWEN);
-
-  i2c_delay();
-
-  // check if the slave acknowledged us
-  return (TW_STATUS == TW_MT_DATA_ACK) ? 0 : 1;
-}
-
-// Read one byte from the i2c slave. If ack=1 the slave is acknowledged,
-// if ack=0 the acknowledge bit is not set.
-// returns: byte read from i2c device
-uint8_t i2c_master_read(int ack) {
-  TWCR = (1<<TWINT) | (1<<TWEN) | (ack<<TWEA);
-
-  i2c_delay();
-  return TWDR;
-}
-
-void i2c_reset_state(void) {
-  TWCR = 0;
-}
-
-void i2c_slave_init(uint8_t address) {
-  TWAR = address << 0; // slave i2c address
-  // TWEN  - twi enable
-  // TWEA  - enable address acknowledgement
-  // TWINT - twi interrupt flag
-  // TWIE  - enable the twi interrupt
-  TWCR = (1<<TWIE) | (1<<TWEA) | (1<<TWINT) | (1<<TWEN);
-}
-
-ISR(TWI_vect);
-
-ISR(TWI_vect) {
-  uint8_t ack = 1;
-  switch(TW_STATUS) {
-    case TW_SR_SLA_ACK:
-      // this device has been addressed as a slave receiver
-      slave_has_register_set = false;
-      break;
-
-    case TW_SR_DATA_ACK:
-      // this device has received data as a slave receiver
-      // The first byte that we receive in this transaction sets the location
-      // of the read/write location of the slaves memory that it exposes over
-      // i2c.  After that, bytes will be written at slave_buffer_pos, incrementing
-      // slave_buffer_pos after each write.
-      if(!slave_has_register_set) {
-        slave_buffer_pos = TWDR;
-        // don't acknowledge the master if this memory loctaion is out of bounds
-        if ( slave_buffer_pos >= SLAVE_BUFFER_SIZE ) {
-          ack = 0;
-          slave_buffer_pos = 0;
-        }
-        slave_has_register_set = true;
-      } else {
-        i2c_slave_buffer[slave_buffer_pos] = TWDR;
-        BUFFER_POS_INC();
-      }
-      break;
-
-    case TW_ST_SLA_ACK:
-    case TW_ST_DATA_ACK:
-      // master has addressed this device as a slave transmitter and is
-      // requesting data.
-      TWDR = i2c_slave_buffer[slave_buffer_pos];
-      BUFFER_POS_INC();
-      break;
-
-    case TW_BUS_ERROR: // something went wrong, reset twi state
-      TWCR = 0;
-    default:
-      break;
-  }
-  // Reset everything, so we are ready for the next TWI interrupt
-  TWCR |= (1<<TWIE) | (1<<TWINT) | (ack<<TWEA) | (1<<TWEN);
-}
diff --git a/keyboards/helix/local_drivers/i2c.h b/keyboards/helix/local_drivers/i2c.h
deleted file mode 100644
index 710662c7ab..0000000000
--- a/keyboards/helix/local_drivers/i2c.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-#ifndef F_CPU
-#define F_CPU 16000000UL
-#endif
-
-#define I2C_READ 1
-#define I2C_WRITE 0
-
-#define I2C_ACK 1
-#define I2C_NACK 0
-
-#define SLAVE_BUFFER_SIZE 0x10
-
-// i2c SCL clock frequency 400kHz
-#define SCL_CLOCK  400000L
-
-extern volatile uint8_t i2c_slave_buffer[SLAVE_BUFFER_SIZE];
-
-void i2c_master_init(void);
-uint8_t i2c_master_start(uint8_t address);
-void i2c_master_stop(void);
-uint8_t i2c_master_write(uint8_t data);
-uint8_t i2c_master_read(int);
-void i2c_reset_state(void);
-void i2c_slave_init(uint8_t address);
-
-
-static inline unsigned char i2c_start_read(unsigned char addr) {
-  return i2c_master_start((addr << 1) | I2C_READ);
-}
-
-static inline unsigned char i2c_start_write(unsigned char addr) {
-  return i2c_master_start((addr << 1) | I2C_WRITE);
-}
-
-// from SSD1306 scrips
-extern unsigned char i2c_rep_start(unsigned char addr);
-extern void i2c_start_wait(unsigned char addr);
-extern unsigned char i2c_readAck(void);
-extern unsigned char i2c_readNak(void);
-extern unsigned char i2c_read(unsigned char ack);
-
-#define i2c_read(ack)  (ack) ? i2c_readAck() : i2c_readNak();
diff --git a/keyboards/helix/local_drivers/serial.c b/keyboards/helix/local_drivers/serial.c
deleted file mode 100644
index 674c42d593..0000000000
--- a/keyboards/helix/local_drivers/serial.c
+++ /dev/null
@@ -1,589 +0,0 @@
-/*
- * WARNING: be careful changing this code, it is very timing dependent
- *
- * 2018-10-28 checked
- *  avr-gcc 4.9.2
- *  avr-gcc 5.4.0
- *  avr-gcc 7.3.0
- */
-
-#ifndef F_CPU
-#define F_CPU 16000000
-#endif
-
-#include <avr/io.h>
-#include <avr/interrupt.h>
-#include <util/delay.h>
-#include <stddef.h>
-#include <stdbool.h>
-#include "serial.h"
-
-#ifdef SOFT_SERIAL_PIN
-
-#ifdef __AVR_ATmega32U4__
-  // if using ATmega32U4 I2C, can not use PD0 and PD1 in soft serial.
-  #ifdef USE_I2C
-    #if SOFT_SERIAL_PIN == D0 || SOFT_SERIAL_PIN == D1
-      #error Using ATmega32U4 I2C, so can not use PD0, PD1
-    #endif
-  #endif
-
-  #if SOFT_SERIAL_PIN >= D0 && SOFT_SERIAL_PIN <= D3
-    #define SERIAL_PIN_DDR   DDRD
-    #define SERIAL_PIN_PORT  PORTD
-    #define SERIAL_PIN_INPUT PIND
-    #if SOFT_SERIAL_PIN == D0
-      #define SERIAL_PIN_MASK _BV(PD0)
-      #define EIMSK_BIT       _BV(INT0)
-      #define EICRx_BIT       (~(_BV(ISC00) | _BV(ISC01)))
-      #define SERIAL_PIN_INTERRUPT INT0_vect
-    #elif  SOFT_SERIAL_PIN == D1
-      #define SERIAL_PIN_MASK _BV(PD1)
-      #define EIMSK_BIT       _BV(INT1)
-      #define EICRx_BIT       (~(_BV(ISC10) | _BV(ISC11)))
-      #define SERIAL_PIN_INTERRUPT INT1_vect
-    #elif  SOFT_SERIAL_PIN == D2
-      #define SERIAL_PIN_MASK _BV(PD2)
-      #define EIMSK_BIT       _BV(INT2)
-      #define EICRx_BIT       (~(_BV(ISC20) | _BV(ISC21)))
-      #define SERIAL_PIN_INTERRUPT INT2_vect
-    #elif  SOFT_SERIAL_PIN == D3
-      #define SERIAL_PIN_MASK _BV(PD3)
-      #define EIMSK_BIT       _BV(INT3)
-      #define EICRx_BIT       (~(_BV(ISC30) | _BV(ISC31)))
-      #define SERIAL_PIN_INTERRUPT INT3_vect
-    #endif
-  #elif  SOFT_SERIAL_PIN == E6
-    #define SERIAL_PIN_DDR   DDRE
-    #define SERIAL_PIN_PORT  PORTE
-    #define SERIAL_PIN_INPUT PINE
-    #define SERIAL_PIN_MASK  _BV(PE6)
-    #define EIMSK_BIT        _BV(INT6)
-    #define EICRx_BIT        (~(_BV(ISC60) | _BV(ISC61)))
-    #define SERIAL_PIN_INTERRUPT INT6_vect
-  #else
-  #error invalid SOFT_SERIAL_PIN value
-  #endif
-
-#else
- #error serial.c now support ATmega32U4 only
-#endif
-
-//////////////// for backward compatibility ////////////////////////////////
-#if !defined(SERIAL_USE_SINGLE_TRANSACTION) && !defined(SERIAL_USE_MULTI_TRANSACTION)
-/* --- USE OLD API (compatible with let's split serial.c) */
-  #if SERIAL_SLAVE_BUFFER_LENGTH > 0
-  uint8_t volatile serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH] = {0};
-  #endif
-  #if SERIAL_MASTER_BUFFER_LENGTH > 0
-  uint8_t volatile serial_master_buffer[SERIAL_MASTER_BUFFER_LENGTH] = {0};
-  #endif
-  uint8_t volatile status0 = 0;
-
-SSTD_t transactions[] = {
-    { (uint8_t *)&status0,
-  #if SERIAL_MASTER_BUFFER_LENGTH > 0
-      sizeof(serial_master_buffer), (uint8_t *)serial_master_buffer,
-  #else
-      0, (uint8_t *)NULL,
-  #endif
-  #if SERIAL_SLAVE_BUFFER_LENGTH > 0
-      sizeof(serial_slave_buffer), (uint8_t *)serial_slave_buffer
-  #else
-      0, (uint8_t *)NULL,
-  #endif
-  }
-};
-
-void serial_master_init(void)
-{ soft_serial_initiator_init(transactions, TID_LIMIT(transactions)); }
-
-void serial_slave_init(void)
-{ soft_serial_target_init(transactions, TID_LIMIT(transactions)); }
-
-// 0 => no error
-// 1 => slave did not respond
-// 2 => checksum error
-int serial_update_buffers()
-{
-    int result;
-    result = soft_serial_transaction();
-    return result;
-}
-
-#endif // end of OLD API (compatible with let's split serial.c)
-////////////////////////////////////////////////////////////////////////////
-
-#define ALWAYS_INLINE __attribute__((always_inline))
-#define NO_INLINE __attribute__((noinline))
-#define _delay_sub_us(x)    __builtin_avr_delay_cycles(x)
-
-// parity check
-#define ODD_PARITY 1
-#define EVEN_PARITY 0
-#define PARITY EVEN_PARITY
-
-#ifdef SERIAL_DELAY
-  // custom setup in config.h
-  // #define TID_SEND_ADJUST 2
-  // #define SERIAL_DELAY 6             // micro sec
-  // #define READ_WRITE_START_ADJUST 30 // cycles
-  // #define READ_WRITE_WIDTH_ADJUST 8 // cycles
-#else
-// ============ Standard setups ============
-
-#ifndef SELECT_SOFT_SERIAL_SPEED
-#define SELECT_SOFT_SERIAL_SPEED 1
-//  0: about 189kbps
-//  1: about 137kbps (default)
-//  2: about 75kbps
-//  3: about 39kbps
-//  4: about 26kbps
-//  5: about 20kbps
-#endif
-
-#if __GNUC__ < 6
-  #define TID_SEND_ADJUST 14
-#else
-  #define TID_SEND_ADJUST 2
-#endif
-
-#if SELECT_SOFT_SERIAL_SPEED == 0
-  // Very High speed
-  #define SERIAL_DELAY 4             // micro sec
-  #if __GNUC__ < 6
-    #define READ_WRITE_START_ADJUST 33 // cycles
-    #define READ_WRITE_WIDTH_ADJUST 3 // cycles
-  #else
-    #define READ_WRITE_START_ADJUST 34 // cycles
-    #define READ_WRITE_WIDTH_ADJUST 7 // cycles
-  #endif
-#elif SELECT_SOFT_SERIAL_SPEED == 1
-  // High speed
-  #define SERIAL_DELAY 6             // micro sec
-  #if __GNUC__ < 6
-    #define READ_WRITE_START_ADJUST 30 // cycles
-    #define READ_WRITE_WIDTH_ADJUST 3 // cycles
-  #else
-    #define READ_WRITE_START_ADJUST 33 // cycles
-    #define READ_WRITE_WIDTH_ADJUST 7 // cycles
-  #endif
-#elif SELECT_SOFT_SERIAL_SPEED == 2
-  // Middle speed
-  #define SERIAL_DELAY 12            // micro sec
-  #define READ_WRITE_START_ADJUST 30 // cycles
-  #if __GNUC__ < 6
-    #define READ_WRITE_WIDTH_ADJUST 3 // cycles
-  #else
-    #define READ_WRITE_WIDTH_ADJUST 7 // cycles
-  #endif
-#elif SELECT_SOFT_SERIAL_SPEED == 3
-  // Low speed
-  #define SERIAL_DELAY 24            // micro sec
-  #define READ_WRITE_START_ADJUST 30 // cycles
-  #if __GNUC__ < 6
-    #define READ_WRITE_WIDTH_ADJUST 3 // cycles
-  #else
-    #define READ_WRITE_WIDTH_ADJUST 7 // cycles
-  #endif
-#elif SELECT_SOFT_SERIAL_SPEED == 4
-  // Very Low speed
-  #define SERIAL_DELAY 36            // micro sec
-  #define READ_WRITE_START_ADJUST 30 // cycles
-  #if __GNUC__ < 6
-    #define READ_WRITE_WIDTH_ADJUST 3 // cycles
-  #else
-    #define READ_WRITE_WIDTH_ADJUST 7 // cycles
-  #endif
-#elif SELECT_SOFT_SERIAL_SPEED == 5
-  // Ultra Low speed
-  #define SERIAL_DELAY 48            // micro sec
-  #define READ_WRITE_START_ADJUST 30 // cycles
-  #if __GNUC__ < 6
-    #define READ_WRITE_WIDTH_ADJUST 3 // cycles
-  #else
-    #define READ_WRITE_WIDTH_ADJUST 7 // cycles
-  #endif
-#else
-#error invalid SELECT_SOFT_SERIAL_SPEED value
-#endif /* SELECT_SOFT_SERIAL_SPEED */
-#endif /* SERIAL_DELAY */
-
-#define SERIAL_DELAY_HALF1 (SERIAL_DELAY/2)
-#define SERIAL_DELAY_HALF2 (SERIAL_DELAY - SERIAL_DELAY/2)
-
-#define SLAVE_INT_WIDTH_US 1
-#ifndef SERIAL_USE_MULTI_TRANSACTION
-  #define SLAVE_INT_RESPONSE_TIME SERIAL_DELAY
-#else
-  #define SLAVE_INT_ACK_WIDTH_UNIT 2
-  #define SLAVE_INT_ACK_WIDTH 4
-#endif
-
-static SSTD_t *Transaction_table = NULL;
-static uint8_t Transaction_table_size = 0;
-
-inline static void serial_delay(void) ALWAYS_INLINE;
-inline static
-void serial_delay(void) {
-  _delay_us(SERIAL_DELAY);
-}
-
-inline static void serial_delay_half1(void) ALWAYS_INLINE;
-inline static
-void serial_delay_half1(void) {
-  _delay_us(SERIAL_DELAY_HALF1);
-}
-
-inline static void serial_delay_half2(void) ALWAYS_INLINE;
-inline static
-void serial_delay_half2(void) {
-  _delay_us(SERIAL_DELAY_HALF2);
-}
-
-inline static void serial_output(void) ALWAYS_INLINE;
-inline static
-void serial_output(void) {
-  SERIAL_PIN_DDR |= SERIAL_PIN_MASK;
-}
-
-// make the serial pin an input with pull-up resistor
-inline static void serial_input_with_pullup(void) ALWAYS_INLINE;
-inline static
-void serial_input_with_pullup(void) {
-  SERIAL_PIN_DDR  &= ~SERIAL_PIN_MASK;
-  SERIAL_PIN_PORT |= SERIAL_PIN_MASK;
-}
-
-inline static uint8_t serial_read_pin(void) ALWAYS_INLINE;
-inline static
-uint8_t serial_read_pin(void) {
-  return !!(SERIAL_PIN_INPUT & SERIAL_PIN_MASK);
-}
-
-inline static void serial_low(void) ALWAYS_INLINE;
-inline static
-void serial_low(void) {
-  SERIAL_PIN_PORT &= ~SERIAL_PIN_MASK;
-}
-
-inline static void serial_high(void) ALWAYS_INLINE;
-inline static
-void serial_high(void) {
-  SERIAL_PIN_PORT |= SERIAL_PIN_MASK;
-}
-
-void soft_serial_initiator_init(SSTD_t *sstd_table, int sstd_table_size)
-{
-    Transaction_table = sstd_table;
-    Transaction_table_size = (uint8_t)sstd_table_size;
-    serial_output();
-    serial_high();
-}
-
-void soft_serial_target_init(SSTD_t *sstd_table, int sstd_table_size)
-{
-    Transaction_table = sstd_table;
-    Transaction_table_size = (uint8_t)sstd_table_size;
-    serial_input_with_pullup();
-
-    // Enable INT0-INT3,INT6
-    EIMSK |= EIMSK_BIT;
-#if SERIAL_PIN_MASK == _BV(PE6)
-    // Trigger on falling edge of INT6
-    EICRB &= EICRx_BIT;
-#else
-    // Trigger on falling edge of INT0-INT3
-    EICRA &= EICRx_BIT;
-#endif
-}
-
-// Used by the sender to synchronize timing with the reciver.
-static void sync_recv(void) NO_INLINE;
-static
-void sync_recv(void) {
-  for (uint8_t i = 0; i < SERIAL_DELAY*5 && serial_read_pin(); i++ ) {
-  }
-  // This shouldn't hang if the target disconnects because the
-  // serial line will float to high if the target does disconnect.
-  while (!serial_read_pin());
-}
-
-// Used by the reciver to send a synchronization signal to the sender.
-static void sync_send(void) NO_INLINE;
-static
-void sync_send(void) {
-  serial_low();
-  serial_delay();
-  serial_high();
-}
-
-// Reads a byte from the serial line
-static uint8_t serial_read_chunk(uint8_t *pterrcount, uint8_t bit) NO_INLINE;
-static uint8_t serial_read_chunk(uint8_t *pterrcount, uint8_t bit) {
-    uint8_t byte, i, p, pb;
-
-  _delay_sub_us(READ_WRITE_START_ADJUST);
-  for( i = 0, byte = 0, p = PARITY; i < bit; i++ ) {
-      serial_delay_half1();   // read the middle of pulses
-      if( serial_read_pin() ) {
-          byte = (byte << 1) | 1; p ^= 1;
-      } else {
-          byte = (byte << 1) | 0; p ^= 0;
-      }
-      _delay_sub_us(READ_WRITE_WIDTH_ADJUST);
-      serial_delay_half2();
-  }
-  /* recive parity bit */
-  serial_delay_half1();   // read the middle of pulses
-  pb = serial_read_pin();
-  _delay_sub_us(READ_WRITE_WIDTH_ADJUST);
-  serial_delay_half2();
-
-  *pterrcount += (p != pb)? 1 : 0;
-
-  return byte;
-}
-
-// Sends a byte with MSB ordering
-void serial_write_chunk(uint8_t data, uint8_t bit) NO_INLINE;
-void serial_write_chunk(uint8_t data, uint8_t bit) {
-    uint8_t b, p;
-    for( p = PARITY, b = 1<<(bit-1); b ; b >>= 1) {
-        if(data & b) {
-            serial_high(); p ^= 1;
-        } else {
-            serial_low();  p ^= 0;
-        }
-        serial_delay();
-    }
-    /* send parity bit */
-    if(p & 1) { serial_high(); }
-    else      { serial_low(); }
-    serial_delay();
-
-    serial_low(); // sync_send() / senc_recv() need raise edge
-}
-
-static void serial_send_packet(uint8_t *buffer, uint8_t size) NO_INLINE;
-static
-void serial_send_packet(uint8_t *buffer, uint8_t size) {
-  for (uint8_t i = 0; i < size; ++i) {
-    uint8_t data;
-    data = buffer[i];
-    sync_send();
-    serial_write_chunk(data,8);
-  }
-}
-
-static uint8_t serial_recive_packet(uint8_t *buffer, uint8_t size) NO_INLINE;
-static
-uint8_t serial_recive_packet(uint8_t *buffer, uint8_t size) {
-  uint8_t pecount = 0;
-  for (uint8_t i = 0; i < size; ++i) {
-    uint8_t data;
-    sync_recv();
-    data = serial_read_chunk(&pecount, 8);
-    buffer[i] = data;
-  }
-  return pecount == 0;
-}
-
-inline static
-void change_sender2reciver(void) {
-    sync_send();          //0
-    serial_delay_half1(); //1
-    serial_low();         //2
-    serial_input_with_pullup(); //2
-    serial_delay_half1(); //3
-}
-
-inline static
-void change_reciver2sender(void) {
-    sync_recv();     //0
-    serial_delay();  //1
-    serial_low();    //3
-    serial_output(); //3
-    serial_delay_half1(); //4
-}
-
-static inline uint8_t nibble_bits_count(uint8_t bits)
-{
-    bits = (bits & 0x5) + (bits >> 1 & 0x5);
-    bits = (bits & 0x3) + (bits >> 2 & 0x3);
-    return bits;
-}
-
-// interrupt handle to be used by the target device
-ISR(SERIAL_PIN_INTERRUPT) {
-
-#ifndef SERIAL_USE_MULTI_TRANSACTION
-  serial_low();
-  serial_output();
-  SSTD_t *trans = Transaction_table;
-#else
-  // recive transaction table index
-  uint8_t tid, bits;
-  uint8_t pecount = 0;
-  sync_recv();
-  bits = serial_read_chunk(&pecount,7);
-  tid = bits>>3;
-  bits = (bits&7) != nibble_bits_count(tid);
-  if( bits || pecount> 0 || tid > Transaction_table_size ) {
-      return;
-  }
-  serial_delay_half1();
-
-  serial_high(); // response step1 low->high
-  serial_output();
-  _delay_sub_us(SLAVE_INT_ACK_WIDTH_UNIT*SLAVE_INT_ACK_WIDTH);
-  SSTD_t *trans = &Transaction_table[tid];
-  serial_low(); // response step2 ack high->low
-#endif
-
-  // target send phase
-  if( trans->target2initiator_buffer_size > 0 )
-      serial_send_packet((uint8_t *)trans->target2initiator_buffer,
-                         trans->target2initiator_buffer_size);
-  // target switch to input
-  change_sender2reciver();
-
-  // target recive phase
-  if( trans->initiator2target_buffer_size > 0 ) {
-      if (serial_recive_packet((uint8_t *)trans->initiator2target_buffer,
-                               trans->initiator2target_buffer_size) ) {
-          *trans->status = TRANSACTION_ACCEPTED;
-      } else {
-          *trans->status = TRANSACTION_DATA_ERROR;
-      }
-  } else {
-      *trans->status = TRANSACTION_ACCEPTED;
-  }
-
-  sync_recv(); //weit initiator output to high
-}
-
-/////////
-//  start transaction by initiator
-//
-// int  soft_serial_transaction(int sstd_index)
-//
-// Returns:
-//    TRANSACTION_END
-//    TRANSACTION_NO_RESPONSE
-//    TRANSACTION_DATA_ERROR
-// this code is very time dependent, so we need to disable interrupts
-#ifndef SERIAL_USE_MULTI_TRANSACTION
-int  soft_serial_transaction(void) {
-  SSTD_t *trans = Transaction_table;
-#else
-int  soft_serial_transaction(int sstd_index) {
-  if( sstd_index > Transaction_table_size )
-      return TRANSACTION_TYPE_ERROR;
-  SSTD_t *trans = &Transaction_table[sstd_index];
-#endif
-  cli();
-
-  // signal to the target that we want to start a transaction
-  serial_output();
-  serial_low();
-  _delay_us(SLAVE_INT_WIDTH_US);
-
-#ifndef SERIAL_USE_MULTI_TRANSACTION
-  // wait for the target response
-  serial_input_with_pullup();
-  _delay_us(SLAVE_INT_RESPONSE_TIME);
-
-  // check if the target is present
-  if (serial_read_pin()) {
-    // target failed to pull the line low, assume not present
-    serial_output();
-    serial_high();
-    *trans->status = TRANSACTION_NO_RESPONSE;
-    sei();
-    return TRANSACTION_NO_RESPONSE;
-  }
-
-#else
-  // send transaction table index
-  int tid = (sstd_index<<3) | (7 & nibble_bits_count(sstd_index));
-  sync_send();
-  _delay_sub_us(TID_SEND_ADJUST);
-  serial_write_chunk(tid, 7);
-  serial_delay_half1();
-
-  // wait for the target response (step1 low->high)
-  serial_input_with_pullup();
-  while( !serial_read_pin() ) {
-      _delay_sub_us(2);
-  }
-
-  // check if the target is present (step2 high->low)
-  for( int i = 0; serial_read_pin(); i++ ) {
-      if (i > SLAVE_INT_ACK_WIDTH + 1) {
-          // slave failed to pull the line low, assume not present
-          serial_output();
-          serial_high();
-          *trans->status = TRANSACTION_NO_RESPONSE;
-          sei();
-          return TRANSACTION_NO_RESPONSE;
-      }
-      _delay_sub_us(SLAVE_INT_ACK_WIDTH_UNIT);
-  }
-#endif
-
-  // initiator recive phase
-  // if the target is present syncronize with it
-  if( trans->target2initiator_buffer_size > 0 ) {
-      if (!serial_recive_packet((uint8_t *)trans->target2initiator_buffer,
-                                trans->target2initiator_buffer_size) ) {
-          serial_output();
-          serial_high();
-          *trans->status = TRANSACTION_DATA_ERROR;
-          sei();
-          return TRANSACTION_DATA_ERROR;
-      }
-   }
-
-  // initiator switch to output
-  change_reciver2sender();
-
-  // initiator send phase
-  if( trans->initiator2target_buffer_size > 0 ) {
-      serial_send_packet((uint8_t *)trans->initiator2target_buffer,
-                         trans->initiator2target_buffer_size);
-  }
-
-  // always, release the line when not in use
-  sync_send();
-
-  *trans->status = TRANSACTION_END;
-  sei();
-  return TRANSACTION_END;
-}
-
-#ifdef SERIAL_USE_MULTI_TRANSACTION
-int soft_serial_get_and_clean_status(int sstd_index) {
-    SSTD_t *trans = &Transaction_table[sstd_index];
-    cli();
-    int retval = *trans->status;
-    *trans->status = 0;;
-    sei();
-    return retval;
-}
-#endif
-
-#endif
-
-// Helix serial.c history
-//   2018-1-29 fork from let's split and add PD2, modify sync_recv() (#2308, bceffdefc)
-//   2018-6-28 bug fix master to slave comm and speed up (#3255, 1038bbef4)
-//             (adjusted with avr-gcc 4.9.2)
-//   2018-7-13 remove USE_SERIAL_PD2 macro (#3374, f30d6dd78)
-//             (adjusted with avr-gcc 4.9.2)
-//   2018-8-11 add support multi-type transaction (#3608, feb5e4aae)
-//             (adjusted with avr-gcc 4.9.2)
-//   2018-10-21 fix serial and RGB animation conflict (#4191, 4665e4fff)
-//             (adjusted with avr-gcc 7.3.0)
-//   2018-10-28 re-adjust compiler depend value of delay (#4269, 8517f8a66)
-//             (adjusted with avr-gcc 5.4.0, 7.3.0)
diff --git a/keyboards/helix/local_drivers/serial.h b/keyboards/helix/local_drivers/serial.h
deleted file mode 100644
index b4dcdafe57..0000000000
--- a/keyboards/helix/local_drivers/serial.h
+++ /dev/null
@@ -1,86 +0,0 @@
-#pragma once
-
-#include <stdbool.h>
-
-// /////////////////////////////////////////////////////////////////
-// Need Soft Serial defines in config.h
-// /////////////////////////////////////////////////////////////////
-// ex.
-//  #define SOFT_SERIAL_PIN ??   // ?? = D0,D1,D2,D3,E6
-//  OPTIONAL: #define SELECT_SOFT_SERIAL_SPEED ? // ? = 1,2,3,4,5
-//                                               //  1: about 137kbps (default)
-//                                               //  2: about 75kbps
-//                                               //  3: about 39kbps
-//                                               //  4: about 26kbps
-//                                               //  5: about 20kbps
-//
-// //// USE OLD API (compatible with let's split serial.c)
-// ex.
-//  #define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2
-//  #define SERIAL_MASTER_BUFFER_LENGTH 1
-//
-// //// USE NEW API
-//    //// USE simple API (using signle-type transaction function)
-//      #define SERIAL_USE_SINGLE_TRANSACTION
-//    //// USE flexible API (using multi-type transaction function)
-//      #define SERIAL_USE_MULTI_TRANSACTION
-//
-// /////////////////////////////////////////////////////////////////
-
-
-//////////////// for backward compatibility ////////////////////////////////
-#if !defined(SERIAL_USE_SINGLE_TRANSACTION) && !defined(SERIAL_USE_MULTI_TRANSACTION)
-/* --- USE OLD API (compatible with let's split serial.c) */
- #if SERIAL_SLAVE_BUFFER_LENGTH > 0
- extern volatile uint8_t serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH];
- #endif
- #if SERIAL_MASTER_BUFFER_LENGTH > 0
- extern volatile uint8_t serial_master_buffer[SERIAL_MASTER_BUFFER_LENGTH];
- #endif
-
- void serial_master_init(void);
- void serial_slave_init(void);
- int serial_update_buffers(void);
-
-#endif // end of USE OLD API
-////////////////////////////////////////////////////////////////////////////
-
-// Soft Serial Transaction Descriptor
-typedef struct _SSTD_t  {
-    uint8_t *status;
-    uint8_t initiator2target_buffer_size;
-    uint8_t *initiator2target_buffer;
-    uint8_t target2initiator_buffer_size;
-    uint8_t *target2initiator_buffer;
-} SSTD_t;
-#define TID_LIMIT( table ) (sizeof(table) / sizeof(SSTD_t))
-
-// initiator is transaction start side
-void soft_serial_initiator_init(SSTD_t *sstd_table, int sstd_table_size);
-// target is interrupt accept side
-void soft_serial_target_init(SSTD_t *sstd_table, int sstd_table_size);
-
-// initiator resullt
-#define TRANSACTION_END 0
-#define TRANSACTION_NO_RESPONSE 0x1
-#define TRANSACTION_DATA_ERROR  0x2
-#define TRANSACTION_TYPE_ERROR  0x4
-#ifndef SERIAL_USE_MULTI_TRANSACTION
-int  soft_serial_transaction(void);
-#else
-int  soft_serial_transaction(int sstd_index);
-#endif
-
-// target status
-// *SSTD_t.status has
-//   initiator:
-//       TRANSACTION_END
-//    or TRANSACTION_NO_RESPONSE
-//    or TRANSACTION_DATA_ERROR
-//   target:
-//       TRANSACTION_DATA_ERROR
-//    or TRANSACTION_ACCEPTED
-#define TRANSACTION_ACCEPTED 0x8
-#ifdef SERIAL_USE_MULTI_TRANSACTION
-int  soft_serial_get_and_clean_status(int sstd_index);
-#endif
diff --git a/keyboards/helix/local_drivers/ssd1306.c b/keyboards/helix/local_drivers/ssd1306.c
deleted file mode 100644
index 1cfb38037c..0000000000
--- a/keyboards/helix/local_drivers/ssd1306.c
+++ /dev/null
@@ -1,341 +0,0 @@
-
-#ifdef SSD1306OLED
-
-#include "ssd1306.h"
-#include "i2c.h"
-#include <string.h>
-#include "print.h"
-#ifndef LOCAL_GLCDFONT
-#include "common/glcdfont.c"
-#else
-#include "helixfont.h"
-#endif
-#ifdef PROTOCOL_LUFA
-#include "lufa.h"
-#endif
-#include "sendchar.h"
-#include "timer.h"
-
-struct CharacterMatrix display;
-
-// Set this to 1 to help diagnose early startup problems
-// when testing power-on with ble.  Turn it off otherwise,
-// as the latency of printing most of the debug info messes
-// with the matrix scan, causing keys to drop.
-#define DEBUG_TO_SCREEN 0
-
-//static uint16_t last_battery_update;
-//static uint32_t vbat;
-//#define BatteryUpdateInterval 10000 /* milliseconds */
-
-// 'last_flush' is declared as uint16_t,
-// so this must be less than 65535 
-#define ScreenOffInterval 60000 /* milliseconds */
-#if DEBUG_TO_SCREEN
-static uint8_t displaying;
-#endif
-static uint16_t last_flush;
-
-static bool force_dirty = true;
-
-// Write command sequence.
-// Returns true on success.
-static inline bool _send_cmd1(uint8_t cmd) {
-  bool res = false;
-
-  if (i2c_start_write(SSD1306_ADDRESS)) {
-    xprintf("failed to start write to %d\n", SSD1306_ADDRESS);
-    goto done;
-  }
-
-  if (i2c_master_write(0x0 /* command byte follows */)) {
-    print("failed to write control byte\n");
-
-    goto done;
-  }
-
-  if (i2c_master_write(cmd)) {
-    xprintf("failed to write command %d\n", cmd);
-    goto done;
-  }
-  res = true;
-done:
-  i2c_master_stop();
-  return res;
-}
-
-// Write 2-byte command sequence.
-// Returns true on success
-static inline bool _send_cmd2(uint8_t cmd, uint8_t opr) {
-  if (!_send_cmd1(cmd)) {
-    return false;
-  }
-  return _send_cmd1(opr);
-}
-
-// Write 3-byte command sequence.
-// Returns true on success
-static inline bool _send_cmd3(uint8_t cmd, uint8_t opr1, uint8_t opr2) {
-  if (!_send_cmd1(cmd)) {
-    return false;
-  }
-  if (!_send_cmd1(opr1)) {
-    return false;
-  }
-  return _send_cmd1(opr2);
-}
-
-#define send_cmd1(c) if (!_send_cmd1(c)) {goto done;}
-#define send_cmd2(c,o) if (!_send_cmd2(c,o)) {goto done;}
-#define send_cmd3(c,o1,o2) if (!_send_cmd3(c,o1,o2)) {goto done;}
-
-static void clear_display(void) {
-  matrix_clear(&display);
-
-  // Clear all of the display bits (there can be random noise
-  // in the RAM on startup)
-  send_cmd3(PageAddr, 0, (DisplayHeight / 8) - 1);
-  send_cmd3(ColumnAddr, 0, DisplayWidth - 1);
-
-  if (i2c_start_write(SSD1306_ADDRESS)) {
-    goto done;
-  }
-  if (i2c_master_write(0x40)) {
-    // Data mode
-    goto done;
-  }
-  for (uint8_t row = 0; row < MatrixRows; ++row) {
-    for (uint8_t col = 0; col < DisplayWidth; ++col) {
-      i2c_master_write(0);
-    }
-  }
-
-  display.dirty = false;
-
-done:
-  i2c_master_stop();
-}
-
-#if DEBUG_TO_SCREEN
-#undef sendchar
-static int8_t capture_sendchar(uint8_t c) {
-  sendchar(c);
-  iota_gfx_write_char(c);
-
-  if (!displaying) {
-    iota_gfx_flush();
-  }
-  return 0;
-}
-#endif
-
-bool iota_gfx_init(bool rotate) {
-  bool success = false;
-
-  i2c_master_init();
-  send_cmd1(DisplayOff);
-  send_cmd2(SetDisplayClockDiv, 0x80);
-  send_cmd2(SetMultiPlex, DisplayHeight - 1);
-
-  send_cmd2(SetDisplayOffset, 0);
-
-
-  send_cmd1(SetStartLine | 0x0);
-  send_cmd2(SetChargePump, 0x14 /* Enable */);
-  send_cmd2(SetMemoryMode, 0 /* horizontal addressing */);
-
-  if(rotate){
-    // the following Flip the display orientation 180 degrees
-    send_cmd1(SegRemap);
-    send_cmd1(ComScanInc);
-  }else{
-    // Flips the display orientation 0 degrees
-    send_cmd1(SegRemap | 0x1);
-    send_cmd1(ComScanDec);
-  }
-
-  send_cmd2(SetComPins, 0x2);
-  send_cmd2(SetContrast, 0x8f);
-  send_cmd2(SetPreCharge, 0xf1);
-  send_cmd2(SetVComDetect, 0x40);
-  send_cmd1(DisplayAllOnResume);
-  send_cmd1(NormalDisplay);
-  send_cmd1(DeActivateScroll);
-  send_cmd1(DisplayOn);
-
-  send_cmd2(SetContrast, 0); // Dim
-
-  clear_display();
-
-  success = true;
-
-  iota_gfx_flush();
-
-#if DEBUG_TO_SCREEN
-  print_set_sendchar(capture_sendchar);
-#endif
-
-done:
-  return success;
-}
-
-bool iota_gfx_off(void) {
-  bool success = false;
-
-  send_cmd1(DisplayOff);
-  success = true;
-
-done:
-  return success;
-}
-
-bool iota_gfx_on(void) {
-  bool success = false;
-
-  send_cmd1(DisplayOn);
-  success = true;
-
-done:
-  return success;
-}
-
-void matrix_write_char_inner(struct CharacterMatrix *matrix, uint8_t c) {
-  *matrix->cursor = c;
-  ++matrix->cursor;
-
-  if (matrix->cursor - &matrix->display[0][0] == sizeof(matrix->display)) {
-    // We went off the end; scroll the display upwards by one line
-    memmove(&matrix->display[0], &matrix->display[1],
-            MatrixCols * (MatrixRows - 1));
-    matrix->cursor = &matrix->display[MatrixRows - 1][0];
-    memset(matrix->cursor, ' ', MatrixCols);
-  }
-}
-
-void matrix_write_char(struct CharacterMatrix *matrix, uint8_t c) {
-  matrix->dirty = true;
-
-  if (c == '\n') {
-    // Clear to end of line from the cursor and then move to the
-    // start of the next line
-    uint8_t cursor_col = (matrix->cursor - &matrix->display[0][0]) % MatrixCols;
-
-    while (cursor_col++ < MatrixCols) {
-      matrix_write_char_inner(matrix, ' ');
-    }
-    return;
-  }
-
-  matrix_write_char_inner(matrix, c);
-}
-
-void iota_gfx_write_char(uint8_t c) {
-  matrix_write_char(&display, c);
-}
-
-void matrix_write(struct CharacterMatrix *matrix, const char *data) {
-  const char *end = data + strlen(data);
-  while (data < end) {
-    matrix_write_char(matrix, *data);
-    ++data;
-  }
-}
-
-void iota_gfx_write(const char *data) {
-  matrix_write(&display, data);
-}
-
-void matrix_write_P(struct CharacterMatrix *matrix, const char *data) {
-  while (true) {
-    uint8_t c = pgm_read_byte(data);
-    if (c == 0) {
-      return;
-    }
-    matrix_write_char(matrix, c);
-    ++data;
-  }
-}
-
-void iota_gfx_write_P(const char *data) {
-  matrix_write_P(&display, data);
-}
-
-void matrix_clear(struct CharacterMatrix *matrix) {
-  memset(matrix->display, ' ', sizeof(matrix->display));
-  matrix->cursor = &matrix->display[0][0];
-  matrix->dirty = true;
-}
-
-void iota_gfx_clear_screen(void) {
-  matrix_clear(&display);
-}
-
-void matrix_render(struct CharacterMatrix *matrix) {
-  last_flush = timer_read();
-  iota_gfx_on();
-#if DEBUG_TO_SCREEN
-  ++displaying;
-#endif
-
-  // Move to the home position
-  send_cmd3(PageAddr, 0, MatrixRows - 1);
-  send_cmd3(ColumnAddr, 0, (MatrixCols * FontWidth) - 1);
-
-  if (i2c_start_write(SSD1306_ADDRESS)) {
-    goto done;
-  }
-  if (i2c_master_write(0x40)) {
-    // Data mode
-    goto done;
-  }
-
-  for (uint8_t row = 0; row < MatrixRows; ++row) {
-    for (uint8_t col = 0; col < MatrixCols; ++col) {
-      const uint8_t *glyph = font + (matrix->display[row][col] * FontWidth);
-
-      for (uint8_t glyphCol = 0; glyphCol < FontWidth; ++glyphCol) {
-        uint8_t colBits = pgm_read_byte(glyph + glyphCol);
-        i2c_master_write(colBits);
-      }
-
-      // 1 column of space between chars (it's not included in the glyph)
-      //i2c_master_write(0);
-    }
-  }
-
-  matrix->dirty = false;
-
-done:
-  i2c_master_stop();
-#if DEBUG_TO_SCREEN
-  --displaying;
-#endif
-}
-
-void iota_gfx_flush(void) {
-  matrix_render(&display);
-}
-
-__attribute__ ((weak))
-void iota_gfx_task_user(void) {
-}
-
-void iota_gfx_task(void) {
-  iota_gfx_task_user();
-
-  if (display.dirty|| force_dirty) {
-    iota_gfx_flush();
-    force_dirty = false;
-  }
-
-  if (timer_elapsed(last_flush) > ScreenOffInterval) {
-    iota_gfx_off();
-  }
-}
-
-bool process_record_gfx(uint16_t keycode, keyrecord_t *record) {
-  force_dirty = true;
-  return true;
-}
-
-#endif
diff --git a/keyboards/helix/local_drivers/ssd1306.h b/keyboards/helix/local_drivers/ssd1306.h
deleted file mode 100644
index a7527f4ebc..0000000000
--- a/keyboards/helix/local_drivers/ssd1306.h
+++ /dev/null
@@ -1,89 +0,0 @@
-#pragma once
-
-#include <stdbool.h>
-#include <stdio.h>
-#include "action.h"
-
-enum ssd1306_cmds {
-  DisplayOff = 0xAE,
-  DisplayOn = 0xAF,
-
-  SetContrast = 0x81,
-  DisplayAllOnResume = 0xA4,
-
-  DisplayAllOn = 0xA5,
-  NormalDisplay = 0xA6,
-  InvertDisplay = 0xA7,
-  SetDisplayOffset = 0xD3,
-  SetComPins = 0xda,
-  SetVComDetect = 0xdb,
-  SetDisplayClockDiv = 0xD5,
-  SetPreCharge = 0xd9,
-  SetMultiPlex = 0xa8,
-  SetLowColumn = 0x00,
-  SetHighColumn = 0x10,
-  SetStartLine = 0x40,
-
-  SetMemoryMode = 0x20,
-  ColumnAddr = 0x21,
-  PageAddr = 0x22,
-
-  ComScanInc = 0xc0,
-  ComScanDec = 0xc8,
-  SegRemap = 0xa0,
-  SetChargePump = 0x8d,
-  ExternalVcc = 0x01,
-  SwitchCapVcc = 0x02,
-
-  ActivateScroll = 0x2f,
-  DeActivateScroll = 0x2e,
-  SetVerticalScrollArea = 0xa3,
-  RightHorizontalScroll = 0x26,
-  LeftHorizontalScroll = 0x27,
-  VerticalAndRightHorizontalScroll = 0x29,
-  VerticalAndLeftHorizontalScroll = 0x2a,
-};
-
-// Controls the SSD1306 128x32 OLED display via i2c
-
-#ifndef SSD1306_ADDRESS
-#define SSD1306_ADDRESS 0x3C
-#endif
-
-#define DisplayHeight 32
-#define DisplayWidth 128
-
-#define FontHeight 8
-#define FontWidth 6
-
-#define MatrixRows (DisplayHeight / FontHeight)
-#define MatrixCols (DisplayWidth / FontWidth)
-
-struct CharacterMatrix {
-  uint8_t display[MatrixRows][MatrixCols];
-  uint8_t *cursor;
-  bool dirty;
-};
-
-extern struct CharacterMatrix display;
-
-bool iota_gfx_init(bool rotate);
-void iota_gfx_task(void);
-bool iota_gfx_off(void);
-bool iota_gfx_on(void);
-void iota_gfx_flush(void);
-void iota_gfx_write_char(uint8_t c);
-void iota_gfx_write(const char *data);
-void iota_gfx_write_P(const char *data);
-void iota_gfx_clear_screen(void);
-
-void iota_gfx_task_user(void);
-
-void matrix_clear(struct CharacterMatrix *matrix);
-void matrix_write_char_inner(struct CharacterMatrix *matrix, uint8_t c);
-void matrix_write_char(struct CharacterMatrix *matrix, uint8_t c);
-void matrix_write(struct CharacterMatrix *matrix, const char *data);
-void matrix_write_P(struct CharacterMatrix *matrix, const char *data);
-void matrix_render(struct CharacterMatrix *matrix);
-
-bool process_record_gfx(uint16_t keycode, keyrecord_t *record);
diff --git a/keyboards/helix/rev2/config.h b/keyboards/helix/rev2/config.h
index 577edba56b..8c6210bae4 100644
--- a/keyboards/helix/rev2/config.h
+++ b/keyboards/helix/rev2/config.h
@@ -45,12 +45,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-// Helix keyboard OLED support
-//      see ./local_features.mk: OLED_SELECT=local
-#ifdef OLED_LOCAL_ENABLE
-  #define SSD1306OLED
-#endif
-
 #define OLED_UPDATE_INTERVAL 50
 
 /* Select rows configuration */
diff --git a/keyboards/helix/rev2/custom/matrix.c b/keyboards/helix/rev2/custom/matrix.c
deleted file mode 100644
index 5221d7fd4e..0000000000
--- a/keyboards/helix/rev2/custom/matrix.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-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/>.
-*/
-
-/*
- * scan matrix
- */
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-#include <avr/io.h>
-#include <avr/wdt.h>
-#include <avr/interrupt.h>
-#include <util/delay.h>
-#include "print.h"
-#include "debug.h"
-#include "util.h"
-#include "matrix.h"
-#include "split_util.h"
-#include "quantum.h"
-
-#ifdef USE_MATRIX_I2C
-#  include "i2c.h"
-#else // USE_SERIAL
-#  include "split_scomm.h"
-#endif
-
-#ifndef DEBOUNCE
-#  define DEBOUNCE	5
-#endif
-
-#define ERROR_DISCONNECT_COUNT 5
-
-static uint8_t debouncing = DEBOUNCE;
-static const int ROWS_PER_HAND = MATRIX_ROWS/2;
-static uint8_t error_count = 0;
-
-static const uint8_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
-static const uint8_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
-
-/* matrix state(1:on, 0:off) */
-static matrix_row_t matrix[MATRIX_ROWS];
-static matrix_row_t matrix_debouncing[MATRIX_ROWS];
-
-static matrix_row_t read_cols(void);
-static void init_cols(void);
-static void unselect_rows(void);
-static void select_row(uint8_t row);
-static uint8_t matrix_master_scan(void);
-
-
-__attribute__ ((weak))
-void matrix_init_kb(void) {
-    matrix_init_user();
-}
-
-__attribute__ ((weak))
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-
-__attribute__ ((weak))
-void matrix_init_user(void) {
-}
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-}
-
-inline
-uint8_t matrix_rows(void)
-{
-    return MATRIX_ROWS;
-}
-
-inline
-uint8_t matrix_cols(void)
-{
-    return MATRIX_COLS;
-}
-
-void matrix_init(void)
-{
-    split_keyboard_setup();
-
-    // initialize row and col
-    unselect_rows();
-    init_cols();
-
-    setPinOutput(B0);
-    setPinOutput(D5);
-    writePinHigh(B0);
-    writePinHigh(D5);
-
-    // initialize matrix state: all keys off
-    for (uint8_t i=0; i < MATRIX_ROWS; i++) {
-        matrix[i] = 0;
-        matrix_debouncing[i] = 0;
-    }
-
-    matrix_init_quantum();
-}
-
-uint8_t _matrix_scan(void)
-{
-    // Right hand is stored after the left in the matirx so, we need to offset it
-    int offset = isLeftHand ? 0 : (ROWS_PER_HAND);
-
-    for (uint8_t i = 0; i < ROWS_PER_HAND; i++) {
-        select_row(i);
-        _delay_us(30);  // without this wait read unstable value.
-        matrix_row_t cols = read_cols();
-        if (matrix_debouncing[i+offset] != cols) {
-            matrix_debouncing[i+offset] = cols;
-            debouncing = DEBOUNCE;
-        }
-        unselect_rows();
-    }
-
-    if (debouncing) {
-        if (--debouncing) {
-            _delay_ms(1);
-        } else {
-            for (uint8_t i = 0; i < ROWS_PER_HAND; i++) {
-                matrix[i+offset] = matrix_debouncing[i+offset];
-            }
-        }
-    }
-
-    return 1;
-}
-
-#ifdef USE_MATRIX_I2C
-
-// Get rows from other half over i2c
-int i2c_transaction(void) {
-    int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0;
-
-    int err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_WRITE);
-    if (err) goto i2c_error;
-
-    // start of matrix stored at 0x00
-    err = i2c_master_write(0x00);
-    if (err) goto i2c_error;
-
-    // Start read
-    err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_READ);
-    if (err) goto i2c_error;
-
-    if (!err) {
-        int i;
-        for (i = 0; i < ROWS_PER_HAND-1; ++i) {
-            matrix[slaveOffset+i] = i2c_master_read(I2C_ACK);
-        }
-        matrix[slaveOffset+i] = i2c_master_read(I2C_NACK);
-        i2c_master_stop();
-    } else {
-i2c_error: // the cable is disconnceted, or something else went wrong
-        i2c_reset_state();
-        return err;
-    }
-
-    return 0;
-}
-
-#else // USE_SERIAL
-
-int serial_transaction(int master_changed) {
-    int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0;
-#ifdef SERIAL_USE_MULTI_TRANSACTION
-    int ret=serial_update_buffers(master_changed);
-#else
-    int ret=serial_update_buffers();
-#endif
-    if (ret ) {
-        if(ret==2) writePinLow(B0);
-        return 1;
-    }
-    writePinHigh(B0);
-    memcpy(&matrix[slaveOffset],
-        (void *)serial_slave_buffer, sizeof(serial_slave_buffer));
-    return 0;
-}
-#endif
-
-uint8_t matrix_scan(void)
-{
-    if (is_helix_master()) {
-        matrix_master_scan();
-    }else{
-        matrix_slave_scan();
-        int offset = (isLeftHand) ? ROWS_PER_HAND : 0;
-        memcpy(&matrix[offset],
-               (void *)serial_master_buffer, sizeof(serial_master_buffer));
-        matrix_scan_quantum();
-    }
-    return 1;
-}
-
-
-uint8_t matrix_master_scan(void) {
-
-    int ret = _matrix_scan();
-    int mchanged = 1;
-
-#ifndef KEYBOARD_helix_rev1
-    int offset = (isLeftHand) ? 0 : ROWS_PER_HAND;
-
-#ifdef USE_MATRIX_I2C
-//    for (int i = 0; i < ROWS_PER_HAND; ++i) {
-        /* i2c_slave_buffer[i] = matrix[offset+i]; */
-//        i2c_slave_buffer[i] = matrix[offset+i];
-//    }
-#else // USE_SERIAL
-  #ifdef SERIAL_USE_MULTI_TRANSACTION
-    mchanged = memcmp((void *)serial_master_buffer,
-		      &matrix[offset], sizeof(serial_master_buffer));
-  #endif
-    memcpy((void *)serial_master_buffer,
-	   &matrix[offset], sizeof(serial_master_buffer));
-#endif
-#endif
-
-#ifdef USE_MATRIX_I2C
-    if( i2c_transaction() ) {
-#else // USE_SERIAL
-    if( serial_transaction(mchanged) ) {
-#endif
-        // turn on the indicator led when halves are disconnected
-        writePinLow(D5);
-
-        error_count++;
-
-        if (error_count > ERROR_DISCONNECT_COUNT) {
-            // reset other half if disconnected
-            int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0;
-            for (int i = 0; i < ROWS_PER_HAND; ++i) {
-                matrix[slaveOffset+i] = 0;
-            }
-        }
-    } else {
-        // turn off the indicator led on no error
-        writePinHigh(D5);
-        error_count = 0;
-    }
-    matrix_scan_quantum();
-    return ret;
-}
-
-void matrix_slave_scan(void) {
-    _matrix_scan();
-
-    int offset = (isLeftHand) ? 0 : ROWS_PER_HAND;
-
-#ifdef USE_MATRIX_I2C
-    for (int i = 0; i < ROWS_PER_HAND; ++i) {
-        /* i2c_slave_buffer[i] = matrix[offset+i]; */
-        i2c_slave_buffer[i] = matrix[offset+i];
-    }
-#else // USE_SERIAL
-  #ifdef SERIAL_USE_MULTI_TRANSACTION
-    int change = 0;
-  #endif
-    for (int i = 0; i < ROWS_PER_HAND; ++i) {
-  #ifdef SERIAL_USE_MULTI_TRANSACTION
-        if( serial_slave_buffer[i] != matrix[offset+i] )
-	    change = 1;
-  #endif
-        serial_slave_buffer[i] = matrix[offset+i];
-    }
-  #ifdef SERIAL_USE_MULTI_TRANSACTION
-    slave_buffer_change_count += change;
-  #endif
-#endif
-}
-
-inline
-bool matrix_is_on(uint8_t row, uint8_t col)
-{
-    return (matrix[row] & ((matrix_row_t)1<<col));
-}
-
-inline
-matrix_row_t matrix_get_row(uint8_t row)
-{
-    return matrix[row];
-}
-
-void matrix_print(void)
-{
-    print("\nr/c 0123456789ABCDEF\n");
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        print_hex8(row); print(": ");
-        print_bin_reverse16(matrix_get_row(row));
-        print("\n");
-    }
-}
-
-static void  init_cols(void)
-{
-    for(int x = 0; x < MATRIX_COLS; x++) {
-        _SFR_IO8((col_pins[x] >> 4) + 1) &=  ~_BV(col_pins[x] & 0xF);
-        _SFR_IO8((col_pins[x] >> 4) + 2) |= _BV(col_pins[x] & 0xF);
-    }
-}
-
-static matrix_row_t read_cols(void)
-{
-    matrix_row_t result = 0;
-    for(int x = 0; x < MATRIX_COLS; x++) {
-        result |= (_SFR_IO8(col_pins[x] >> 4) & _BV(col_pins[x] & 0xF)) ? 0 : (1 << x);
-    }
-    return result;
-}
-
-static void unselect_rows(void)
-{
-    for(int x = 0; x < ROWS_PER_HAND; x++) {
-        _SFR_IO8((row_pins[x] >> 4) + 1) &=  ~_BV(row_pins[x] & 0xF);
-        _SFR_IO8((row_pins[x] >> 4) + 2) |= _BV(row_pins[x] & 0xF);
-    }
-}
-
-static void select_row(uint8_t row)
-{
-    _SFR_IO8((row_pins[row] >> 4) + 1) |=  _BV(row_pins[row] & 0xF);
-    _SFR_IO8((row_pins[row] >> 4) + 2) &= ~_BV(row_pins[row] & 0xF);
-}
diff --git a/keyboards/helix/rev2/custom/split_scomm.c b/keyboards/helix/rev2/custom/split_scomm.c
deleted file mode 100644
index 378781b98c..0000000000
--- a/keyboards/helix/rev2/custom/split_scomm.c
+++ /dev/null
@@ -1,92 +0,0 @@
-#ifdef USE_SERIAL
-#ifdef SERIAL_USE_MULTI_TRANSACTION
-/* --- USE flexible API (using multi-type transaction function) --- */
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <stddef.h>
-#include "split_scomm.h"
-#include "serial.h"
-#ifdef CONSOLE_ENABLE
-  #include "print.h"
-#endif
-
-uint8_t volatile serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH] = {0};
-uint8_t volatile serial_master_buffer[SERIAL_MASTER_BUFFER_LENGTH] = {0};
-uint8_t volatile status_com = 0;
-uint8_t volatile status1 = 0;
-uint8_t slave_buffer_change_count = 0;
-uint8_t s_change_old = 0xff;
-uint8_t s_change_new = 0xff;
-
-SSTD_t transactions[] = {
-#define GET_SLAVE_STATUS 0
-    /* master buffer not changed, only recive slave_buffer_change_count */
-    { (uint8_t *)&status_com,
-      0, NULL,
-      sizeof(slave_buffer_change_count), &slave_buffer_change_count,
-    },
-#define PUT_MASTER_GET_SLAVE_STATUS 1
-    /* master buffer changed need send, and recive slave_buffer_change_count  */
-    { (uint8_t *)&status_com,
-      sizeof(serial_master_buffer), (uint8_t *)serial_master_buffer,
-      sizeof(slave_buffer_change_count), &slave_buffer_change_count,
-    },
-#define GET_SLAVE_BUFFER 2
-    /* recive serial_slave_buffer */
-    { (uint8_t *)&status1,
-      0, NULL,
-      sizeof(serial_slave_buffer), (uint8_t *)serial_slave_buffer
-    }
-};
-
-void serial_master_init(void)
-{
-    soft_serial_initiator_init(transactions, TID_LIMIT(transactions));
-}
-
-void serial_slave_init(void)
-{
-    soft_serial_target_init(transactions, TID_LIMIT(transactions));
-}
-
-// 0 => no error
-// 1 => slave did not respond
-// 2 => checksum error
-int serial_update_buffers(int master_update)
-{
-    int status, smatstatus;
-    static int need_retry = 0;
-
-    if( s_change_old != s_change_new ) {
-        smatstatus = soft_serial_transaction(GET_SLAVE_BUFFER);
-        if( smatstatus == TRANSACTION_END ) {
-            s_change_old = s_change_new;
-#ifdef CONSOLE_ENABLE
-            uprintf("slave matrix = %b %b %b %b %b\n",
-                    serial_slave_buffer[0], serial_slave_buffer[1],
-                    serial_slave_buffer[2], serial_slave_buffer[3],
-                    serial_slave_buffer[4] );
-#endif
-        }
-    } else {
-        // serial_slave_buffer dosen't change
-        smatstatus = TRANSACTION_END; // dummy status
-    }
-
-    if( !master_update && !need_retry) {
-        status = soft_serial_transaction(GET_SLAVE_STATUS);
-    } else {
-        status = soft_serial_transaction(PUT_MASTER_GET_SLAVE_STATUS);
-    }
-    if( status == TRANSACTION_END ) {
-        s_change_new = slave_buffer_change_count;
-        need_retry = 0;
-    } else {
-        need_retry = 1;
-    }
-    return smatstatus;
-}
-
-#endif // SERIAL_USE_MULTI_TRANSACTION
-#endif /* USE_SERIAL */
diff --git a/keyboards/helix/rev2/custom/split_scomm.h b/keyboards/helix/rev2/custom/split_scomm.h
deleted file mode 100644
index 16887eb74f..0000000000
--- a/keyboards/helix/rev2/custom/split_scomm.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#ifndef SERIAL_USE_MULTI_TRANSACTION
-/* --- USE Simple API (OLD API, compatible with let's split serial.c) --- */
-#include "serial.h"
-
-#else
-/* --- USE flexible API (using multi-type transaction function) --- */
-// Buffers for master - slave communication
-#define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2
-#define SERIAL_MASTER_BUFFER_LENGTH MATRIX_ROWS/2
-
-extern volatile uint8_t serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH];
-extern volatile uint8_t serial_master_buffer[SERIAL_MASTER_BUFFER_LENGTH];
-extern uint8_t slave_buffer_change_count;
-
-void serial_master_init(void);
-void serial_slave_init(void);
-int serial_update_buffers(int master_changed);
-
-#endif
diff --git a/keyboards/helix/rev2/custom/split_util.c b/keyboards/helix/rev2/custom/split_util.c
deleted file mode 100644
index ab40315487..0000000000
--- a/keyboards/helix/rev2/custom/split_util.c
+++ /dev/null
@@ -1,109 +0,0 @@
-#include <avr/io.h>
-#include <avr/wdt.h>
-#include <avr/power.h>
-#include <avr/interrupt.h>
-#include <util/delay.h>
-#include <avr/eeprom.h>
-#include "split_util.h"
-#include "matrix.h"
-#include "keyboard.h"
-#include "wait.h"
-
-#ifdef USE_MATRIX_I2C
-#  include "i2c.h"
-#else
-#  include "split_scomm.h"
-#endif
-
-#ifdef EE_HANDS
-#    include "eeconfig.h"
-#endif
-
-#ifndef SPLIT_USB_TIMEOUT
-#    define SPLIT_USB_TIMEOUT 2000
-#endif
-
-#ifndef SPLIT_USB_TIMEOUT_POLL
-#    define SPLIT_USB_TIMEOUT_POLL 10
-#endif
-
-volatile bool isLeftHand = true;
-
-bool waitForUsb(void) {
-    for (uint8_t i = 0; i < (SPLIT_USB_TIMEOUT / SPLIT_USB_TIMEOUT_POLL); i++) {
-        // This will return true if a USB connection has been established
-        if (UDADDR & _BV(ADDEN)) {
-            return true;
-        }
-        wait_ms(SPLIT_USB_TIMEOUT_POLL);
-    }
-
-    // Avoid NO_USB_STARTUP_CHECK - Disable USB as the previous checks seem to enable it somehow
-    (USBCON &= ~(_BV(USBE) | _BV(OTGPADE)));
-
-    return false;
-}
-
-
-bool is_keyboard_left(void) {
-#if defined(SPLIT_HAND_PIN)
-    // Test pin SPLIT_HAND_PIN for High/Low, if low it's right hand
-    setPinInput(SPLIT_HAND_PIN);
-    return readPin(SPLIT_HAND_PIN);
-#elif defined(EE_HANDS)
-    return eeconfig_read_handedness();
-#elif defined(MASTER_RIGHT)
-    return !is_helix_master();
-#endif
-
-    return is_helix_master();
-}
-
-bool is_helix_master(void) {
-    static enum { UNKNOWN, MASTER, SLAVE } usbstate = UNKNOWN;
-
-    // only check once, as this is called often
-    if (usbstate == UNKNOWN) {
-#if defined(SPLIT_USB_DETECT)
-        usbstate = waitForUsb() ? MASTER : SLAVE;
-#elif defined(__AVR__)
-        USBCON |= (1 << OTGPADE);  // enables VBUS pad
-        wait_us(5);
-
-        usbstate = (USBSTA & (1 << VBUS)) ? MASTER : SLAVE;  // checks state of VBUS
-#else
-        usbstate = MASTER;
-#endif
-    }
-
-    return (usbstate == MASTER);
-}
-
-static void keyboard_master_setup(void) {
-
-#ifdef USE_MATRIX_I2C
-    i2c_master_init();
-#else
-    serial_master_init();
-#endif
-}
-
-static void keyboard_slave_setup(void) {
-
-#ifdef USE_MATRIX_I2C
-    i2c_slave_init(SLAVE_I2C_ADDRESS);
-#else
-    serial_slave_init();
-#endif
-}
-
-void split_keyboard_setup(void) {
-   isLeftHand = is_keyboard_left();
-
-   if (is_helix_master()) {
-      keyboard_master_setup();
-   } else {
-      keyboard_slave_setup();
-   }
-   sei();
-}
diff --git a/keyboards/helix/rev2/custom/split_util.h b/keyboards/helix/rev2/custom/split_util.h
deleted file mode 100644
index 3b1d4249f5..0000000000
--- a/keyboards/helix/rev2/custom/split_util.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#ifdef SPLIT_KEYBOARD
-#   error This is helix local split_util.h.
-#   error This header file is used only when SPLIT_KEYBOARD=no.
-#endif
-
-#include <stdbool.h>
-#include "eeconfig.h"
-
-#define SLAVE_I2C_ADDRESS           0x32
-
-extern volatile bool isLeftHand;
-
-// slave version of matix scan, defined in matrix.c
-void matrix_slave_scan(void);
-
-void split_keyboard_setup(void);
-bool is_helix_master(void);
-
-void matrix_master_OLED_init (void);
diff --git a/keyboards/helix/rev2/keymaps/default/oled_display.c b/keyboards/helix/rev2/keymaps/default/oled_display.c
index 824d2e4d86..ad5558869f 100644
--- a/keyboards/helix/rev2/keymaps/default/oled_display.c
+++ b/keyboards/helix/rev2/keymaps/default/oled_display.c
@@ -18,10 +18,6 @@
 #include <string.h>
 #include QMK_KEYBOARD_H
 
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
-
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
@@ -35,10 +31,15 @@ enum layer_number {
     _ADJUST
 };
 
-//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
-#if defined(SSD1306OLED) || defined(OLED_ENABLE)
+//assign the right code to your layers for OLED display
+#define L_BASE 0
+#define L_LOWER (1<<_LOWER)
+#define L_RAISE (1<<_RAISE)
+#define L_ADJUST (1<<_ADJUST)
+#define L_ADJUST_TRI (L_ADJUST|L_RAISE|L_LOWER)
 
-#    if defined(OLED_ENABLE)
+//OLED update loop
+#ifdef OLED_ENABLE
 oled_rotation_t oled_init_user(oled_rotation_t rotation) {
     if (is_keyboard_master()) {
         return OLED_ROTATION_0;
@@ -46,12 +47,120 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {
         return OLED_ROTATION_180;
     }
 }
-#    else
-#        define oled_write(data,flag)    matrix_write(matrix, data)
-#        define oled_write_P(data,flag)  matrix_write_P(matrix, data)
+
+static void render_rgbled_status(bool full) {
+#    ifdef RGBLIGHT_ENABLE
+    char buf[30];
+    if (RGBLIGHT_MODES > 1 && rgblight_is_enabled()) {
+        if (full) {
+            snprintf(buf, sizeof(buf), " LED %2d: %d,%d,%d ",
+                     rgblight_get_mode(),
+                     rgblight_get_hue()/RGBLIGHT_HUE_STEP,
+                     rgblight_get_sat()/RGBLIGHT_SAT_STEP,
+                     rgblight_get_val()/RGBLIGHT_VAL_STEP);
+        } else {
+            snprintf(buf, sizeof(buf), "[%2d] ", rgblight_get_mode());
+        }
+        oled_write(buf, false);
+    }
 #    endif
+}
+
+static void render_layer_status(void) {
+  // Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below
+    char buf[10];
+    oled_write_P(PSTR("Layer: "), false);
+    switch (layer_state) {
+    case L_BASE:
+        oled_write_P(PSTR("Default"), false);
+        break;
+    case L_RAISE:
+        oled_write_P(PSTR("Raise"), false);
+        break;
+    case L_LOWER:
+        oled_write_P(PSTR("Lower"), false);
+        break;
+    case L_ADJUST:
+    case L_ADJUST_TRI:
+        oled_write_P(PSTR("Adjust"), false);
+        break;
+    default:
+        oled_write_P(PSTR("Undef-"), false);
+        snprintf(buf,sizeof(buf), "%ld", layer_state);
+        oled_write(buf, false);
+    }
+    oled_write_P(PSTR("\n"), false);
+}
+
+void render_status(void) {
+  // Render to mode icon
+    static const char os_logo[][2][3] PROGMEM = {{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}};
+    if (is_mac_mode()) {
+        oled_write_P(os_logo[0][0], false);
+        oled_write_P(PSTR("\n"), false);
+        oled_write_P(os_logo[0][1], false);
+    } else {
+        oled_write_P(os_logo[1][0], false);
+        oled_write_P(PSTR("\n"), false);
+        oled_write_P(os_logo[1][1], false);
+    }
+
+    oled_write_P(PSTR(" "), false);
+    render_layer_status();
+
+    // Host Keyboard LED Status
+    led_t led_state = host_keyboard_led_state();
+    oled_write_P(led_state.num_lock ? PSTR("NUMLOCK") : PSTR("       "), false);
+    oled_write_P(led_state.caps_lock ? PSTR("CAPS") : PSTR("    "), false);
+    oled_write_P(led_state.scroll_lock ? PSTR("SCLK") : PSTR("    "), false);
+    oled_advance_page(true);
+    render_rgbled_status(true);
+    oled_write_P(PSTR("\n"), false);
+}
+
+bool oled_task_user(void) {
+
+#        if DEBUG_TO_SCREEN
+    if (debug_enable) {
+        return;
+    }
+#        endif
+
+    if (is_keyboard_master()) {
+        render_status();
+    } else {
+        render_helix_logo();
+        render_rgbled_status(false);
+        render_layer_status();
+    }
+    return false;
+}
+#endif // end of OLED_ENABLE
+
+//SSD1306 OLED update loop
+/*
+    The following code is left as a sample to help you transition from SSD1306OLED to OLED_ENABLE.
+
+    * `matrix_write(matrix, data)` is replaced by `oled_write(data, false)`.
+    * `matrix_write_P(matrix, data)` is replaced by `oled_write_P(data, false)`.
+    * It is no longer necessary to call `iota_gfx_task()`.
+    * `matrix_update()` are no longer needed.
+    * `iota_gfx_task_user()` is no longer needed. Instead, `bool oled_task_user(void)` is provided.
+
+    以下のコードは、SSD1306OLED から OLED_ENABLE に移行する助けになるようにサンプルとして残してあります。
+
+    * `matrix_write(matrix, data)` は、`oled_write(data, false)` に書き換えます。
+    * `matrix_write_P(matrix, data)` は、`oled_write_P(data, false)` に書き換えます。
+    * `iota_gfx_task()` を呼び出す必要はなくなります。
+    * `matrix_update()` は不要になります。
+    * `iota_gfx_task_user()` は不要になります。代りに `bool oled_task_user(void)` を用意します。
+ */
+
+#ifdef SSD1306OLED
+#include "ssd1306.h"
+#define oled_write(data,flag)    matrix_write(matrix, data)
+#define oled_write_P(data,flag)  matrix_write_P(matrix, data)
 
-#    ifdef SSD1306OLED
 void matrix_scan_user(void) {
     iota_gfx_task();  // this is what updates the display continuously
 }
@@ -63,16 +172,7 @@ void matrix_update(struct CharacterMatrix *dest,
         dest->dirty = true;
     }
 }
-#    endif
-
-//assign the right code to your layers for OLED display
-#define L_BASE 0
-#define L_LOWER (1<<_LOWER)
-#define L_RAISE (1<<_RAISE)
-#define L_ADJUST (1<<_ADJUST)
-#define L_ADJUST_TRI (L_ADJUST|L_RAISE|L_LOWER)
 
-#    ifdef SSD1306OLED
 static void render_logo(struct CharacterMatrix *matrix) {
 
     static const char helix_logo[] PROGMEM ={
@@ -82,13 +182,8 @@ static void render_logo(struct CharacterMatrix *matrix) {
         0};
     oled_write_P(helix_logo, false);
 }
-#    endif
 
-#    ifdef SSD1306OLED
 static void render_rgbled_status(bool full, struct CharacterMatrix *matrix) {
-#    else
-static void render_rgbled_status(bool full) {
-#    endif
 #    ifdef RGBLIGHT_ENABLE
     char buf[30];
     if (RGBLIGHT_MODES > 1 && rgblight_is_enabled()) {
@@ -106,11 +201,7 @@ static void render_rgbled_status(bool full) {
 #    endif
 }
 
-#    ifdef SSD1306OLED
 static void render_layer_status(struct CharacterMatrix *matrix) {
-#    else
-static void render_layer_status(void) {
-#    endif
   // Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below
     char buf[10];
     oled_write_P(PSTR("Layer: "), false);
@@ -136,11 +227,7 @@ static void render_layer_status(void) {
     oled_write_P(PSTR("\n"), false);
 }
 
-#    ifdef SSD1306OLED
 void render_status(struct CharacterMatrix *matrix) {
-#    else
-void render_status(void) {
-#    endif
   // Render to mode icon
     static const char os_logo[][2][3] PROGMEM = {{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}};
     if (is_mac_mode()) {
@@ -154,11 +241,7 @@ void render_status(void) {
     }
 
     oled_write_P(PSTR(" "), false);
-#    ifdef SSD1306OLED
     render_layer_status(matrix);
-#    else
-    render_layer_status();
-#    endif
 
     // Host Keyboard LED Status
     led_t led_state = host_keyboard_led_state();
@@ -166,35 +249,28 @@ void render_status(void) {
     oled_write_P(led_state.caps_lock ? PSTR("CAPS") : PSTR("    "), false);
     oled_write_P(led_state.scroll_lock ? PSTR("SCLK") : PSTR("    "), false);
     oled_write_P(PSTR("\n"), false);
-#    ifdef SSD1306OLED
     render_rgbled_status(true, matrix);
-#    else
-    render_rgbled_status(true);
-    oled_write_P(PSTR("\n"), false);
-#    endif
 }
 
-
-#    ifdef SSD1306OLED
-#        if OLED_UPDATE_INTERVAL > 0
+#    if OLED_UPDATE_INTERVAL > 0
 uint16_t oled_update_timeout;
-#        endif
+#    endif
 
 void iota_gfx_task_user(void) {
     struct CharacterMatrix matrix;
 
-#        if DEBUG_TO_SCREEN
+#    if DEBUG_TO_SCREEN
     if (debug_enable) {
         return;
     }
-#        endif
+#    endif
 
-#if      OLED_UPDATE_INTERVAL > 0
+#    if OLED_UPDATE_INTERVAL > 0
     if (timer_elapsed(oled_update_timeout) < OLED_UPDATE_INTERVAL) {
         return;
     }
     oled_update_timeout = timer_read();
-#endif
+#    endif
     matrix_clear(&matrix);
     if (is_keyboard_master()) {
         render_status(&matrix);
@@ -205,23 +281,5 @@ void iota_gfx_task_user(void) {
     }
     matrix_update(&display, &matrix);
 }
-#    else
-bool oled_task_user(void) {
 
-#        if DEBUG_TO_SCREEN
-    if (debug_enable) {
-        return;
-    }
-#        endif
-
-    if (is_keyboard_master()) {
-        render_status();
-    } else {
-        render_helix_logo();
-        render_rgbled_status(false);
-        render_layer_status();
-    }
-    return false;
-}
-#    endif
-#endif
+#endif // end of SSD1306OLED
diff --git a/keyboards/helix/rev2/local_features.mk b/keyboards/helix/rev2/local_features.mk
index c6f818bf39..34fd699a65 100644
--- a/keyboards/helix/rev2/local_features.mk
+++ b/keyboards/helix/rev2/local_features.mk
@@ -40,24 +40,6 @@ ifneq ($(strip $(HELIX)),)
     SHOW_HELIX_OPTIONS = yes
 endif
 
-ifneq ($(strip $(SPLIT_KEYBOARD)), yes)
-  # In the very near future, all keymaps will be compatible with split_common and this block will be removed.
-  SRC += local_drivers/serial.c
-  KEYBOARD_PATHS += $(HELIX_TOP_DIR)/local_drivers
-
-  # A workaround until #7089 is merged.
-  #   serial.c must not be compiled with the -lto option.
-  #   The current LIB_SRC has a side effect with the -fno-lto option, so use it.
-  LIB_SRC += local_drivers/serial.c
-
-  CUSTOM_MATRIX = yes
-
-  SRC += rev2/custom/matrix.c
-  SRC += rev2/custom/split_util.c
-  SRC += rev2/custom/split_scomm.c
-  KEYBOARD_PATHS += $(HELIX_TOP_DIR)/rev2/custom
-endif
-
 ########
 # convert Helix-specific options (that represent combinations of standard options)
 #   into QMK standard options.
@@ -88,44 +70,17 @@ ifeq ($(strip $(LED_ANIMATIONS)), yes)
 endif
 
 ifeq ($(strip $(OLED_ENABLE)), yes)
-    ifeq ($(strip $(OLED_SELECT)),core)
-        OLED_ENABLE = yes
-        OLED_DRIVER = SSD1306
-        ifeq ($(strip $(LOCAL_GLCDFONT)), yes)
-           OPT_DEFS += -DOLED_FONT_H=\<helixfont.h\>
-        else
-           OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\"
-        endif
+    OLED_DRIVER = SSD1306
+    ifeq ($(strip $(LOCAL_GLCDFONT)), yes)
+       OPT_DEFS += -DOLED_FONT_H=\<helixfont.h\>
     else
-
-        # In the very near future, all keymaps will be compatible with QMK standard oled_driver and this block will be removed.
-        ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
-            $(info Helix/rev2: The following combinations are not supported.)
-            $(info - SPLIT_KEYBOARD = $(SPLIT_KEYBOARD)) # yes
-            $(info - OLED_ENABLE    = $(OLED_ENABLE))    # yes
-            $(info - OLED_SELECT    = $(OLED_SELECT))    # local
-            $(info Force : OLED_ENABLE = no)
-            $(info .)
-            OLED_ENABLE = no
-        endif
-        ifeq ($(strip $(OLED_ENABLE)), yes)
-            OLED_ENABLE = no # disable OLED in TOP/common_features.mk
-            OLED_LOCAL_ENABLE = yes
-            SRC += local_drivers/i2c.c
-            SRC += local_drivers/ssd1306.c
-            KEYBOARD_PATHS += $(HELIX_TOP_DIR)/local_drivers
-            OPT_DEFS += -DOLED_LOCAL_ENABLE
-            ifeq ($(strip $(LOCAL_GLCDFONT)), yes)
-                OPT_DEFS += -DLOCAL_GLCDFONT
-            endif
-        endif
+       OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\"
     endif
 endif
 
 ifneq ($(strip $(SHOW_HELIX_OPTIONS)),)
   $(info Helix Spacific Build Options)
   $(info -  OLED_ENABLE          = $(OLED_ENABLE))
-  $(info -  OLED_SELECT          = $(OLED_SELECT))
   $(info -  LED_BACK_ENABLE      = $(LED_BACK_ENABLE))
   $(info -  LED_UNDERGLOW_ENABLE = $(LED_UNDERGLOW_ENABLE))
   $(info -  LED_ANIMATIONS       = $(LED_ANIMATIONS))
diff --git a/keyboards/helix/rev2/override_helix_options.mk b/keyboards/helix/rev2/override_helix_options.mk-maintenance
index 56dee8ce78..56dee8ce78 100644
--- a/keyboards/helix/rev2/override_helix_options.mk
+++ b/keyboards/helix/rev2/override_helix_options.mk-maintenance
diff --git a/keyboards/helix/rev2/rev2.c b/keyboards/helix/rev2/rev2.c
index ba29f3c7de..2bbe9a28e2 100644
--- a/keyboards/helix/rev2/rev2.c
+++ b/keyboards/helix/rev2/rev2.c
@@ -20,14 +20,6 @@
 //  for the old keymap.c.
 uint8_t is_master = false;
 
-#ifdef SSD1306OLED
-#include "ssd1306.h"
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	return process_record_gfx(keycode,record) && process_record_user(keycode, record);
-}
-#endif
-
 bool is_mac_mode(void) {
     // This is the opposite of the QMK standard, but we'll leave it for backwards compatibility.
     return keymap_config.swap_lalt_lgui == false;
@@ -59,12 +51,6 @@ void keyboard_post_init_kb(void) {
     keyboard_post_init_user();
 }
 
-#if defined(SPLIT_KEYBOARD) && defined(SSD1306OLED)
-void matrix_slave_scan_user(void) {
-    matrix_scan_user();
-}
-#endif
-
 #ifdef OLED_ENABLE
 void render_helix_logo(void) {
     static const char helix_logo[] PROGMEM ={
@@ -82,7 +68,7 @@ bool oled_task_kb(void) {
         oled_write_P(led_state.num_lock ? PSTR("NUMLOCK") : PSTR("       "), false);
         oled_write_P(led_state.caps_lock ? PSTR("CAPS") : PSTR("    "), false);
         oled_write_P(led_state.scroll_lock ? PSTR("SCLK") : PSTR("    "), false);
-        oled_write_P(PSTR("\n"), false);
+        oled_advance_page(true);
         render_helix_logo();
     }
     return false;
diff --git a/keyboards/helix/rev2/rules.mk b/keyboards/helix/rev2/rules.mk
index 5ed92ff0ad..dce8b9d3ea 100644
--- a/keyboards/helix/rev2/rules.mk
+++ b/keyboards/helix/rev2/rules.mk
@@ -1,6 +1,6 @@
 KEYBOARD_LOCAL_FEATURES_MK := $(dir $(lastword $(MAKEFILE_LIST)))local_features.mk
 
-# SPLIT_KEYBOARD = yes
+SPLIT_KEYBOARD = yes
 
 # Helix Spacific Build Options default values
 HELIX_ROWS = 5              # Helix Rows is 4 or 5
@@ -10,8 +10,3 @@ LED_BACK_ENABLE = no        # LED backlight (Enable WS2812 RGB underlight.)
 LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)
 LED_ANIMATIONS = yes        # LED animations
 IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone)
-
-# If OLED_ENABLE is 'yes'
-#   If OLED_SELECT is 'core', use QMK standard oled_dirver.c.
-#   If OLED_SELECT is other than 'core', use helix/local_drivers/ssd1306.c.
-OLED_SELECT = local
diff --git a/keyboards/hhkb/jp/info.json b/keyboards/hhkb/jp/info.json
index b9064880dd..ee9d1de53a 100644
--- a/keyboards/hhkb/jp/info.json
+++ b/keyboards/hhkb/jp/info.json
@@ -3,7 +3,7 @@
   "url": "",
   "maintainer": "qmk",
   "layouts": {
-    "LAYOUT_JP": {
+    "LAYOUT_jp": {
       "layout": [
         { "label": "Esc", "x": 0, "y": 0 },
         { "label": "!", "x": 1, "y": 0 },
diff --git a/keyboards/hhkb/jp/jp.h b/keyboards/hhkb/jp/jp.h
index a95796f25f..b243e5546c 100644
--- a/keyboards/hhkb/jp/jp.h
+++ b/keyboards/hhkb/jp/jp.h
@@ -2,7 +2,7 @@
 
 #include "quantum.h"
 
-#define LAYOUT_JP(                                                             \
+#define LAYOUT_jp(                                                             \
     K02, K32, K62, K22, K12, K52, K72, KA2, K92, K82, KB2, KE2, KF2, KD2, KC2, \
     K03, K63, K23, K13, K53, K73, KA3, K93, K83, KB3, KE3, KF3, KD3,           \
     K06, K66, K26, K16, K56, K76, KA6, K96, K86, KB6, KE6, KF6, KD6, KC6,      \
diff --git a/keyboards/hhkb/jp/keymaps/bakingpy/keymap.c b/keyboards/hhkb/jp/keymaps/bakingpy/keymap.c
index 04d79f9247..cea713dbf2 100644
--- a/keyboards/hhkb/jp/keymaps/bakingpy/keymap.c
+++ b/keyboards/hhkb/jp/keymaps/bakingpy/keymap.c
@@ -1,14 +1,14 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_JP(
+    [0] = LAYOUT_jp(
         KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_BSPC,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
         KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_ENT,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_BSLS,
         MO(1), KC_GRV, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_BSPC, KC_RGUI, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
 
-    [1] = LAYOUT_JP(
+    [1] = LAYOUT_jp(
         KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
         KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT,
diff --git a/keyboards/hhkb/jp/keymaps/default/keymap.c b/keyboards/hhkb/jp/keymaps/default/keymap.c
index 1c7d677ccf..a704ee5647 100644
--- a/keyboards/hhkb/jp/keymaps/default/keymap.c
+++ b/keyboards/hhkb/jp/keymaps/default/keymap.c
@@ -29,14 +29,14 @@
  */
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_JP(
+    [0] = LAYOUT_jp(
         KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_JYEN, KC_BSPC,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
         KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_UP, KC_RSFT,
         MO(1), KC_ZKHK, KC_LGUI, KC_LALT, KC_MHEN, KC_SPC, KC_HENK, KC_KANA, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
 
-    [1] = LAYOUT_JP(
+    [1] = LAYOUT_jp(
         KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
         KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT,
diff --git a/keyboards/hhkb/jp/keymaps/default_mac/keymap.c b/keyboards/hhkb/jp/keymaps/default_mac/keymap.c
index 17127690f4..df08341fa4 100644
--- a/keyboards/hhkb/jp/keymaps/default_mac/keymap.c
+++ b/keyboards/hhkb/jp/keymaps/default_mac/keymap.c
@@ -29,14 +29,14 @@
  */
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_JP(
+    [0] = LAYOUT_jp(
         KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_JYEN, KC_BSPC,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
         KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_UP, KC_RSFT,
         MO(1), KC_GRV, KC_LALT, KC_LGUI, KC_MHEN, KC_SPC, KC_HENK, KC_RGUI, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
 
-    [1] = LAYOUT_JP(
+    [1] = LAYOUT_jp(
         KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
         KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT,
diff --git a/keyboards/hhkb/jp/keymaps/dhertz/keymap.c b/keyboards/hhkb/jp/keymaps/dhertz/keymap.c
index 951af069b0..4c01457464 100644
--- a/keyboards/hhkb/jp/keymaps/dhertz/keymap.c
+++ b/keyboards/hhkb/jp/keymaps/dhertz/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |NCt||  #|Alt|CmT|CmT|  LyrSpc |CGv|Iso|Gui|CSL||Rig|Dow|Lef|
      * `-----------------------------------------------------------'
      */
-    [0] = LAYOUT_JP(
+    [0] = LAYOUT_jp(
               KC_ESC,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL, KC_DEL,KC_BSPC,
               KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,
              SRCH_CTL,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,  KC_SCLN,KC_QUOT,KC_NUHS, KC_ENT,
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |   ||  ~|   |CAD|   |         |CmH|   |   |   ||   |   |   |
    * `-----------------------------------------------------------'
    */
-  [1] = LAYOUT_JP(
+  [1] = LAYOUT_jp(
             KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
             KC_TRNS,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,  KC_TRNS,KC_TRNS,
             CMD_SPC,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |   ||  ~|   |   |   |         |   |   |   |   ||Hom|PgD|End|
    * `-----------------------------------------------------------'
    */
-  [2] = LAYOUT_JP(
+  [2] = LAYOUT_jp(
             KC_PWR,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12, KC_INS,KC_DEL,
             KC_CAPS,  DF(0),  DF(1),KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS,  KC_UP,KC_TRNS,
             KC_TRNS,   KC_VOLD,KC_VOLU,KC_MUTE,KC_TRNS,KC_TRNS,KC_TRNS,KC_BSPC, KC_DEL,CMD_SFT_L,KC_LEFT,KC_RGHT,KC_TRNS,KC_PENT,
diff --git a/keyboards/hhkb/jp/keymaps/enoch_jp/keymap.c b/keyboards/hhkb/jp/keymaps/enoch_jp/keymap.c
index 4ebdcf86da..2bec6bb4c6 100644
--- a/keyboards/hhkb/jp/keymaps/enoch_jp/keymap.c
+++ b/keyboards/hhkb/jp/keymaps/enoch_jp/keymap.c
@@ -29,14 +29,14 @@
 */
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_JP(
+    [0] = LAYOUT_jp(
         KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRAVE, KC_BSPC,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
         KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_DEL, KC_ENT,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_BSLS,
         KC_BSPC, KC_ZKHK, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_BSPC, KC_RSFT, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
 
-    [1] = LAYOUT_JP(
+    [1] = LAYOUT_jp(
         _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
         KC_CAPS, KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PSCR, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_LEFT, KC_RGHT, _______, KC_PENT,
diff --git a/keyboards/hhkb/jp/keymaps/halfqwerty_jp/keymap.c b/keyboards/hhkb/jp/keymaps/halfqwerty_jp/keymap.c
index 0d4a24c60d..ebbe13393b 100644
--- a/keyboards/hhkb/jp/keymaps/halfqwerty_jp/keymap.c
+++ b/keyboards/hhkb/jp/keymaps/halfqwerty_jp/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        |   ||Ctl|Alt|Cmd|   |   Spc   |   |   |   |   ||Lft|Dwn|Rgh|
        `-----------------------------------------------------------'
     */
-    [BASE] = LAYOUT_JP(
+    [BASE] = LAYOUT_jp(
         KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_JYEN, KC_BSPC,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
         KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        `-----------------------------------------------------------'
      */
 
-    [HHKB] = LAYOUT_JP(
+    [HHKB] = LAYOUT_jp(
         KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
         KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT,
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        |   ||   |   |   |   |         |   |   |   |   ||   |   |   |
        `-----------------------------------------------------------'
     */
-    [MIRROR] = LAYOUT_JP(
+    [MIRROR] = LAYOUT_jp(
         _______, KC_0, KC_9, KC_8, KC_7, KC_6, KC_5, KC_4, KC_3, KC_2, KC_1, _______, _______, _______, _______,
         _______, KC_P, KC_O, KC_I, KC_U, KC_Y, KC_T, KC_R, KC_E, KC_W, KC_Q, _______, _______,
         _______, KC_SCLN, KC_L, KC_K, KC_J, KC_H, KC_G, KC_F, KC_D, KC_S, KC_A, _______, _______, _______,
diff --git a/keyboards/hhkb/jp/keymaps/rdg_jp/keymap.c b/keyboards/hhkb/jp/keymaps/rdg_jp/keymap.c
index c893495efe..b4eec44547 100644
--- a/keyboards/hhkb/jp/keymaps/rdg_jp/keymap.c
+++ b/keyboards/hhkb/jp/keymaps/rdg_jp/keymap.c
@@ -28,21 +28,21 @@ enum
  */
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [ZER] = LAYOUT_JP(
+    [ZER] = LAYOUT_jp(
         KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_INS, KC_BSPC,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
         CTL_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_GRV, KC_ENT,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS, KC_UP, KC_RSFT,
         MO(HDN), KC_LCTL, KC_LALT, KC_LGUI, MO(HDN), KC_SPC, SFT_BSP, MO(HDN), MO(OSY), KC_NO, KC_LEFT, KC_DOWN, KC_RGHT),
 
-    [HDN] = LAYOUT_JP(
+    [HDN] = LAYOUT_jp(
         KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL,
         _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______,
         _______, KC_TILD, KC_GRV, KC_BSLS, KC_PIPE, KC_MINS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TILD, KC_GRV, _______, _______,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, _______, _______, KC_ENT, _______, _______, _______, _______, KC_PGUP, _______,
         _______, _______, _______, _______, _______, KC_UNDS, KC_DEL, _______, _______, _______, KC_HOME, KC_PGDN, KC_END),
 
-    [OSY] = LAYOUT_JP(
+    [OSY] = LAYOUT_jp(
         _______, _______, _______, SCRNS3, SCRNS4, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/hhkb/jp/keymaps/sh_jp/keymap.c b/keyboards/hhkb/jp/keymaps/sh_jp/keymap.c
index 097a017525..e13838007b 100644
--- a/keyboards/hhkb/jp/keymaps/sh_jp/keymap.c
+++ b/keyboards/hhkb/jp/keymaps/sh_jp/keymap.c
@@ -10,34 +10,34 @@ enum
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [DVOR] = LAYOUT_JP(
+    [DVOR] = LAYOUT_jp(
         KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_JYEN, KC_BSPC,
         KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL,
         KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_BSLS, KC_ENT,
         KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RO, KC_UP, KC_RSFT,
         MO(FUNC), KC_ZKHK, KC_LALT, MO(NEW_CMD), MO(SYMB), MT(MOD_LSFT, KC_SPC), MO(SYMB), KC_TAB, KC_RGUI, TG(QWER), KC_LEFT, KC_DOWN, KC_RGHT),
-    [QWER] = LAYOUT_JP(
+    [QWER] = LAYOUT_jp(
         KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_JYEN, KC_BSPC,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
         KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_UP, KC_RSFT,
         MO(FUNC), KC_ZKHK, KC_LALT, MO(NEW_CMD), MO(SYMB), MT(MOD_LSFT, KC_SPC), MO(SYMB), KC_TAB, KC_RGUI, _______, KC_LEFT, KC_DOWN, KC_RGHT),
 
-    [NEW_CMD] = LAYOUT_JP(
+    [NEW_CMD] = LAYOUT_jp(
         _______, LGUI(KC_1), LGUI(KC_2), LGUI(KC_3), LGUI(KC_4), LGUI(KC_5), LGUI(KC_6), LGUI(KC_7), LGUI(KC_8), LGUI(KC_9), LGUI(KC_0), _______, _______, _______, LGUI(KC_BSPC),
         _______, LGUI(KC_Q), LGUI(KC_W), LGUI(KC_E), LGUI(KC_R), LGUI(KC_T), LGUI(KC_Y), LGUI(KC_U), LGUI(KC_I), LGUI(KC_O), LGUI(KC_P), LGUI(KC_LBRC), LGUI(KC_RBRC),
         _______, LGUI(KC_A), LGUI(KC_S), LGUI(KC_D), LGUI(KC_F), LGUI(KC_G), LGUI(KC_H), LGUI(KC_J), LGUI(KC_K), LGUI(KC_L), _______, _______, _______, _______,
         LGUI(KC_LSFT), LGUI(KC_Z), LGUI(KC_X), LGUI(KC_C), LGUI(KC_V), LGUI(KC_B), LGUI(KC_N), LGUI(KC_M), LGUI(KC_COMM), LGUI(KC_DOT), LGUI(KC_SLSH), _______, _______, _______,
         _______, _______, _______, _______, _______, LGUI(KC_SPC), _______, _______, _______, _______, LGUI(KC_LEFT), LGUI(KC_DOWN), LGUI(KC_RGHT)),
 
-    [SYMB] = LAYOUT_JP(
+    [SYMB] = LAYOUT_jp(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, KC_LBRC, KC_RBRC, _______, _______, LSFT(KC_LBRC), LSFT(KC_RBRC), _______, _______, _______, _______,
         _______, LSFT(KC_1), LSFT(KC_2), LSFT(KC_3), LSFT(KC_4), LSFT(KC_5), LSFT(KC_6), LSFT(KC_7), LSFT(KC_8), LSFT(KC_9), LSFT(KC_0), _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
 
-    [FUNC] = LAYOUT_JP(
+    [FUNC] = LAYOUT_jp(
         KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
         KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT,
diff --git a/keyboards/hhkb/jp/keymaps/via/keymap.c b/keyboards/hhkb/jp/keymaps/via/keymap.c
index 64323309bb..8f23cfcd2d 100644
--- a/keyboards/hhkb/jp/keymaps/via/keymap.c
+++ b/keyboards/hhkb/jp/keymaps/via/keymap.c
@@ -29,21 +29,21 @@
  */
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_JP(
+    [0] = LAYOUT_jp(
         KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_JYEN, KC_BSPC,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
         KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_UP, KC_RSFT,
         MO(1), KC_ZKHK, KC_LGUI, KC_LALT, KC_MHEN, KC_SPC, KC_HENK, KC_KANA, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
 
-    [1] = LAYOUT_JP(
+    [1] = LAYOUT_jp(
         KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
         KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT,
         _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
-    [2] = LAYOUT_JP(
+    [2] = LAYOUT_jp(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/hnahkb/vn66/rules.mk b/keyboards/hnahkb/vn66/rules.mk
index f1c1ec985e..542b79b4d8 100644
--- a/keyboards/hnahkb/vn66/rules.mk
+++ b/keyboards/hnahkb/vn66/rules.mk
@@ -17,5 +17,6 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
+LTO_ENABLE = yes
 
 LAYOUTS = 66_ansi 66_iso
diff --git a/keyboards/horrortroll/handwired_k552/rules.mk b/keyboards/horrortroll/handwired_k552/rules.mk
index 5df510cd44..f29c92f64c 100644
--- a/keyboards/horrortroll/handwired_k552/rules.mk
+++ b/keyboards/horrortroll/handwired_k552/rules.mk
@@ -20,6 +20,7 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 NO_USB_STARTUP_CHECK = yes
+LTO_ENABLE = yes
 
 # RGB Matrix enabled
 RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/input_club/ergodox_infinity/mcuconf.h b/keyboards/input_club/ergodox_infinity/mcuconf.h
index f6730b99ca..e4dfa75186 100644
--- a/keyboards/input_club/ergodox_infinity/mcuconf.h
+++ b/keyboards/input_club/ergodox_infinity/mcuconf.h
@@ -62,7 +62,7 @@
 /* Need to redefine this, since the default is for K20x */
 /* This is for Teensy LC; you should comment it out (or change to 5)
  * for Teensy 3.x */
-#define KINETIS_USB_USB0_IRQ_PRIORITY       2
+#define KINETIS_USB_USB0_IRQ_PRIORITY       5
 
 /*
  * SPI driver system settings.
diff --git a/keyboards/kabedon/kabedon98e/chconf.h b/keyboards/kabedon/kabedon98e/chconf.h
deleted file mode 100644
index f07706dfda..0000000000
--- a/keyboards/kabedon/kabedon98e/chconf.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2020 QMK
- *
- * 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/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/keyboards/kabedon/kabedon98e/chconf.h -r platforms/chibios/common/configs/chconf.h`
- */
-
-#pragma once
-
-#define CH_CFG_ST_TIMEDELTA 0
-
-#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-
-#include_next <chconf.h>
diff --git a/keyboards/absinthe/absinthe.c b/keyboards/keyhive/absinthe/absinthe.c
index 502139ed0c..502139ed0c 100644
--- a/keyboards/absinthe/absinthe.c
+++ b/keyboards/keyhive/absinthe/absinthe.c
diff --git a/keyboards/absinthe/absinthe.h b/keyboards/keyhive/absinthe/absinthe.h
index 890aff643e..890aff643e 100644
--- a/keyboards/absinthe/absinthe.h
+++ b/keyboards/keyhive/absinthe/absinthe.h
diff --git a/keyboards/absinthe/config.h b/keyboards/keyhive/absinthe/config.h
index d6acd350cc..d6acd350cc 100644
--- a/keyboards/absinthe/config.h
+++ b/keyboards/keyhive/absinthe/config.h
diff --git a/keyboards/absinthe/info.json b/keyboards/keyhive/absinthe/info.json
index f92e9e10ee..f92e9e10ee 100644
--- a/keyboards/absinthe/info.json
+++ b/keyboards/keyhive/absinthe/info.json
diff --git a/keyboards/absinthe/keymaps/ansi/keymap.c b/keyboards/keyhive/absinthe/keymaps/ansi/keymap.c
index 2177f18146..2177f18146 100644
--- a/keyboards/absinthe/keymaps/ansi/keymap.c
+++ b/keyboards/keyhive/absinthe/keymaps/ansi/keymap.c
diff --git a/keyboards/absinthe/keymaps/ansi/readme.md b/keyboards/keyhive/absinthe/keymaps/ansi/readme.md
index e88d0cf9dd..e88d0cf9dd 100644
--- a/keyboards/absinthe/keymaps/ansi/readme.md
+++ b/keyboards/keyhive/absinthe/keymaps/ansi/readme.md
diff --git a/keyboards/absinthe/keymaps/default/keymap.c b/keyboards/keyhive/absinthe/keymaps/default/keymap.c
index e5c74366c0..e5c74366c0 100644
--- a/keyboards/absinthe/keymaps/default/keymap.c
+++ b/keyboards/keyhive/absinthe/keymaps/default/keymap.c
diff --git a/keyboards/absinthe/keymaps/default/readme.md b/keyboards/keyhive/absinthe/keymaps/default/readme.md
index f9ec78d7b4..f9ec78d7b4 100644
--- a/keyboards/absinthe/keymaps/default/readme.md
+++ b/keyboards/keyhive/absinthe/keymaps/default/readme.md
diff --git a/keyboards/absinthe/keymaps/via/keymap.c b/keyboards/keyhive/absinthe/keymaps/via/keymap.c
index 797d14226d..797d14226d 100644
--- a/keyboards/absinthe/keymaps/via/keymap.c
+++ b/keyboards/keyhive/absinthe/keymaps/via/keymap.c
diff --git a/keyboards/absinthe/keymaps/via/rules.mk b/keyboards/keyhive/absinthe/keymaps/via/rules.mk
index eb5b445ddf..eb5b445ddf 100644
--- a/keyboards/absinthe/keymaps/via/rules.mk
+++ b/keyboards/keyhive/absinthe/keymaps/via/rules.mk
diff --git a/keyboards/absinthe/readme.md b/keyboards/keyhive/absinthe/readme.md
index f99d3649f2..518e13e8f0 100644
--- a/keyboards/absinthe/readme.md
+++ b/keyboards/keyhive/absinthe/readme.md
@@ -10,6 +10,6 @@ A budget-friendly F-rowless TKL with a rotary encoder
 
 Make example for this keyboard (after setting up your build environment):
 
-    make absinthe:default
+    make keyhive/absinthe:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/absinthe/rules.mk b/keyboards/keyhive/absinthe/rules.mk
index 5b1bf3cdf3..5b1bf3cdf3 100644
--- a/keyboards/absinthe/rules.mk
+++ b/keyboards/keyhive/absinthe/rules.mk
diff --git a/keyboards/ergosaurus/config.h b/keyboards/keyhive/ergosaurus/config.h
index 41f9a09311..41f9a09311 100644
--- a/keyboards/ergosaurus/config.h
+++ b/keyboards/keyhive/ergosaurus/config.h
diff --git a/keyboards/ergosaurus/ergosaurus.c b/keyboards/keyhive/ergosaurus/ergosaurus.c
index 4c31455128..4c31455128 100644
--- a/keyboards/ergosaurus/ergosaurus.c
+++ b/keyboards/keyhive/ergosaurus/ergosaurus.c
diff --git a/keyboards/ergosaurus/ergosaurus.h b/keyboards/keyhive/ergosaurus/ergosaurus.h
index cef594993d..cef594993d 100644
--- a/keyboards/ergosaurus/ergosaurus.h
+++ b/keyboards/keyhive/ergosaurus/ergosaurus.h
diff --git a/keyboards/ergosaurus/info.json b/keyboards/keyhive/ergosaurus/info.json
index 8048896be2..8048896be2 100644
--- a/keyboards/ergosaurus/info.json
+++ b/keyboards/keyhive/ergosaurus/info.json
diff --git a/keyboards/ergosaurus/keymaps/default/keymap.c b/keyboards/keyhive/ergosaurus/keymaps/default/keymap.c
index 42cf9082e4..42cf9082e4 100644
--- a/keyboards/ergosaurus/keymaps/default/keymap.c
+++ b/keyboards/keyhive/ergosaurus/keymaps/default/keymap.c
diff --git a/keyboards/ergosaurus/keymaps/default/readme.md b/keyboards/keyhive/ergosaurus/keymaps/default/readme.md
index acd1216c79..acd1216c79 100644
--- a/keyboards/ergosaurus/keymaps/default/readme.md
+++ b/keyboards/keyhive/ergosaurus/keymaps/default/readme.md
diff --git a/keyboards/ergosaurus/keymaps/via/keymap.c b/keyboards/keyhive/ergosaurus/keymaps/via/keymap.c
index 5ae73bfd47..5ae73bfd47 100644
--- a/keyboards/ergosaurus/keymaps/via/keymap.c
+++ b/keyboards/keyhive/ergosaurus/keymaps/via/keymap.c
diff --git a/keyboards/ergosaurus/keymaps/via/rules.mk b/keyboards/keyhive/ergosaurus/keymaps/via/rules.mk
index 36b7ba9cbc..36b7ba9cbc 100644
--- a/keyboards/ergosaurus/keymaps/via/rules.mk
+++ b/keyboards/keyhive/ergosaurus/keymaps/via/rules.mk
diff --git a/keyboards/ergosaurus/readme.md b/keyboards/keyhive/ergosaurus/readme.md
index cb1a02318b..ed01f650f3 100644
--- a/keyboards/ergosaurus/readme.md
+++ b/keyboards/keyhive/ergosaurus/readme.md
@@ -10,6 +10,6 @@ An Arduino Pro Micro driven Alice-clone PCB. Supports all Alice-style cases, giv
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ergosaurus:default
+    make keyhive/ergosaurus:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/ergosaurus/rules.mk b/keyboards/keyhive/ergosaurus/rules.mk
index a00db322a6..a00db322a6 100644
--- a/keyboards/ergosaurus/rules.mk
+++ b/keyboards/keyhive/ergosaurus/rules.mk
diff --git a/keyboards/honeycomb/config.h b/keyboards/keyhive/honeycomb/config.h
index 6780c2d41b..6780c2d41b 100755
--- a/keyboards/honeycomb/config.h
+++ b/keyboards/keyhive/honeycomb/config.h
diff --git a/keyboards/honeycomb/honeycomb.c b/keyboards/keyhive/honeycomb/honeycomb.c
index 603400c7a3..603400c7a3 100755
--- a/keyboards/honeycomb/honeycomb.c
+++ b/keyboards/keyhive/honeycomb/honeycomb.c
diff --git a/keyboards/honeycomb/honeycomb.h b/keyboards/keyhive/honeycomb/honeycomb.h
index ec54b59f20..ec54b59f20 100755
--- a/keyboards/honeycomb/honeycomb.h
+++ b/keyboards/keyhive/honeycomb/honeycomb.h
diff --git a/keyboards/honeycomb/info.json b/keyboards/keyhive/honeycomb/info.json
index b11ece332b..b11ece332b 100644
--- a/keyboards/honeycomb/info.json
+++ b/keyboards/keyhive/honeycomb/info.json
diff --git a/keyboards/honeycomb/keymaps/default/keymap.c b/keyboards/keyhive/honeycomb/keymaps/default/keymap.c
index d0a5961873..d0a5961873 100755
--- a/keyboards/honeycomb/keymaps/default/keymap.c
+++ b/keyboards/keyhive/honeycomb/keymaps/default/keymap.c
diff --git a/keyboards/honeycomb/matrix.c b/keyboards/keyhive/honeycomb/matrix.c
index 9a87ca9a2e..9a87ca9a2e 100755
--- a/keyboards/honeycomb/matrix.c
+++ b/keyboards/keyhive/honeycomb/matrix.c
diff --git a/keyboards/honeycomb/readme.md b/keyboards/keyhive/honeycomb/readme.md
index 955f0ac7a2..611aa63880 100755
--- a/keyboards/honeycomb/readme.md
+++ b/keyboards/keyhive/honeycomb/readme.md
@@ -8,13 +8,13 @@ These configuration files use a completely different 'matrix scan' system than o
 Run the following command in your terminal:
 
 ```
-make honeycomb:default
+make keyhive/honeycomb:default
 # or use this to automatically flash the controller
-make honeycomb:default:avrdude
+make keyhive/honeycomb:default:avrdude
 ```
 
 Follow the QMK guide for this or ask in Discord.
 
 ### Other Keymaps
 
-Because this is a totally custom macropad, it is recommended that you copy the `default/` folder, rename it as desired, and modify the `keymap.c` to your liking.
\ No newline at end of file
+Because this is a totally custom macropad, it is recommended that you copy the `default/` folder, rename it as desired, and modify the `keymap.c` to your liking.
diff --git a/keyboards/honeycomb/rules.mk b/keyboards/keyhive/honeycomb/rules.mk
index 420e409e43..420e409e43 100755
--- a/keyboards/honeycomb/rules.mk
+++ b/keyboards/keyhive/honeycomb/rules.mk
diff --git a/keyboards/lattice60/config.h b/keyboards/keyhive/lattice60/config.h
index c1e067287b..c1e067287b 100644
--- a/keyboards/lattice60/config.h
+++ b/keyboards/keyhive/lattice60/config.h
diff --git a/keyboards/lattice60/info.json b/keyboards/keyhive/lattice60/info.json
index 824884ecbd..824884ecbd 100644
--- a/keyboards/lattice60/info.json
+++ b/keyboards/keyhive/lattice60/info.json
diff --git a/keyboards/lattice60/keymaps/default/config.h b/keyboards/keyhive/lattice60/keymaps/default/config.h
index 88d9334765..88d9334765 100644
--- a/keyboards/lattice60/keymaps/default/config.h
+++ b/keyboards/keyhive/lattice60/keymaps/default/config.h
diff --git a/keyboards/lattice60/keymaps/default/keymap.c b/keyboards/keyhive/lattice60/keymaps/default/keymap.c
index a5102070ea..a5102070ea 100644
--- a/keyboards/lattice60/keymaps/default/keymap.c
+++ b/keyboards/keyhive/lattice60/keymaps/default/keymap.c
diff --git a/keyboards/lattice60/keymaps/default/readme.md b/keyboards/keyhive/lattice60/keymaps/default/readme.md
index bde2ba9b41..bde2ba9b41 100644
--- a/keyboards/lattice60/keymaps/default/readme.md
+++ b/keyboards/keyhive/lattice60/keymaps/default/readme.md
diff --git a/keyboards/lattice60/keymaps/default_hhkb/config.h b/keyboards/keyhive/lattice60/keymaps/default_hhkb/config.h
index 88d9334765..88d9334765 100644
--- a/keyboards/lattice60/keymaps/default_hhkb/config.h
+++ b/keyboards/keyhive/lattice60/keymaps/default_hhkb/config.h
diff --git a/keyboards/lattice60/keymaps/default_hhkb/keymap.c b/keyboards/keyhive/lattice60/keymaps/default_hhkb/keymap.c
index ccdc10ab32..ccdc10ab32 100644
--- a/keyboards/lattice60/keymaps/default_hhkb/keymap.c
+++ b/keyboards/keyhive/lattice60/keymaps/default_hhkb/keymap.c
diff --git a/keyboards/lattice60/keymaps/default_hhkb/readme.md b/keyboards/keyhive/lattice60/keymaps/default_hhkb/readme.md
index 734ba74b9e..734ba74b9e 100644
--- a/keyboards/lattice60/keymaps/default_hhkb/readme.md
+++ b/keyboards/keyhive/lattice60/keymaps/default_hhkb/readme.md
diff --git a/keyboards/lattice60/keymaps/emdarcher/config.h b/keyboards/keyhive/lattice60/keymaps/emdarcher/config.h
index 88d9334765..88d9334765 100644
--- a/keyboards/lattice60/keymaps/emdarcher/config.h
+++ b/keyboards/keyhive/lattice60/keymaps/emdarcher/config.h
diff --git a/keyboards/lattice60/keymaps/emdarcher/keymap.c b/keyboards/keyhive/lattice60/keymaps/emdarcher/keymap.c
index 099e8e9203..099e8e9203 100644
--- a/keyboards/lattice60/keymaps/emdarcher/keymap.c
+++ b/keyboards/keyhive/lattice60/keymaps/emdarcher/keymap.c
diff --git a/keyboards/lattice60/keymaps/emdarcher/readme.md b/keyboards/keyhive/lattice60/keymaps/emdarcher/readme.md
index 812351af48..812351af48 100644
--- a/keyboards/lattice60/keymaps/emdarcher/readme.md
+++ b/keyboards/keyhive/lattice60/keymaps/emdarcher/readme.md
diff --git a/keyboards/lattice60/lattice60.c b/keyboards/keyhive/lattice60/lattice60.c
index 6cc0ea42fb..6cc0ea42fb 100644
--- a/keyboards/lattice60/lattice60.c
+++ b/keyboards/keyhive/lattice60/lattice60.c
diff --git a/keyboards/lattice60/lattice60.h b/keyboards/keyhive/lattice60/lattice60.h
index d9f5f37dea..d9f5f37dea 100644
--- a/keyboards/lattice60/lattice60.h
+++ b/keyboards/keyhive/lattice60/lattice60.h
diff --git a/keyboards/lattice60/readme.md b/keyboards/keyhive/lattice60/readme.md
index f5a3dc5942..92fe6198e0 100644
--- a/keyboards/lattice60/readme.md
+++ b/keyboards/keyhive/lattice60/readme.md
@@ -10,12 +10,12 @@ A HHKB layout keyboard using only through-hole components.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make lattice60:default
+    make keyhive/lattice60:default
 
 To activate the USBasploader bootloader, hold the BOOT button down during power on or reset. LED2 should light up to indicate that the bootloader is active.
 
 Flash the firmware using the `make` command with the `flash` parameter, example below:
 
-    make lattice60:default:flash
+    make keyhive/lattice60:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/lattice60/rules.mk b/keyboards/keyhive/lattice60/rules.mk
index 8539f9f439..8539f9f439 100644
--- a/keyboards/lattice60/rules.mk
+++ b/keyboards/keyhive/lattice60/rules.mk
diff --git a/keyboards/navi10/.noci b/keyboards/keyhive/navi10/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/navi10/.noci
+++ b/keyboards/keyhive/navi10/.noci
diff --git a/keyboards/navi10/info.json b/keyboards/keyhive/navi10/info.json
index e3fc49fbed..e3fc49fbed 100644
--- a/keyboards/navi10/info.json
+++ b/keyboards/keyhive/navi10/info.json
diff --git a/keyboards/navi10/keymaps/default/keymap.c b/keyboards/keyhive/navi10/keymaps/default/keymap.c
index d1b3127760..d1b3127760 100644
--- a/keyboards/navi10/keymaps/default/keymap.c
+++ b/keyboards/keyhive/navi10/keymaps/default/keymap.c
diff --git a/keyboards/navi10/keymaps/default/readme.md b/keyboards/keyhive/navi10/keymaps/default/readme.md
index 9e54a3f20a..9e54a3f20a 100644
--- a/keyboards/navi10/keymaps/default/readme.md
+++ b/keyboards/keyhive/navi10/keymaps/default/readme.md
diff --git a/keyboards/mt980/keymaps/walker/rules.mk b/keyboards/keyhive/navi10/keymaps/default/rules.mk
index e5ddcae8d9..e5ddcae8d9 100644
--- a/keyboards/mt980/keymaps/walker/rules.mk
+++ b/keyboards/keyhive/navi10/keymaps/default/rules.mk
diff --git a/keyboards/navi10/keymaps/devdev/config.h b/keyboards/keyhive/navi10/keymaps/devdev/config.h
index dba45a5f24..dba45a5f24 100644
--- a/keyboards/navi10/keymaps/devdev/config.h
+++ b/keyboards/keyhive/navi10/keymaps/devdev/config.h
diff --git a/keyboards/navi10/keymaps/devdev/keymap.c b/keyboards/keyhive/navi10/keymaps/devdev/keymap.c
index b0d43ebc69..b0d43ebc69 100644
--- a/keyboards/navi10/keymaps/devdev/keymap.c
+++ b/keyboards/keyhive/navi10/keymaps/devdev/keymap.c
diff --git a/keyboards/navi10/keymaps/devdev/rules.mk b/keyboards/keyhive/navi10/keymaps/devdev/rules.mk
index 1c1ed316a0..1c1ed316a0 100644
--- a/keyboards/navi10/keymaps/devdev/rules.mk
+++ b/keyboards/keyhive/navi10/keymaps/devdev/rules.mk
diff --git a/keyboards/navi10/keymaps/emdarcher/keymap.c b/keyboards/keyhive/navi10/keymaps/emdarcher/keymap.c
index 40efed48d5..40efed48d5 100644
--- a/keyboards/navi10/keymaps/emdarcher/keymap.c
+++ b/keyboards/keyhive/navi10/keymaps/emdarcher/keymap.c
diff --git a/keyboards/navi10/keymaps/emdarcher/readme.md b/keyboards/keyhive/navi10/keymaps/emdarcher/readme.md
index b4ae6d75ff..b4ae6d75ff 100644
--- a/keyboards/navi10/keymaps/emdarcher/readme.md
+++ b/keyboards/keyhive/navi10/keymaps/emdarcher/readme.md
diff --git a/keyboards/navi10/keymaps/default/rules.mk b/keyboards/keyhive/navi10/keymaps/emdarcher/rules.mk
index e5ddcae8d9..e5ddcae8d9 100644
--- a/keyboards/navi10/keymaps/default/rules.mk
+++ b/keyboards/keyhive/navi10/keymaps/emdarcher/rules.mk
diff --git a/keyboards/navi10/readme.md b/keyboards/keyhive/navi10/readme.md
index 58a94711f2..06f54b73dd 100644
--- a/keyboards/navi10/readme.md
+++ b/keyboards/keyhive/navi10/readme.md
@@ -10,10 +10,10 @@ A simple and fun navigation cluster macropad with exposed components.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make navi10:default
+    make keyhive/navi10:default
 
 Make example for a specific revision (ex. rev2):
 
-    make navi10/rev2:default
+    make keyhive/navi10/rev2:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/navi10/rev0/.noci b/keyboards/keyhive/navi10/rev0/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/navi10/rev0/.noci
+++ b/keyboards/keyhive/navi10/rev0/.noci
diff --git a/keyboards/navi10/rev0/config.h b/keyboards/keyhive/navi10/rev0/config.h
index 22a985c280..22a985c280 100644
--- a/keyboards/navi10/rev0/config.h
+++ b/keyboards/keyhive/navi10/rev0/config.h
diff --git a/keyboards/navi10/rev0/rev0.c b/keyboards/keyhive/navi10/rev0/rev0.c
index f6c1f362ca..f6c1f362ca 100644
--- a/keyboards/navi10/rev0/rev0.c
+++ b/keyboards/keyhive/navi10/rev0/rev0.c
diff --git a/keyboards/navi10/rev0/rev0.h b/keyboards/keyhive/navi10/rev0/rev0.h
index b162d14425..b162d14425 100644
--- a/keyboards/navi10/rev0/rev0.h
+++ b/keyboards/keyhive/navi10/rev0/rev0.h
diff --git a/keyboards/navi10/rev0/rules.mk b/keyboards/keyhive/navi10/rev0/rules.mk
index 52a1cbb711..52a1cbb711 100644
--- a/keyboards/navi10/rev0/rules.mk
+++ b/keyboards/keyhive/navi10/rev0/rules.mk
diff --git a/keyboards/navi10/rev2/.noci b/keyboards/keyhive/navi10/rev2/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/navi10/rev2/.noci
+++ b/keyboards/keyhive/navi10/rev2/.noci
diff --git a/keyboards/navi10/rev2/config.h b/keyboards/keyhive/navi10/rev2/config.h
index 1dfb210b03..1dfb210b03 100644
--- a/keyboards/navi10/rev2/config.h
+++ b/keyboards/keyhive/navi10/rev2/config.h
diff --git a/keyboards/navi10/rev2/rev2.c b/keyboards/keyhive/navi10/rev2/rev2.c
index fed0e03897..fed0e03897 100644
--- a/keyboards/navi10/rev2/rev2.c
+++ b/keyboards/keyhive/navi10/rev2/rev2.c
diff --git a/keyboards/navi10/rev2/rev2.h b/keyboards/keyhive/navi10/rev2/rev2.h
index b162d14425..b162d14425 100644
--- a/keyboards/navi10/rev2/rev2.h
+++ b/keyboards/keyhive/navi10/rev2/rev2.h
diff --git a/keyboards/navi10/rev2/rules.mk b/keyboards/keyhive/navi10/rev2/rules.mk
index 52a1cbb711..52a1cbb711 100644
--- a/keyboards/navi10/rev2/rules.mk
+++ b/keyboards/keyhive/navi10/rev2/rules.mk
diff --git a/keyboards/navi10/rev3/config.h b/keyboards/keyhive/navi10/rev3/config.h
index 205535273a..205535273a 100644
--- a/keyboards/navi10/rev3/config.h
+++ b/keyboards/keyhive/navi10/rev3/config.h
diff --git a/keyboards/navi10/rev3/rev3.c b/keyboards/keyhive/navi10/rev3/rev3.c
index 2b0355aa36..2b0355aa36 100644
--- a/keyboards/navi10/rev3/rev3.c
+++ b/keyboards/keyhive/navi10/rev3/rev3.c
diff --git a/keyboards/navi10/rev3/rev3.h b/keyboards/keyhive/navi10/rev3/rev3.h
index b162d14425..b162d14425 100644
--- a/keyboards/navi10/rev3/rev3.h
+++ b/keyboards/keyhive/navi10/rev3/rev3.h
diff --git a/keyboards/navi10/rev3/rules.mk b/keyboards/keyhive/navi10/rev3/rules.mk
index 52a1cbb711..52a1cbb711 100644
--- a/keyboards/navi10/rev3/rules.mk
+++ b/keyboards/keyhive/navi10/rev3/rules.mk
diff --git a/keyboards/keyhive/navi10/rules.mk b/keyboards/keyhive/navi10/rules.mk
new file mode 100644
index 0000000000..6ebb2d0ceb
--- /dev/null
+++ b/keyboards/keyhive/navi10/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = keyhive/navi10/rev3
diff --git a/keyboards/opus/config.h b/keyboards/keyhive/opus/config.h
index 52ed10bc5a..52ed10bc5a 100644
--- a/keyboards/opus/config.h
+++ b/keyboards/keyhive/opus/config.h
diff --git a/keyboards/opus/info.json b/keyboards/keyhive/opus/info.json
index 1b2da11367..1b2da11367 100644
--- a/keyboards/opus/info.json
+++ b/keyboards/keyhive/opus/info.json
diff --git a/keyboards/opus/keymaps/default/keymap.c b/keyboards/keyhive/opus/keymaps/default/keymap.c
index aaa1a899a2..aaa1a899a2 100644
--- a/keyboards/opus/keymaps/default/keymap.c
+++ b/keyboards/keyhive/opus/keymaps/default/keymap.c
diff --git a/keyboards/opus/keymaps/default/readme.md b/keyboards/keyhive/opus/keymaps/default/readme.md
index ba3f26edac..ba3f26edac 100644
--- a/keyboards/opus/keymaps/default/readme.md
+++ b/keyboards/keyhive/opus/keymaps/default/readme.md
diff --git a/keyboards/opus/keymaps/thefoxcodes/config.h b/keyboards/keyhive/opus/keymaps/thefoxcodes/config.h
index 824ec5bd18..824ec5bd18 100644
--- a/keyboards/opus/keymaps/thefoxcodes/config.h
+++ b/keyboards/keyhive/opus/keymaps/thefoxcodes/config.h
diff --git a/keyboards/opus/keymaps/thefoxcodes/keymap.c b/keyboards/keyhive/opus/keymaps/thefoxcodes/keymap.c
index e0adb2af32..e0adb2af32 100644
--- a/keyboards/opus/keymaps/thefoxcodes/keymap.c
+++ b/keyboards/keyhive/opus/keymaps/thefoxcodes/keymap.c
diff --git a/keyboards/opus/keymaps/thefoxcodes/readme.md b/keyboards/keyhive/opus/keymaps/thefoxcodes/readme.md
index c1d2a0b9ec..c1d2a0b9ec 100644
--- a/keyboards/opus/keymaps/thefoxcodes/readme.md
+++ b/keyboards/keyhive/opus/keymaps/thefoxcodes/readme.md
diff --git a/keyboards/opus/keymaps/thefoxcodes/rules.mk b/keyboards/keyhive/opus/keymaps/thefoxcodes/rules.mk
index 1ba2fa8fbe..1ba2fa8fbe 100644
--- a/keyboards/opus/keymaps/thefoxcodes/rules.mk
+++ b/keyboards/keyhive/opus/keymaps/thefoxcodes/rules.mk
diff --git a/keyboards/opus/opus.c b/keyboards/keyhive/opus/opus.c
index 5a188cf8a0..5a188cf8a0 100644
--- a/keyboards/opus/opus.c
+++ b/keyboards/keyhive/opus/opus.c
diff --git a/keyboards/opus/opus.h b/keyboards/keyhive/opus/opus.h
index ec82c5bc9a..ec82c5bc9a 100644
--- a/keyboards/opus/opus.h
+++ b/keyboards/keyhive/opus/opus.h
diff --git a/keyboards/opus/readme.md b/keyboards/keyhive/opus/readme.md
index aebe3162d4..8a1adf4d18 100644
--- a/keyboards/opus/readme.md
+++ b/keyboards/keyhive/opus/readme.md
@@ -10,6 +10,6 @@ The columns are angled to follow the natural angle of the hand.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make opus:default
+    make keyhive/opus:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/opus/rules.mk b/keyboards/keyhive/opus/rules.mk
index 515ca5621f..515ca5621f 100644
--- a/keyboards/opus/rules.mk
+++ b/keyboards/keyhive/opus/rules.mk
diff --git a/keyboards/smallice/config.h b/keyboards/keyhive/smallice/config.h
index 5ebafba42d..5ebafba42d 100644
--- a/keyboards/smallice/config.h
+++ b/keyboards/keyhive/smallice/config.h
diff --git a/keyboards/smallice/info.json b/keyboards/keyhive/smallice/info.json
index 24ce4cce22..24ce4cce22 100644
--- a/keyboards/smallice/info.json
+++ b/keyboards/keyhive/smallice/info.json
diff --git a/keyboards/smallice/keymaps/default/keymap.c b/keyboards/keyhive/smallice/keymaps/default/keymap.c
index d4a5fad42b..d4a5fad42b 100644
--- a/keyboards/smallice/keymaps/default/keymap.c
+++ b/keyboards/keyhive/smallice/keymaps/default/keymap.c
diff --git a/keyboards/smallice/keymaps/default/readme.md b/keyboards/keyhive/smallice/keymaps/default/readme.md
index e0c573662c..e0c573662c 100644
--- a/keyboards/smallice/keymaps/default/readme.md
+++ b/keyboards/keyhive/smallice/keymaps/default/readme.md
diff --git a/keyboards/smallice/keymaps/via/keymap.c b/keyboards/keyhive/smallice/keymaps/via/keymap.c
index d9f5d58d65..d9f5d58d65 100644
--- a/keyboards/smallice/keymaps/via/keymap.c
+++ b/keyboards/keyhive/smallice/keymaps/via/keymap.c
diff --git a/keyboards/smallice/keymaps/via/readme.md b/keyboards/keyhive/smallice/keymaps/via/readme.md
index af98163f94..af98163f94 100644
--- a/keyboards/smallice/keymaps/via/readme.md
+++ b/keyboards/keyhive/smallice/keymaps/via/readme.md
diff --git a/keyboards/smallice/keymaps/via/rules.mk b/keyboards/keyhive/smallice/keymaps/via/rules.mk
index 43061db1dd..43061db1dd 100644
--- a/keyboards/smallice/keymaps/via/rules.mk
+++ b/keyboards/keyhive/smallice/keymaps/via/rules.mk
diff --git a/keyboards/smallice/readme.md b/keyboards/keyhive/smallice/readme.md
index 70ac44cf74..2276b38a9e 100644
--- a/keyboards/smallice/readme.md
+++ b/keyboards/keyhive/smallice/readme.md
@@ -10,7 +10,7 @@ A 40% alice-like keyboard with an arrow cluster.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make smallice:default
+    make keyhive/smallice:default
 
 ### Flash
 
diff --git a/keyboards/smallice/rules.mk b/keyboards/keyhive/smallice/rules.mk
index 1f52c37154..1f52c37154 100644
--- a/keyboards/smallice/rules.mk
+++ b/keyboards/keyhive/smallice/rules.mk
diff --git a/keyboards/smallice/smallice.c b/keyboards/keyhive/smallice/smallice.c
index c7d65e27ab..c7d65e27ab 100644
--- a/keyboards/smallice/smallice.c
+++ b/keyboards/keyhive/smallice/smallice.c
diff --git a/keyboards/smallice/smallice.h b/keyboards/keyhive/smallice/smallice.h
index 12d4356795..12d4356795 100644
--- a/keyboards/smallice/smallice.h
+++ b/keyboards/keyhive/smallice/smallice.h
diff --git a/keyboards/southpole/config.h b/keyboards/keyhive/southpole/config.h
index 5603829c47..5603829c47 100644
--- a/keyboards/southpole/config.h
+++ b/keyboards/keyhive/southpole/config.h
diff --git a/keyboards/southpole/info.json b/keyboards/keyhive/southpole/info.json
index 9781fd35ab..9781fd35ab 100644
--- a/keyboards/southpole/info.json
+++ b/keyboards/keyhive/southpole/info.json
diff --git a/keyboards/southpole/keymaps/default/keymap.c b/keyboards/keyhive/southpole/keymaps/default/keymap.c
index 2777f00b5b..2777f00b5b 100644
--- a/keyboards/southpole/keymaps/default/keymap.c
+++ b/keyboards/keyhive/southpole/keymaps/default/keymap.c
diff --git a/keyboards/southpole/keymaps/foobeard/keymap.c b/keyboards/keyhive/southpole/keymaps/foobeard/keymap.c
index ef2710d0a3..ef2710d0a3 100644
--- a/keyboards/southpole/keymaps/foobeard/keymap.c
+++ b/keyboards/keyhive/southpole/keymaps/foobeard/keymap.c
diff --git a/keyboards/southpole/readme.md b/keyboards/keyhive/southpole/readme.md
index 4ea99ad349..3f0cbc3a92 100644
--- a/keyboards/southpole/readme.md
+++ b/keyboards/keyhive/southpole/readme.md
@@ -8,6 +8,6 @@ Hardware Supported: Teensy 2.0
 
 Make example for this keyboard (after setting up your build environment):
 
-    make southpole:default
+    make keyhive/southpole:default
     
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
\ No newline at end of file
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/southpole/rules.mk b/keyboards/keyhive/southpole/rules.mk
index 278ee36f23..278ee36f23 100644
--- a/keyboards/southpole/rules.mk
+++ b/keyboards/keyhive/southpole/rules.mk
diff --git a/keyboards/southpole/southpole.c b/keyboards/keyhive/southpole/southpole.c
index f345893fb5..f345893fb5 100644
--- a/keyboards/southpole/southpole.c
+++ b/keyboards/keyhive/southpole/southpole.c
diff --git a/keyboards/southpole/southpole.h b/keyboards/keyhive/southpole/southpole.h
index 99cf2ce7b5..99cf2ce7b5 100644
--- a/keyboards/southpole/southpole.h
+++ b/keyboards/keyhive/southpole/southpole.h
diff --git a/keyboards/uno/config.h b/keyboards/keyhive/uno/config.h
index 0128ee2d5d..0128ee2d5d 100644
--- a/keyboards/uno/config.h
+++ b/keyboards/keyhive/uno/config.h
diff --git a/keyboards/uno/info.json b/keyboards/keyhive/uno/info.json
index d426f9e426..d426f9e426 100644
--- a/keyboards/uno/info.json
+++ b/keyboards/keyhive/uno/info.json
diff --git a/keyboards/uno/keymaps/copypasta/keymap.c b/keyboards/keyhive/uno/keymaps/copypasta/keymap.c
index 74e5f62fc5..74e5f62fc5 100644
--- a/keyboards/uno/keymaps/copypasta/keymap.c
+++ b/keyboards/keyhive/uno/keymaps/copypasta/keymap.c
diff --git a/keyboards/uno/keymaps/copypasta/readme.md b/keyboards/keyhive/uno/keymaps/copypasta/readme.md
index 1ad009c16c..1ad009c16c 100644
--- a/keyboards/uno/keymaps/copypasta/readme.md
+++ b/keyboards/keyhive/uno/keymaps/copypasta/readme.md
diff --git a/keyboards/uno/keymaps/default/keymap.c b/keyboards/keyhive/uno/keymaps/default/keymap.c
index 43c885c800..43c885c800 100644
--- a/keyboards/uno/keymaps/default/keymap.c
+++ b/keyboards/keyhive/uno/keymaps/default/keymap.c
diff --git a/keyboards/uno/keymaps/default/readme.md b/keyboards/keyhive/uno/keymaps/default/readme.md
index d783a80acc..d783a80acc 100644
--- a/keyboards/uno/keymaps/default/readme.md
+++ b/keyboards/keyhive/uno/keymaps/default/readme.md
diff --git a/keyboards/uno/keymaps/demo/keymap.c b/keyboards/keyhive/uno/keymaps/demo/keymap.c
index cd3c3dadef..cd3c3dadef 100644
--- a/keyboards/uno/keymaps/demo/keymap.c
+++ b/keyboards/keyhive/uno/keymaps/demo/keymap.c
diff --git a/keyboards/uno/keymaps/demo/readme.md b/keyboards/keyhive/uno/keymaps/demo/readme.md
index ec91247861..ec91247861 100644
--- a/keyboards/uno/keymaps/demo/readme.md
+++ b/keyboards/keyhive/uno/keymaps/demo/readme.md
diff --git a/keyboards/uno/readme.md b/keyboards/keyhive/uno/readme.md
index b60ef23e97..23776115f3 100644
--- a/keyboards/uno/readme.md
+++ b/keyboards/keyhive/uno/readme.md
@@ -14,19 +14,19 @@ If it *does not* support a rotary encoder, use rev1. The following examples use
 Make example for this keyboard (after setting up your build environment; make
 sure to change `rev2` to your Uno's version):
 
-    make uno/rev2:default
+    make keyhive/uno/rev2:default
 
 Flashing example for this keyboard (change `rev2` to `rev1` if needed):
 
-    make uno/rev2:default:flash
+    make keyhive/uno/rev2:default:flash
 
 If you prefer to use the `qmk` tool:
 
-    qmk compile -kb uno/rev2 -km default
+    qmk compile -kb keyhive/uno/rev2 -km default
 
 Create your own keymap with:
 
-    qmk new-keymap -kb uno/rev2
+    qmk new-keymap -kb keyhive/uno/rev2
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
diff --git a/keyboards/uno/rev1/config.h b/keyboards/keyhive/uno/rev1/config.h
index 11c84ad2ab..11c84ad2ab 100644
--- a/keyboards/uno/rev1/config.h
+++ b/keyboards/keyhive/uno/rev1/config.h
diff --git a/keyboards/uno/rev1/rev1.h b/keyboards/keyhive/uno/rev1/rev1.h
index 691bdd1dc3..691bdd1dc3 100644
--- a/keyboards/uno/rev1/rev1.h
+++ b/keyboards/keyhive/uno/rev1/rev1.h
diff --git a/keyboards/uno/rev1/rules.mk b/keyboards/keyhive/uno/rev1/rules.mk
index 7180be7497..7180be7497 100644
--- a/keyboards/uno/rev1/rules.mk
+++ b/keyboards/keyhive/uno/rev1/rules.mk
diff --git a/keyboards/uno/rev2/config.h b/keyboards/keyhive/uno/rev2/config.h
index 37ea08c017..37ea08c017 100644
--- a/keyboards/uno/rev2/config.h
+++ b/keyboards/keyhive/uno/rev2/config.h
diff --git a/keyboards/uno/rev2/rev2.h b/keyboards/keyhive/uno/rev2/rev2.h
index 691bdd1dc3..691bdd1dc3 100644
--- a/keyboards/uno/rev2/rev2.h
+++ b/keyboards/keyhive/uno/rev2/rev2.h
diff --git a/keyboards/uno/rev2/rules.mk b/keyboards/keyhive/uno/rev2/rules.mk
index 1ce2738442..1ce2738442 100644
--- a/keyboards/uno/rev2/rules.mk
+++ b/keyboards/keyhive/uno/rev2/rules.mk
diff --git a/keyboards/keyhive/uno/rules.mk b/keyboards/keyhive/uno/rules.mk
new file mode 100644
index 0000000000..3220994593
--- /dev/null
+++ b/keyboards/keyhive/uno/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = keyhive/uno/rev1
diff --git a/keyboards/uno/uno.c b/keyboards/keyhive/uno/uno.c
index 5ffb28865b..5ffb28865b 100644
--- a/keyboards/uno/uno.c
+++ b/keyboards/keyhive/uno/uno.c
diff --git a/keyboards/uno/uno.h b/keyboards/keyhive/uno/uno.h
index bb3248e293..e25dc25f73 100644
--- a/keyboards/uno/uno.h
+++ b/keyboards/keyhive/uno/uno.h
@@ -18,8 +18,8 @@
 
 #include "quantum.h"
 
-#if defined(KEYBOARD_uno_rev1)
+#if defined(KEYBOARD_keyhive_uno_rev1)
 #    include "rev1.h"
-#elif defined(KEYBOARD_uno_rev2)
+#elif defined(KEYBOARD_keyhive_uno_rev2)
 #    include "rev2.h"
 #endif
diff --git a/keyboards/ut472/config.h b/keyboards/keyhive/ut472/config.h
index dc8f7f7555..dc8f7f7555 100644
--- a/keyboards/ut472/config.h
+++ b/keyboards/keyhive/ut472/config.h
diff --git a/keyboards/ut472/info.json b/keyboards/keyhive/ut472/info.json
index fe60c5b7f7..fe60c5b7f7 100644
--- a/keyboards/ut472/info.json
+++ b/keyboards/keyhive/ut472/info.json
diff --git a/keyboards/ut472/keymaps/annihilator6000/UT472_Annihilator6000_Configurator_file.json b/keyboards/keyhive/ut472/keymaps/annihilator6000/UT472_Annihilator6000_Configurator_file.json
index 45569d5588..45569d5588 100755
--- a/keyboards/ut472/keymaps/annihilator6000/UT472_Annihilator6000_Configurator_file.json
+++ b/keyboards/keyhive/ut472/keymaps/annihilator6000/UT472_Annihilator6000_Configurator_file.json
diff --git a/keyboards/ut472/keymaps/annihilator6000/config.h b/keyboards/keyhive/ut472/keymaps/annihilator6000/config.h
index 023c753c27..023c753c27 100644
--- a/keyboards/ut472/keymaps/annihilator6000/config.h
+++ b/keyboards/keyhive/ut472/keymaps/annihilator6000/config.h
diff --git a/keyboards/ut472/keymaps/annihilator6000/keymap.c b/keyboards/keyhive/ut472/keymaps/annihilator6000/keymap.c
index c4453279d2..c4453279d2 100644
--- a/keyboards/ut472/keymaps/annihilator6000/keymap.c
+++ b/keyboards/keyhive/ut472/keymaps/annihilator6000/keymap.c
diff --git a/keyboards/ut472/keymaps/annihilator6000/readme.md b/keyboards/keyhive/ut472/keymaps/annihilator6000/readme.md
index 59469b7b55..59469b7b55 100644
--- a/keyboards/ut472/keymaps/annihilator6000/readme.md
+++ b/keyboards/keyhive/ut472/keymaps/annihilator6000/readme.md
diff --git a/keyboards/ut472/keymaps/default/keymap.c b/keyboards/keyhive/ut472/keymaps/default/keymap.c
index e303f2220c..e303f2220c 100644
--- a/keyboards/ut472/keymaps/default/keymap.c
+++ b/keyboards/keyhive/ut472/keymaps/default/keymap.c
diff --git a/keyboards/ut472/keymaps/default/readme.md b/keyboards/keyhive/ut472/keymaps/default/readme.md
index e3dcee467e..e3dcee467e 100644
--- a/keyboards/ut472/keymaps/default/readme.md
+++ b/keyboards/keyhive/ut472/keymaps/default/readme.md
diff --git a/keyboards/ut472/keymaps/hvp/config.h b/keyboards/keyhive/ut472/keymaps/hvp/config.h
index ea23adfab5..ea23adfab5 100644
--- a/keyboards/ut472/keymaps/hvp/config.h
+++ b/keyboards/keyhive/ut472/keymaps/hvp/config.h
diff --git a/keyboards/ut472/keymaps/hvp/keymap.c b/keyboards/keyhive/ut472/keymaps/hvp/keymap.c
index 80d2d036bd..80d2d036bd 100644
--- a/keyboards/ut472/keymaps/hvp/keymap.c
+++ b/keyboards/keyhive/ut472/keymaps/hvp/keymap.c
diff --git a/keyboards/ut472/keymaps/hvp/readme.md b/keyboards/keyhive/ut472/keymaps/hvp/readme.md
index a249201ded..a249201ded 100644
--- a/keyboards/ut472/keymaps/hvp/readme.md
+++ b/keyboards/keyhive/ut472/keymaps/hvp/readme.md
diff --git a/keyboards/ut472/keymaps/hvp/rules.mk b/keyboards/keyhive/ut472/keymaps/hvp/rules.mk
index 1ba2fa8fbe..1ba2fa8fbe 100644
--- a/keyboards/ut472/keymaps/hvp/rules.mk
+++ b/keyboards/keyhive/ut472/keymaps/hvp/rules.mk
diff --git a/keyboards/ut472/keymaps/stefanopace/config.h b/keyboards/keyhive/ut472/keymaps/stefanopace/config.h
index d16927d3c9..d16927d3c9 100644
--- a/keyboards/ut472/keymaps/stefanopace/config.h
+++ b/keyboards/keyhive/ut472/keymaps/stefanopace/config.h
diff --git a/keyboards/ut472/keymaps/stefanopace/keymap.c b/keyboards/keyhive/ut472/keymaps/stefanopace/keymap.c
index 7cc3b70082..7cc3b70082 100644
--- a/keyboards/ut472/keymaps/stefanopace/keymap.c
+++ b/keyboards/keyhive/ut472/keymaps/stefanopace/keymap.c
diff --git a/keyboards/ut472/keymaps/stefanopace/readme.md b/keyboards/keyhive/ut472/keymaps/stefanopace/readme.md
index 63cef0934c..63cef0934c 100644
--- a/keyboards/ut472/keymaps/stefanopace/readme.md
+++ b/keyboards/keyhive/ut472/keymaps/stefanopace/readme.md
diff --git a/keyboards/ut472/keymaps/stefanopace/rules.mk b/keyboards/keyhive/ut472/keymaps/stefanopace/rules.mk
index d941780558..d941780558 100644
--- a/keyboards/ut472/keymaps/stefanopace/rules.mk
+++ b/keyboards/keyhive/ut472/keymaps/stefanopace/rules.mk
diff --git a/keyboards/ut472/keymaps/tucznak/config.h b/keyboards/keyhive/ut472/keymaps/tucznak/config.h
index b3d402337a..b3d402337a 100644
--- a/keyboards/ut472/keymaps/tucznak/config.h
+++ b/keyboards/keyhive/ut472/keymaps/tucznak/config.h
diff --git a/keyboards/ut472/keymaps/tucznak/keymap.c b/keyboards/keyhive/ut472/keymaps/tucznak/keymap.c
index 7fbbd0e76e..7fbbd0e76e 100644
--- a/keyboards/ut472/keymaps/tucznak/keymap.c
+++ b/keyboards/keyhive/ut472/keymaps/tucznak/keymap.c
diff --git a/keyboards/ut472/keymaps/tucznak/readme.md b/keyboards/keyhive/ut472/keymaps/tucznak/readme.md
index 95180bc392..95180bc392 100644
--- a/keyboards/ut472/keymaps/tucznak/readme.md
+++ b/keyboards/keyhive/ut472/keymaps/tucznak/readme.md
diff --git a/keyboards/ut472/keymaps/tucznak/rules.mk b/keyboards/keyhive/ut472/keymaps/tucznak/rules.mk
index d394c719f8..d394c719f8 100644
--- a/keyboards/ut472/keymaps/tucznak/rules.mk
+++ b/keyboards/keyhive/ut472/keymaps/tucznak/rules.mk
diff --git a/keyboards/ut472/keymaps/via/keymap.c b/keyboards/keyhive/ut472/keymaps/via/keymap.c
index fe3eff802e..fe3eff802e 100644
--- a/keyboards/ut472/keymaps/via/keymap.c
+++ b/keyboards/keyhive/ut472/keymaps/via/keymap.c
diff --git a/keyboards/melody96/keymaps/via/rules.mk b/keyboards/keyhive/ut472/keymaps/via/rules.mk
index 36b7ba9cbc..36b7ba9cbc 100644
--- a/keyboards/melody96/keymaps/via/rules.mk
+++ b/keyboards/keyhive/ut472/keymaps/via/rules.mk
diff --git a/keyboards/ut472/readme.md b/keyboards/keyhive/ut472/readme.md
index 25f40d783a..b2a13b38cc 100644
--- a/keyboards/ut472/readme.md
+++ b/keyboards/keyhive/ut472/readme.md
@@ -11,7 +11,7 @@ or purchased at keyhive.xyz
 
 To create a hex file for the UT47.2, run:
 
-    make ut472:default
+    make keyhive/ut472:default
 
 ## Layout
 
diff --git a/keyboards/ut472/rules.mk b/keyboards/keyhive/ut472/rules.mk
index 9c7d75a344..9c7d75a344 100644
--- a/keyboards/ut472/rules.mk
+++ b/keyboards/keyhive/ut472/rules.mk
diff --git a/keyboards/ut472/ut472.c b/keyboards/keyhive/ut472/ut472.c
index 637922171a..637922171a 100644
--- a/keyboards/ut472/ut472.c
+++ b/keyboards/keyhive/ut472/ut472.c
diff --git a/keyboards/ut472/ut472.h b/keyboards/keyhive/ut472/ut472.h
index 391392896a..391392896a 100644
--- a/keyboards/ut472/ut472.h
+++ b/keyboards/keyhive/ut472/ut472.h
diff --git a/keyboards/lime/keymaps/default/keymap.c b/keyboards/lime/keymaps/default/keymap.c
index 2d904d36db..eade4d4183 100644
--- a/keyboards/lime/keymaps/default/keymap.c
+++ b/keyboards/lime/keymaps/default/keymap.c
@@ -17,7 +17,6 @@
 #include QMK_KEYBOARD_H
 
 #ifdef JOYSTICK_ENABLE
-#   include "joystick.h"
 #   include "analog.h"
 #endif
 
diff --git a/keyboards/matrix/abelx/mcuconf.h b/keyboards/matrix/abelx/mcuconf.h
index a22ce51c4c..a2fd42b8c4 100644
--- a/keyboards/matrix/abelx/mcuconf.h
+++ b/keyboards/matrix/abelx/mcuconf.h
@@ -1,5 +1,5 @@
 /*
-    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+    ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -169,7 +169,6 @@
 /*
  * PWM driver system settings.
  */
-#define STM32_PWM_USE_ADVANCED              FALSE
 #define STM32_PWM_USE_TIM1                  FALSE
 #define STM32_PWM_USE_TIM2                  FALSE
 #define STM32_PWM_USE_TIM3                  FALSE
diff --git a/keyboards/mechlovin/hex4b/rev2/chconf.h b/keyboards/mechlovin/hex4b/rev2/chconf.h
deleted file mode 100644
index fe716d6552..0000000000
--- a/keyboards/mechlovin/hex4b/rev2/chconf.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2020 QMK
- *
- * 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 CH_CFG_ST_TIMEDELTA 0
-
-#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-
-#include_next <chconf.h>
-
diff --git a/keyboards/mechwild/obe/obe.c b/keyboards/mechwild/obe/obe.c
index 8612764ae5..195d4a7679 100644
--- a/keyboards/mechwild/obe/obe.c
+++ b/keyboards/mechwild/obe/obe.c
@@ -16,12 +16,6 @@
 
 #include "obe.h"
 
-void board_init(void) {
-    // B9 is configured as I2C1_SDA in the board file; that function must be
-    // disabled before using B7 as I2C1_SDA.
-    setPinInputHigh(B9);
-}
-
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
diff --git a/keyboards/mechwild/waka60/waka60.c b/keyboards/mechwild/waka60/waka60.c
index 1b6eec1f44..180d0a6786 100644
--- a/keyboards/mechwild/waka60/waka60.c
+++ b/keyboards/mechwild/waka60/waka60.c
@@ -15,11 +15,7 @@
  */
 
 #include "waka60.h"
-void board_init(void) {
-    // B9 is configured as I2C1_SDA in the board file; that function must be
-    // disabled before using B7 as I2C1_SDA.
-    setPinInputHigh(B9);
-}
+
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
diff --git a/keyboards/mlego/m65/rev1/chconf.h b/keyboards/mlego/m65/rev1/chconf.h
deleted file mode 100644
index 3ca88e0d2a..0000000000
--- a/keyboards/mlego/m65/rev1/chconf.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021-2022 QMK
- *
- * 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/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/m65/rev1/chconf.h -r platforms/chibios/common/configs/chconf.h`
- */
-
-#pragma once
-
-#define CH_CFG_ST_TIMEDELTA 0
-
-#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-
-#include_next <chconf.h>
diff --git a/keyboards/mlego/m65/rev2/chconf.h b/keyboards/mlego/m65/rev2/chconf.h
deleted file mode 100644
index 3ca88e0d2a..0000000000
--- a/keyboards/mlego/m65/rev2/chconf.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021-2022 QMK
- *
- * 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/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/m65/rev1/chconf.h -r platforms/chibios/common/configs/chconf.h`
- */
-
-#pragma once
-
-#define CH_CFG_ST_TIMEDELTA 0
-
-#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-
-#include_next <chconf.h>
diff --git a/keyboards/mode/m65ha_alpha/m65ha_alpha.c b/keyboards/mode/m65ha_alpha/m65ha_alpha.c
index 93e0c06b73..4160ffed95 100644
--- a/keyboards/mode/m65ha_alpha/m65ha_alpha.c
+++ b/keyboards/mode/m65ha_alpha/m65ha_alpha.c
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "m65ha_alpha.h"
 
 void board_init(void) {
-    setPinInput(B9);
     setPinInput(B10);
 }
 
diff --git a/keyboards/mode/m65hi_alpha/m65hi_alpha.c b/keyboards/mode/m65hi_alpha/m65hi_alpha.c
index db0ab7ca9a..42c88ba354 100644
--- a/keyboards/mode/m65hi_alpha/m65hi_alpha.c
+++ b/keyboards/mode/m65hi_alpha/m65hi_alpha.c
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "m65hi_alpha.h"
 
 void board_init(void) {
-    setPinInput(B9);
     setPinInput(B10);
 }
 
diff --git a/keyboards/mode/m65s/m65s.c b/keyboards/mode/m65s/m65s.c
index 298fc94140..467fc53a0e 100644
--- a/keyboards/mode/m65s/m65s.c
+++ b/keyboards/mode/m65s/m65s.c
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "m65s.h"
 
 void board_init(void) {
-    setPinInput(B9);
     setPinInput(B10);
 }
 
diff --git a/keyboards/mode/m75h/m75h.c b/keyboards/mode/m75h/m75h.c
index 3306a6538b..e480ea2834 100644
--- a/keyboards/mode/m75h/m75h.c
+++ b/keyboards/mode/m75h/m75h.c
@@ -18,6 +18,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "m75h.h"
 
 void board_init(void) {
-    setPinInput(B9);
     setPinInput(B10);
 }
diff --git a/keyboards/mode/m75s/m75s.c b/keyboards/mode/m75s/m75s.c
index e0424a6a64..bd323a435b 100644
--- a/keyboards/mode/m75s/m75s.c
+++ b/keyboards/mode/m75s/m75s.c
@@ -18,6 +18,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "m75s.h"
 
 void board_init(void) {
-    setPinInput(B9);
     setPinInput(B10);
 }
diff --git a/keyboards/moonlander/config.h b/keyboards/moonlander/config.h
index bd06c5006d..9930e64063 100644
--- a/keyboards/moonlander/config.h
+++ b/keyboards/moonlander/config.h
@@ -159,7 +159,6 @@
 #    define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 16383
 #    define DYNAMIC_KEYMAP_LAYER_COUNT     8
 #endif
-#define VIA_QMK_RGBLIGHT_ENABLE
 
 #define AUDIO_PIN A5
 #define AUDIO_PIN_ALT A4
diff --git a/keyboards/wheatfield/blocked65/blocked65.c b/keyboards/mt/blocked65/blocked65.c
index 81da8005b0..81da8005b0 100644
--- a/keyboards/wheatfield/blocked65/blocked65.c
+++ b/keyboards/mt/blocked65/blocked65.c
diff --git a/keyboards/wheatfield/blocked65/blocked65.h b/keyboards/mt/blocked65/blocked65.h
index 09fe673a66..09fe673a66 100644
--- a/keyboards/wheatfield/blocked65/blocked65.h
+++ b/keyboards/mt/blocked65/blocked65.h
diff --git a/keyboards/wheatfield/blocked65/config.h b/keyboards/mt/blocked65/config.h
index 86e574feed..86e574feed 100644
--- a/keyboards/wheatfield/blocked65/config.h
+++ b/keyboards/mt/blocked65/config.h
diff --git a/keyboards/wheatfield/blocked65/info.json b/keyboards/mt/blocked65/info.json
index aea7165abc..aea7165abc 100644
--- a/keyboards/wheatfield/blocked65/info.json
+++ b/keyboards/mt/blocked65/info.json
diff --git a/keyboards/wheatfield/blocked65/keymaps/default/keymap.c b/keyboards/mt/blocked65/keymaps/default/keymap.c
index c38a103101..c38a103101 100644
--- a/keyboards/wheatfield/blocked65/keymaps/default/keymap.c
+++ b/keyboards/mt/blocked65/keymaps/default/keymap.c
diff --git a/keyboards/wheatfield/blocked65/keymaps/via/keymap.c b/keyboards/mt/blocked65/keymaps/via/keymap.c
index 7c35725c0b..7c35725c0b 100644
--- a/keyboards/wheatfield/blocked65/keymaps/via/keymap.c
+++ b/keyboards/mt/blocked65/keymaps/via/keymap.c
diff --git a/keyboards/wheatfield/blocked65/keymaps/via/rules.mk b/keyboards/mt/blocked65/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/wheatfield/blocked65/keymaps/via/rules.mk
+++ b/keyboards/mt/blocked65/keymaps/via/rules.mk
diff --git a/keyboards/wheatfield/blocked65/readme.md b/keyboards/mt/blocked65/readme.md
index 42cf5b24e2..71e3238390 100644
--- a/keyboards/wheatfield/blocked65/readme.md
+++ b/keyboards/mt/blocked65/readme.md
@@ -8,6 +8,6 @@ A 65% PCB sold via TaoBao, commonly sold as part of the Canoe clone referred to
 
 Make example for this keyboard (after setting up your build environment):
 
-    make wheatfield/blocked65:default
+    make mt/blocked65:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/wheatfield/blocked65/rules.mk b/keyboards/mt/blocked65/rules.mk
index 5dab5b3a15..5dab5b3a15 100644
--- a/keyboards/wheatfield/blocked65/rules.mk
+++ b/keyboards/mt/blocked65/rules.mk
diff --git a/keyboards/mt40/config.h b/keyboards/mt/mt40/config.h
index 6626b24f3a..6626b24f3a 100644
--- a/keyboards/mt40/config.h
+++ b/keyboards/mt/mt40/config.h
diff --git a/keyboards/mt40/info.json b/keyboards/mt/mt40/info.json
index 48a2b9233b..48a2b9233b 100644
--- a/keyboards/mt40/info.json
+++ b/keyboards/mt/mt40/info.json
diff --git a/keyboards/mt40/keymaps/default/config.h b/keyboards/mt/mt40/keymaps/default/config.h
index 6c3e30ef7b..6c3e30ef7b 100644
--- a/keyboards/mt40/keymaps/default/config.h
+++ b/keyboards/mt/mt40/keymaps/default/config.h
diff --git a/keyboards/mt40/keymaps/default/keymap.c b/keyboards/mt/mt40/keymaps/default/keymap.c
index 0feadbfb74..0feadbfb74 100644
--- a/keyboards/mt40/keymaps/default/keymap.c
+++ b/keyboards/mt/mt40/keymaps/default/keymap.c
diff --git a/keyboards/mt40/keymaps/default/readme.md b/keyboards/mt/mt40/keymaps/default/readme.md
index 033b75fa29..033b75fa29 100644
--- a/keyboards/mt40/keymaps/default/readme.md
+++ b/keyboards/mt/mt40/keymaps/default/readme.md
diff --git a/keyboards/mt40/mt40.c b/keyboards/mt/mt40/mt40.c
index dd079e7d81..dd079e7d81 100644
--- a/keyboards/mt40/mt40.c
+++ b/keyboards/mt/mt40/mt40.c
diff --git a/keyboards/mt40/mt40.h b/keyboards/mt/mt40/mt40.h
index dc0de22b28..dc0de22b28 100644
--- a/keyboards/mt40/mt40.h
+++ b/keyboards/mt/mt40/mt40.h
diff --git a/keyboards/mt40/readme.md b/keyboards/mt/mt40/readme.md
index 5fc82d89a7..632cefdb73 100644
--- a/keyboards/mt40/readme.md
+++ b/keyboards/mt/mt40/readme.md
@@ -10,10 +10,10 @@ A 40% Ortholinear Keyboard
 
 Make example for this keyboard (after setting up your build environment):
 
-    make mt40:default
+    make mt/mt40:default
 
 Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
 
-    make mt40:default:flash
+    make mt/mt40:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/mt40/rules.mk b/keyboards/mt/mt40/rules.mk
index 3024f40149..3024f40149 100644
--- a/keyboards/mt40/rules.mk
+++ b/keyboards/mt/mt40/rules.mk
diff --git a/keyboards/mt64rgb/config.h b/keyboards/mt/mt64rgb/config.h
index ea7659b471..ea7659b471 100644
--- a/keyboards/mt64rgb/config.h
+++ b/keyboards/mt/mt64rgb/config.h
diff --git a/keyboards/mt64rgb/info.json b/keyboards/mt/mt64rgb/info.json
index 840863bc24..840863bc24 100644
--- a/keyboards/mt64rgb/info.json
+++ b/keyboards/mt/mt64rgb/info.json
diff --git a/keyboards/mt64rgb/keymaps/default/keymap.c b/keyboards/mt/mt64rgb/keymaps/default/keymap.c
index 84f3b1d35e..84f3b1d35e 100644
--- a/keyboards/mt64rgb/keymaps/default/keymap.c
+++ b/keyboards/mt/mt64rgb/keymaps/default/keymap.c
diff --git a/keyboards/mt64rgb/keymaps/default/readme.md b/keyboards/mt/mt64rgb/keymaps/default/readme.md
index 5508f7df16..5508f7df16 100644
--- a/keyboards/mt64rgb/keymaps/default/readme.md
+++ b/keyboards/mt/mt64rgb/keymaps/default/readme.md
diff --git a/keyboards/mt64rgb/keymaps/via/keymap.c b/keyboards/mt/mt64rgb/keymaps/via/keymap.c
index 7a9a2c1441..7a9a2c1441 100644
--- a/keyboards/mt64rgb/keymaps/via/keymap.c
+++ b/keyboards/mt/mt64rgb/keymaps/via/keymap.c
diff --git a/keyboards/mt64rgb/keymaps/via/rules.mk b/keyboards/mt/mt64rgb/keymaps/via/rules.mk
index ca9fed0e6b..ca9fed0e6b 100644
--- a/keyboards/mt64rgb/keymaps/via/rules.mk
+++ b/keyboards/mt/mt64rgb/keymaps/via/rules.mk
diff --git a/keyboards/mt64rgb/mt64rgb.c b/keyboards/mt/mt64rgb/mt64rgb.c
index f0c444e8fa..f0c444e8fa 100644
--- a/keyboards/mt64rgb/mt64rgb.c
+++ b/keyboards/mt/mt64rgb/mt64rgb.c
diff --git a/keyboards/mt64rgb/mt64rgb.h b/keyboards/mt/mt64rgb/mt64rgb.h
index dac98dfeb1..dac98dfeb1 100644
--- a/keyboards/mt64rgb/mt64rgb.h
+++ b/keyboards/mt/mt64rgb/mt64rgb.h
diff --git a/keyboards/mt64rgb/readme.md b/keyboards/mt/mt64rgb/readme.md
index dcc9412368..23fcd5ebe7 100644
--- a/keyboards/mt64rgb/readme.md
+++ b/keyboards/mt/mt64rgb/readme.md
@@ -11,6 +11,6 @@ It supports an ANSI-based 64-key layout, with hotswap sockets and per-key RGB ba
 
 Make example for this keyboard (after setting up your build environment):
 
-    make mt64rgb:default
+    make mt/mt64rgb:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/mt64rgb/rules.mk b/keyboards/mt/mt64rgb/rules.mk
index 56724f822a..56724f822a 100644
--- a/keyboards/mt64rgb/rules.mk
+++ b/keyboards/mt/mt64rgb/rules.mk
diff --git a/keyboards/mt84/config.h b/keyboards/mt/mt84/config.h
index bde8919ba7..bde8919ba7 100644
--- a/keyboards/mt84/config.h
+++ b/keyboards/mt/mt84/config.h
diff --git a/keyboards/mt84/info.json b/keyboards/mt/mt84/info.json
index aaded30962..aaded30962 100644
--- a/keyboards/mt84/info.json
+++ b/keyboards/mt/mt84/info.json
diff --git a/keyboards/mt84/keymaps/default/config.h b/keyboards/mt/mt84/keymaps/default/config.h
index dd687cad58..dd687cad58 100644
--- a/keyboards/mt84/keymaps/default/config.h
+++ b/keyboards/mt/mt84/keymaps/default/config.h
diff --git a/keyboards/mt84/keymaps/default/keymap.c b/keyboards/mt/mt84/keymaps/default/keymap.c
index bb7d5b447f..bb7d5b447f 100644
--- a/keyboards/mt84/keymaps/default/keymap.c
+++ b/keyboards/mt/mt84/keymaps/default/keymap.c
diff --git a/keyboards/mt84/keymaps/via/keymap.c b/keyboards/mt/mt84/keymaps/via/keymap.c
index 3a92e9b94e..3a92e9b94e 100644
--- a/keyboards/mt84/keymaps/via/keymap.c
+++ b/keyboards/mt/mt84/keymaps/via/keymap.c
diff --git a/keyboards/mt84/keymaps/via/rules.mk b/keyboards/mt/mt84/keymaps/via/rules.mk
index ca9fed0e6b..ca9fed0e6b 100644
--- a/keyboards/mt84/keymaps/via/rules.mk
+++ b/keyboards/mt/mt84/keymaps/via/rules.mk
diff --git a/keyboards/mt84/mt84.c b/keyboards/mt/mt84/mt84.c
index e15a1ff951..e15a1ff951 100644
--- a/keyboards/mt84/mt84.c
+++ b/keyboards/mt/mt84/mt84.c
diff --git a/keyboards/mt84/mt84.h b/keyboards/mt/mt84/mt84.h
index d3de007c94..d3de007c94 100644
--- a/keyboards/mt84/mt84.h
+++ b/keyboards/mt/mt84/mt84.h
diff --git a/keyboards/mt84/readme.md b/keyboards/mt/mt84/readme.md
index 17e1de2f5c..f26521ad6a 100644
--- a/keyboards/mt84/readme.md
+++ b/keyboards/mt/mt84/readme.md
@@ -12,11 +12,11 @@ It supports standard 84-key layout, with hotswap sockets and per-key RGB backlig
 
 Make example for this keyboard (after setting up your build environment):
 
-    make mt84:default
+    make mt/mt84:default
     
 Flashing example for this keyboard:
 
-    make mt84:default:flash
+    make mt/mt84:default:flash
 
 To put the board into bootloader mode, either press the reset button on the bottom the PCB or hold Space+B while plugging it in.
 
diff --git a/keyboards/mt84/rules.mk b/keyboards/mt/mt84/rules.mk
index 0543099445..0543099445 100644
--- a/keyboards/mt84/rules.mk
+++ b/keyboards/mt/mt84/rules.mk
diff --git a/keyboards/mt980/config.h b/keyboards/mt/mt980/config.h
index ff6c5807df..ff6c5807df 100644
--- a/keyboards/mt980/config.h
+++ b/keyboards/mt/mt980/config.h
diff --git a/keyboards/mt980/info.json b/keyboards/mt/mt980/info.json
index be89ec8fc0..be89ec8fc0 100644
--- a/keyboards/mt980/info.json
+++ b/keyboards/mt/mt980/info.json
diff --git a/keyboards/mt980/keymaps/default/keymap.c b/keyboards/mt/mt980/keymaps/default/keymap.c
index 504233a983..504233a983 100644
--- a/keyboards/mt980/keymaps/default/keymap.c
+++ b/keyboards/mt/mt980/keymaps/default/keymap.c
diff --git a/keyboards/mt980/keymaps/walker/config.h b/keyboards/mt/mt980/keymaps/walker/config.h
index 0bd3959938..0bd3959938 100644
--- a/keyboards/mt980/keymaps/walker/config.h
+++ b/keyboards/mt/mt980/keymaps/walker/config.h
diff --git a/keyboards/mt980/keymaps/walker/keymap.c b/keyboards/mt/mt980/keymaps/walker/keymap.c
index 83a3fb8167..83a3fb8167 100644
--- a/keyboards/mt980/keymaps/walker/keymap.c
+++ b/keyboards/mt/mt980/keymaps/walker/keymap.c
diff --git a/keyboards/navi10/keymaps/emdarcher/rules.mk b/keyboards/mt/mt980/keymaps/walker/rules.mk
index e5ddcae8d9..e5ddcae8d9 100644
--- a/keyboards/navi10/keymaps/emdarcher/rules.mk
+++ b/keyboards/mt/mt980/keymaps/walker/rules.mk
diff --git a/keyboards/mt980/mt980.c b/keyboards/mt/mt980/mt980.c
index 69f7cc491a..69f7cc491a 100644
--- a/keyboards/mt980/mt980.c
+++ b/keyboards/mt/mt980/mt980.c
diff --git a/keyboards/mt980/mt980.h b/keyboards/mt/mt980/mt980.h
index d9804b3392..d9804b3392 100644
--- a/keyboards/mt980/mt980.h
+++ b/keyboards/mt/mt980/mt980.h
diff --git a/keyboards/mt980/readme.md b/keyboards/mt/mt980/readme.md
index 7bc27c93a5..5e702de714 100644
--- a/keyboards/mt980/readme.md
+++ b/keyboards/mt/mt980/readme.md
@@ -8,7 +8,7 @@ Hardware Availability: Taobao store https://shop110310565.taobao.com
 
 Make example for this keyboard (after setting up your build environment):
 
-    make mt980:default
+    make mt/mt980:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
diff --git a/keyboards/mt980/rules.mk b/keyboards/mt/mt980/rules.mk
index 2ca5686493..2ca5686493 100644
--- a/keyboards/mt980/rules.mk
+++ b/keyboards/mt/mt980/rules.mk
diff --git a/keyboards/wheatfield/split75/config.h b/keyboards/mt/split75/config.h
index 63c9492c31..63c9492c31 100644
--- a/keyboards/wheatfield/split75/config.h
+++ b/keyboards/mt/split75/config.h
diff --git a/keyboards/wheatfield/split75/info.json b/keyboards/mt/split75/info.json
index 1d0609a378..1d0609a378 100644
--- a/keyboards/wheatfield/split75/info.json
+++ b/keyboards/mt/split75/info.json
diff --git a/keyboards/wheatfield/split75/keymaps/art/keymap.c b/keyboards/mt/split75/keymaps/art/keymap.c
index c10059bb7d..c10059bb7d 100644
--- a/keyboards/wheatfield/split75/keymaps/art/keymap.c
+++ b/keyboards/mt/split75/keymaps/art/keymap.c
diff --git a/keyboards/wheatfield/split75/keymaps/art/rules.mk b/keyboards/mt/split75/keymaps/art/rules.mk
index 5f8cb68ad0..5f8cb68ad0 100644
--- a/keyboards/wheatfield/split75/keymaps/art/rules.mk
+++ b/keyboards/mt/split75/keymaps/art/rules.mk
diff --git a/keyboards/wheatfield/split75/keymaps/default/keymap.c b/keyboards/mt/split75/keymaps/default/keymap.c
index 320aaeb5da..320aaeb5da 100644
--- a/keyboards/wheatfield/split75/keymaps/default/keymap.c
+++ b/keyboards/mt/split75/keymaps/default/keymap.c
diff --git a/keyboards/wheatfield/split75/keymaps/iso/keymap.c b/keyboards/mt/split75/keymaps/iso/keymap.c
index aca261b1d1..aca261b1d1 100644
--- a/keyboards/wheatfield/split75/keymaps/iso/keymap.c
+++ b/keyboards/mt/split75/keymaps/iso/keymap.c
diff --git a/keyboards/wheatfield/split75/matrix.c b/keyboards/mt/split75/matrix.c
index 9e86bfc376..9e86bfc376 100644
--- a/keyboards/wheatfield/split75/matrix.c
+++ b/keyboards/mt/split75/matrix.c
diff --git a/keyboards/wheatfield/split75/readme.md b/keyboards/mt/split75/readme.md
index ec8c7ee9ea..360ad55239 100644
--- a/keyboards/wheatfield/split75/readme.md
+++ b/keyboards/mt/split75/readme.md
@@ -13,11 +13,11 @@ Original work performed by Michael L. Walker, all credit goes to him. I've tidie
 
 Make example for this keyboard (after setting up your build environment):
 
-    make wheatfield/split75:default
+    make mt/split75:default
 
 Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
 
-    make wheatfield/split75:default:flash
+    make mt/split75:default:flash
 
 or
 
diff --git a/keyboards/wheatfield/split75/rules.mk b/keyboards/mt/split75/rules.mk
index 4aed5ab586..4aed5ab586 100644
--- a/keyboards/wheatfield/split75/rules.mk
+++ b/keyboards/mt/split75/rules.mk
diff --git a/keyboards/wheatfield/split75/split75.c b/keyboards/mt/split75/split75.c
index b8a3fe6c28..b8a3fe6c28 100644
--- a/keyboards/wheatfield/split75/split75.c
+++ b/keyboards/mt/split75/split75.c
diff --git a/keyboards/wheatfield/split75/split75.h b/keyboards/mt/split75/split75.h
index 93da3e7b83..93da3e7b83 100644
--- a/keyboards/wheatfield/split75/split75.h
+++ b/keyboards/mt/split75/split75.h
diff --git a/keyboards/navi10/rules.mk b/keyboards/navi10/rules.mk
deleted file mode 100644
index cc08312b77..0000000000
--- a/keyboards/navi10/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = navi10/rev3
diff --git a/keyboards/ramonimbao/squishytkl/chconf.h b/keyboards/ramonimbao/squishytkl/chconf.h
deleted file mode 100644
index ce018f56a7..0000000000
--- a/keyboards/ramonimbao/squishytkl/chconf.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2020 QMK
- *
- * 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 CH_CFG_ST_TIMEDELTA 0
-
-#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-
-#include_next <chconf.h>
diff --git a/keyboards/rart/rartlice/chconf.h b/keyboards/rart/rartlice/chconf.h
deleted file mode 100644
index 0a89eb248c..0000000000
--- a/keyboards/rart/rartlice/chconf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2020 QMK
- *
- * 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/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/rart/rartlice/chconf.h -r platforms/chibios/common/configs/chconf.h`
- */
-
-#pragma once
-
-#define CH_CFG_ST_TIMEDELTA 0
-
-#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-
-#include_next <chconf.h>
-
diff --git a/keyboards/reviung/reviung34/info.json b/keyboards/reviung/reviung34/info.json
index ecd89d4742..6e727a4ff3 100755
--- a/keyboards/reviung/reviung34/info.json
+++ b/keyboards/reviung/reviung34/info.json
@@ -40,6 +40,43 @@
                 {"label":"K34", "x":4, "y":3},
                 {"label":"K38", "x":6, "y":3, "w":2}
             ]
+        },
+        "LAYOUT_reviung34_2u": {
+            "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":6, "y":0},
+                {"label":"K06", "x":7, "y":0},
+                {"label":"K07", "x":8, "y":0},
+                {"label":"K08", "x":9, "y":0},
+                {"label":"K35", "x":10, "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":6, "y":1},
+                {"label":"K16", "x":7, "y":1},
+                {"label":"K17", "x":8, "y":1},
+                {"label":"K18", "x":9, "y":1},
+                {"label":"K36", "x":10, "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":6, "y":2},
+                {"label":"K26", "x":7, "y":2},
+                {"label":"K27", "x":8, "y":2},
+                {"label":"K28", "x":9, "y":2},
+                {"label":"K37", "x":10, "y":2},
+                {"label":"K32", "x":2, "y":3},
+                {"label":"K34", "x":3, "y":3, "w":2},
+                {"label":"K38", "x":6, "y":3, "w":2}
+            ]
         }
     }
 }
diff --git a/keyboards/reviung/reviung34/keymaps/default_2uL/keymap.c b/keyboards/reviung/reviung34/keymaps/default_2u/keymap.c
index 767c0ff4c6..9f586b333c 100755
--- a/keyboards/reviung/reviung34/keymaps/default_2uL/keymap.c
+++ b/keyboards/reviung/reviung34/keymaps/default_2u/keymap.c
@@ -35,28 +35,28 @@ enum layer_names {
 
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_reviung34_2uL(
+  [_BASE] = LAYOUT_reviung34_2u(
     CT_Q,    KC_W,    KC_E,    KC_R,    KC_T,          KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,          KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,
     SF_Z,    AL_X,    KC_C,    KC_V,    KC_B,          KC_N,    KC_M,    CT_CM,   AL_DT,   SF_SS,
                       KC_TAB,       LOWER,                  RA_SP
   ),
 
-  [_LOWER] = LAYOUT_reviung34_2uL(
+  [_LOWER] = LAYOUT_reviung34_2u(
     KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,       KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
     KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,       KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_SCLN,
     KC_LSFT, KC_ESC,  KC_LGUI, KC_LALT, KC_QUOT,       KC_HOME, KC_END,  KC_PGUP, KC_PGDN, KC_BSPC,
                       _______,      _______,                _______
   ),
   
-  [_RAISE] = LAYOUT_reviung34_2uL(
+  [_RAISE] = LAYOUT_reviung34_2u(
     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,          KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
     KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,       XXXXXXX, XXXXXXX, KC_GRV,  KC_TILD, KC_COLN,
     KC_LSFT, KC_ESC,  KC_RGUI, KC_LALT, KC_DQUO,       KC_TAB,  XXXXXXX, KC_RCTL, KC_RALT, KC_DEL,
                       _______,      _______,                _______
   ),
   
-  [_ADJUST] = LAYOUT_reviung34_2uL(
+  [_ADJUST] = LAYOUT_reviung34_2u(
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR,
     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     KC_F11,  KC_F12,  KC_CAPS, XXXXXXX, XXXXXXX,       RESET,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
diff --git a/keyboards/reviung/reviung34/keymaps/default_2uL/readme.md b/keyboards/reviung/reviung34/keymaps/default_2u/readme.md
index 2e4619fae8..2e4619fae8 100755
--- a/keyboards/reviung/reviung34/keymaps/default_2uL/readme.md
+++ b/keyboards/reviung/reviung34/keymaps/default_2u/readme.md
diff --git a/keyboards/reviung/reviung34/keymaps/default_rgb2u/keymap.c b/keyboards/reviung/reviung34/keymaps/default_rgb2u/keymap.c
index f4f1d3be50..d5a5a2223b 100755
--- a/keyboards/reviung/reviung34/keymaps/default_rgb2u/keymap.c
+++ b/keyboards/reviung/reviung34/keymaps/default_rgb2u/keymap.c
@@ -34,28 +34,28 @@ enum layer_names {
 
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_reviung34_2uL(
+  [_BASE] = LAYOUT_reviung34_2u(
     CT_Q,    KC_W,    KC_E,    KC_R,    KC_T,          KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,          KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,
     SF_Z,    AL_X,    KC_C,    KC_V,    KC_B,          KC_N,    KC_M,    CT_CM,   AL_DT,   SF_SS,
                                         LOWER, KC_SPC, RAISE
   ),
 
-  [_LOWER] = LAYOUT_reviung34_2uL(
+  [_LOWER] = LAYOUT_reviung34_2u(
     KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,       KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
     KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,       KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_SCLN,
     KC_LSFT, KC_ESC,  KC_LGUI, KC_LALT, KC_QUOT,       KC_HOME, KC_END,  KC_PGUP, KC_PGDN, KC_BSPC,
                                       _______, _______, _______
   ),
   
-  [_RAISE] = LAYOUT_reviung34_2uL(
+  [_RAISE] = LAYOUT_reviung34_2u(
     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,          KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
     KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,       XXXXXXX, XXXXXXX, KC_GRV,  KC_TILD, KC_COLN,
     KC_LSFT, KC_ESC,  KC_RGUI, KC_LALT, KC_DQUO,       KC_TAB,  XXXXXXX, KC_RCTL, KC_RALT, KC_DEL,
                                       _______, _______, _______
   ),
   
-  [_ADJUST] = LAYOUT_reviung34_2uL(
+  [_ADJUST] = LAYOUT_reviung34_2u(
     RGB_VAI, RGB_SAI, RGB_HUI, RGB_MOD, RGB_TOG,       KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,  
     RGB_VAD, RGB_SAD, RGB_HUD, RGB_RMOD,XXXXXXX,       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10, 
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,         KC_F11,  KC_F12,  KC_CAPS, XXXXXXX, KC_PSCR,
diff --git a/keyboards/reviung/reviung34/reviung34.h b/keyboards/reviung/reviung34/reviung34.h
index 8385e5c8c2..1ab783ec36 100755
--- a/keyboards/reviung/reviung34/reviung34.h
+++ b/keyboards/reviung/reviung34/reviung34.h
@@ -38,7 +38,7 @@
     { KC_NO, KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38 } \
 }
 
-#define LAYOUT_reviung34_2uL( \
+#define LAYOUT_reviung34_2u( \
     K00, K01, K02, K03, K04,     K05, K06, K07, K08, K35, \
     K10, K11, K12, K13, K14,     K15, K16, K17, K18, K36, \
     K20, K21, K22, K23, K24,     K25, K26, K27, K28, K37, \
diff --git a/keyboards/sofle/keyhive/config.h b/keyboards/sofle/keyhive/config.h
index c934754e65..93048f3cd1 100755
--- a/keyboards/sofle/keyhive/config.h
+++ b/keyboards/sofle/keyhive/config.h
@@ -42,11 +42,12 @@
 #define DEBOUNCE        5
 
 // Encoder support
-#define ENCODERS_PAD_A       { F5 }
-#define ENCODERS_PAD_B       { F4 }
-#define ENCODERS_PAD_A_RIGHT { F4 }
-#define ENCODERS_PAD_B_RIGHT { F5 }
-#define ENCODER_RESOLUTIONS  { 4, 2 }  // Left encoder seems to have double-output issue but right does not.
+#define ENCODERS_PAD_A            { F5 }
+#define ENCODERS_PAD_B            { F4 }
+#define ENCODERS_PAD_A_RIGHT      { F4 }
+#define ENCODERS_PAD_B_RIGHT      { F5 }
+#define ENCODER_RESOLUTIONS       { 4 }
+#define ENCODER_RESOLUTIONS_RIGHT { 2 }  // Left encoder seems to have double-output issue but right does not.
 
 #define TAP_CODE_DELAY  10
 
diff --git a/keyboards/sowbug/68keys/config.h b/keyboards/sowbug/68keys/config.h
index 0aad9a4574..0721302dbe 100644
--- a/keyboards/sowbug/68keys/config.h
+++ b/keyboards/sowbug/68keys/config.h
@@ -26,7 +26,6 @@
 #define DEVICE_VER 0x0001
 #define MANUFACTURER github.com/sowbug
 #define PRODUCT 68-key keyboard
-#define DESCRIPTION A 68-key keyboard based on 68keys.io
 
 // key matrix size
 #define MATRIX_ROWS 5
diff --git a/keyboards/sowbug/ansi_tkl/config.h b/keyboards/sowbug/ansi_tkl/config.h
index 505453b72b..44e82bbac7 100644
--- a/keyboards/sowbug/ansi_tkl/config.h
+++ b/keyboards/sowbug/ansi_tkl/config.h
@@ -26,7 +26,6 @@
 #define DEVICE_VER 0x0001
 #define MANUFACTURER github.com/sowbug
 #define PRODUCT ANSI TKL
-#define DESCRIPTION A tenkeyless ANSI-layout keyboard
 
 // key matrix size
 #define MATRIX_ROWS 6
diff --git a/keyboards/tkc/portico68v2/config.h b/keyboards/tkc/portico68v2/config.h
index 486863d702..dea6180958 100644
--- a/keyboards/tkc/portico68v2/config.h
+++ b/keyboards/tkc/portico68v2/config.h
@@ -79,8 +79,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define ENABLE_RGB_MATRIX_HUE_PENDULUM
 #    define ENABLE_RGB_MATRIX_HUE_WAVE
 #    define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
-#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+//#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+//#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 // enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
 #    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
 #    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
diff --git a/keyboards/tronguylabs/m122_3270/bluepill/chconf.h b/keyboards/tronguylabs/m122_3270/bluepill/chconf.h
deleted file mode 100644
index c7a982aedd..0000000000
--- a/keyboards/tronguylabs/m122_3270/bluepill/chconf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2020 QMK
- *
- * 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/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/bluepill/chconf.h -r platforms/chibios/common/configs/chconf.h`
- */
-
-#pragma once
-
-#define CH_CFG_ST_TIMEDELTA 0
-
-#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-
-#include_next <chconf.h>
-
diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h
index 7bd5b224df..597d287b07 100644
--- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h
+++ b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h
@@ -23,7 +23,6 @@
 #define DEVICE_VER 0x0001
 #define MANUFACTURER Unicomp/Purdea Andrei
 #define PRODUCT Unicomp Spacesaver M
-#define DESCRIPTION QMK firmware for the Unicomp Spacesaver M keyboard with a replacement Overnumpad controller
 #define SERIAL_NUMBER "purdea.ro:overnumpad_controller"
 
 /* key matrix size */
diff --git a/keyboards/uno/rules.mk b/keyboards/uno/rules.mk
deleted file mode 100644
index 367faedeaf..0000000000
--- a/keyboards/uno/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = uno/rev1
diff --git a/keyboards/at101_bh/at101_bh.c b/keyboards/viktus/at101_bh/at101_bh.c
index 3b519373b0..3b519373b0 100644
--- a/keyboards/at101_bh/at101_bh.c
+++ b/keyboards/viktus/at101_bh/at101_bh.c
diff --git a/keyboards/at101_bh/at101_bh.h b/keyboards/viktus/at101_bh/at101_bh.h
index 54655cf60e..54655cf60e 100644
--- a/keyboards/at101_bh/at101_bh.h
+++ b/keyboards/viktus/at101_bh/at101_bh.h
diff --git a/keyboards/at101_bh/config.h b/keyboards/viktus/at101_bh/config.h
index 8c81fab916..8c81fab916 100644
--- a/keyboards/at101_bh/config.h
+++ b/keyboards/viktus/at101_bh/config.h
diff --git a/keyboards/at101_bh/info.json b/keyboards/viktus/at101_bh/info.json
index 9fdac129f5..9fdac129f5 100644
--- a/keyboards/at101_bh/info.json
+++ b/keyboards/viktus/at101_bh/info.json
diff --git a/keyboards/at101_bh/keymaps/default/keymap.c b/keyboards/viktus/at101_bh/keymaps/default/keymap.c
index 1962dd7479..1962dd7479 100644
--- a/keyboards/at101_bh/keymaps/default/keymap.c
+++ b/keyboards/viktus/at101_bh/keymaps/default/keymap.c
diff --git a/keyboards/at101_bh/readme.md b/keyboards/viktus/at101_bh/readme.md
index 8a9ce2496f..d9d7b4dafa 100644
--- a/keyboards/at101_bh/readme.md
+++ b/keyboards/viktus/at101_bh/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: https://deskthority.net/group-buys-f50/programmable-vinta
 
 Make example for this keyboard (after setting up your build environment):
 
-    make at101_bh:default
+    make viktus/at101_bh:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/at101_bh/rules.mk b/keyboards/viktus/at101_bh/rules.mk
index 16dc2697bb..16dc2697bb 100644
--- a/keyboards/at101_bh/rules.mk
+++ b/keyboards/viktus/at101_bh/rules.mk
diff --git a/keyboards/omnikey_bh/config.h b/keyboards/viktus/omnikey_bh/config.h
index 7d170077a9..7d170077a9 100644
--- a/keyboards/omnikey_bh/config.h
+++ b/keyboards/viktus/omnikey_bh/config.h
diff --git a/keyboards/omnikey_bh/info.json b/keyboards/viktus/omnikey_bh/info.json
index 93b6aeefd8..93b6aeefd8 100644
--- a/keyboards/omnikey_bh/info.json
+++ b/keyboards/viktus/omnikey_bh/info.json
diff --git a/keyboards/omnikey_bh/keymaps/default/keymap.c b/keyboards/viktus/omnikey_bh/keymaps/default/keymap.c
index 671c04a36b..671c04a36b 100644
--- a/keyboards/omnikey_bh/keymaps/default/keymap.c
+++ b/keyboards/viktus/omnikey_bh/keymaps/default/keymap.c
diff --git a/keyboards/omnikey_bh/omnikey_bh.c b/keyboards/viktus/omnikey_bh/omnikey_bh.c
index c2f52f30c3..c2f52f30c3 100644
--- a/keyboards/omnikey_bh/omnikey_bh.c
+++ b/keyboards/viktus/omnikey_bh/omnikey_bh.c
diff --git a/keyboards/omnikey_bh/omnikey_bh.h b/keyboards/viktus/omnikey_bh/omnikey_bh.h
index f36184f390..f36184f390 100644
--- a/keyboards/omnikey_bh/omnikey_bh.h
+++ b/keyboards/viktus/omnikey_bh/omnikey_bh.h
diff --git a/keyboards/omnikey_bh/readme.md b/keyboards/viktus/omnikey_bh/readme.md
index 7de22f29a4..55cf72bf87 100644
--- a/keyboards/omnikey_bh/readme.md
+++ b/keyboards/viktus/omnikey_bh/readme.md
@@ -9,6 +9,6 @@ Hardware Availability: https://deskthority.net/group-buys-f50/omnikey-replacemen
 
 Make example for this keyboard (after setting up your build environment):
 
-    make omnikey_bh:default
+    make viktus/omnikey_bh:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/keyboards/omnikey_bh/rules.mk b/keyboards/viktus/omnikey_bh/rules.mk
index 65e353ad15..65e353ad15 100644
--- a/keyboards/omnikey_bh/rules.mk
+++ b/keyboards/viktus/omnikey_bh/rules.mk
diff --git a/keyboards/viktus/sp_mini/config.h b/keyboards/viktus/sp_mini/config.h
index a0671c97f3..bce8a4cc4c 100644
--- a/keyboards/viktus/sp_mini/config.h
+++ b/keyboards/viktus/sp_mini/config.h
@@ -35,7 +35,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // wiring of each half
 #define MATRIX_ROW_PINS { F0, B5, B4, D7, D6 }
-#define MATRIX_COL_PINS { B6, C6, C7, D4, D2, D3, D5 } // no B7 on left hand
+#define MATRIX_COL_PINS { B6, C6, C7, D4, D2, D3, D5, NO_PIN } // no B7 on left hand
 #define MATRIX_ROW_PINS_RIGHT { F0, B5, B4, D7, D6 }
 #define MATRIX_COL_PINS_RIGHT { B6, C6, C7, D4, D2, D3, D5, B7 }
 
@@ -78,7 +78,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define ENCODERS_PAD_A_RIGHT {F4}
 //#define ENCODERS_PAD_B_RIGHT {F1}
 
-#define ENCODER_RESOLUTIONS { 8, 8 }
+#define ENCODER_RESOLUTIONS { 8 }
 
 /*
  * Feature disable options
diff --git a/keyboards/z150_bh/config.h b/keyboards/viktus/z150_bh/config.h
index 0bfbe3228f..0bfbe3228f 100644
--- a/keyboards/z150_bh/config.h
+++ b/keyboards/viktus/z150_bh/config.h
diff --git a/keyboards/z150_bh/info.json b/keyboards/viktus/z150_bh/info.json
index 3339baee89..3339baee89 100644
--- a/keyboards/z150_bh/info.json
+++ b/keyboards/viktus/z150_bh/info.json
diff --git a/keyboards/z150_bh/keymaps/default/keymap.c b/keyboards/viktus/z150_bh/keymaps/default/keymap.c
index 9ca75dd285..9ca75dd285 100644
--- a/keyboards/z150_bh/keymaps/default/keymap.c
+++ b/keyboards/viktus/z150_bh/keymaps/default/keymap.c
diff --git a/keyboards/z150_bh/keymaps/default_tkl/keymap.c b/keyboards/viktus/z150_bh/keymaps/default_tkl/keymap.c
index fa1f7e47b9..fa1f7e47b9 100644
--- a/keyboards/z150_bh/keymaps/default_tkl/keymap.c
+++ b/keyboards/viktus/z150_bh/keymaps/default_tkl/keymap.c
diff --git a/keyboards/z150_bh/readme.md b/keyboards/viktus/z150_bh/readme.md
index a1d4845808..6975d8f1d0 100644
--- a/keyboards/z150_bh/readme.md
+++ b/keyboards/viktus/z150_bh/readme.md
@@ -9,6 +9,6 @@ Hardware Availability: [Deskthority Group Buy](https://deskthority.net/group-buy
 
 Make example for this keyboard (after setting up your build environment):
 
-    make z150_bh:default
+    make viktus/z150_bh:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/z150_bh/rules.mk b/keyboards/viktus/z150_bh/rules.mk
index 65e353ad15..65e353ad15 100644
--- a/keyboards/z150_bh/rules.mk
+++ b/keyboards/viktus/z150_bh/rules.mk
diff --git a/keyboards/z150_bh/z150_bh.c b/keyboards/viktus/z150_bh/z150_bh.c
index b75a1ff198..b75a1ff198 100644
--- a/keyboards/z150_bh/z150_bh.c
+++ b/keyboards/viktus/z150_bh/z150_bh.c
diff --git a/keyboards/z150_bh/z150_bh.h b/keyboards/viktus/z150_bh/z150_bh.h
index f97ac1c035..f97ac1c035 100644
--- a/keyboards/z150_bh/z150_bh.h
+++ b/keyboards/viktus/z150_bh/z150_bh.h
diff --git a/keyboards/xelus/ninjin/config.h b/keyboards/xelus/ninjin/config.h
index cbaca37b5e..4dd40210a6 100644
--- a/keyboards/xelus/ninjin/config.h
+++ b/keyboards/xelus/ninjin/config.h
@@ -22,7 +22,6 @@
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    Xelus
 #define PRODUCT         Ninjin
-#define DESCRIPTION     Ninjin
 
 /* key matrix size */
 #define MATRIX_ROWS 6
diff --git a/keyboards/melody96/config.h b/keyboards/ymdk/melody96/config.h
index 45e7e680c1..45e7e680c1 100644
--- a/keyboards/melody96/config.h
+++ b/keyboards/ymdk/melody96/config.h
diff --git a/keyboards/melody96/info.json b/keyboards/ymdk/melody96/info.json
index 7db60fa7d4..7db60fa7d4 100644
--- a/keyboards/melody96/info.json
+++ b/keyboards/ymdk/melody96/info.json
diff --git a/keyboards/melody96/keymaps/crilith/keymap.c b/keyboards/ymdk/melody96/keymaps/crilith/keymap.c
index 40ae691435..40ae691435 100644
--- a/keyboards/melody96/keymaps/crilith/keymap.c
+++ b/keyboards/ymdk/melody96/keymaps/crilith/keymap.c
diff --git a/keyboards/melody96/keymaps/default/keymap.c b/keyboards/ymdk/melody96/keymaps/default/keymap.c
index 3ed6f3068b..3ed6f3068b 100644
--- a/keyboards/melody96/keymaps/default/keymap.c
+++ b/keyboards/ymdk/melody96/keymaps/default/keymap.c
diff --git a/keyboards/melody96/keymaps/default_96_with60_split_num0/keymap.c b/keyboards/ymdk/melody96/keymaps/default_96_with60_split_num0/keymap.c
index 5dc26b150d..5dc26b150d 100644
--- a/keyboards/melody96/keymaps/default_96_with60_split_num0/keymap.c
+++ b/keyboards/ymdk/melody96/keymaps/default_96_with60_split_num0/keymap.c
diff --git a/keyboards/melody96/keymaps/dvz/config.h b/keyboards/ymdk/melody96/keymaps/dvz/config.h
index be786464bc..be786464bc 100644
--- a/keyboards/melody96/keymaps/dvz/config.h
+++ b/keyboards/ymdk/melody96/keymaps/dvz/config.h
diff --git a/keyboards/melody96/keymaps/dvz/keymap.c b/keyboards/ymdk/melody96/keymaps/dvz/keymap.c
index cea3970e18..cea3970e18 100644
--- a/keyboards/melody96/keymaps/dvz/keymap.c
+++ b/keyboards/ymdk/melody96/keymaps/dvz/keymap.c
diff --git a/keyboards/melody96/keymaps/dvz/readme.md b/keyboards/ymdk/melody96/keymaps/dvz/readme.md
index d82055244e..d82055244e 100644
--- a/keyboards/melody96/keymaps/dvz/readme.md
+++ b/keyboards/ymdk/melody96/keymaps/dvz/readme.md
diff --git a/keyboards/melody96/keymaps/dvz/rules.mk b/keyboards/ymdk/melody96/keymaps/dvz/rules.mk
index a1e85f13f4..a1e85f13f4 100644
--- a/keyboards/melody96/keymaps/dvz/rules.mk
+++ b/keyboards/ymdk/melody96/keymaps/dvz/rules.mk
diff --git a/keyboards/melody96/keymaps/konstantin/config.h b/keyboards/ymdk/melody96/keymaps/konstantin/config.h
index 4b511eb848..4b511eb848 100644
--- a/keyboards/melody96/keymaps/konstantin/config.h
+++ b/keyboards/ymdk/melody96/keymaps/konstantin/config.h
diff --git a/keyboards/melody96/keymaps/konstantin/keymap.c b/keyboards/ymdk/melody96/keymaps/konstantin/keymap.c
index 1ee7ca1e77..1ee7ca1e77 100644
--- a/keyboards/melody96/keymaps/konstantin/keymap.c
+++ b/keyboards/ymdk/melody96/keymaps/konstantin/keymap.c
diff --git a/keyboards/melody96/keymaps/konstantin/rules.mk b/keyboards/ymdk/melody96/keymaps/konstantin/rules.mk
index b315c8e6b9..b315c8e6b9 100644
--- a/keyboards/melody96/keymaps/konstantin/rules.mk
+++ b/keyboards/ymdk/melody96/keymaps/konstantin/rules.mk
diff --git a/keyboards/melody96/keymaps/via/keymap.c b/keyboards/ymdk/melody96/keymaps/via/keymap.c
index c02fa785a8..c02fa785a8 100644
--- a/keyboards/melody96/keymaps/via/keymap.c
+++ b/keyboards/ymdk/melody96/keymaps/via/keymap.c
diff --git a/keyboards/ut472/keymaps/via/rules.mk b/keyboards/ymdk/melody96/keymaps/via/rules.mk
index 36b7ba9cbc..36b7ba9cbc 100644
--- a/keyboards/ut472/keymaps/via/rules.mk
+++ b/keyboards/ymdk/melody96/keymaps/via/rules.mk
diff --git a/keyboards/melody96/keymaps/zunger/config.h b/keyboards/ymdk/melody96/keymaps/zunger/config.h
index cc06440e0d..cc06440e0d 100644
--- a/keyboards/melody96/keymaps/zunger/config.h
+++ b/keyboards/ymdk/melody96/keymaps/zunger/config.h
diff --git a/keyboards/melody96/keymaps/zunger/keymap.c b/keyboards/ymdk/melody96/keymaps/zunger/keymap.c
index d0d2698b7a..d0d2698b7a 100644
--- a/keyboards/melody96/keymaps/zunger/keymap.c
+++ b/keyboards/ymdk/melody96/keymaps/zunger/keymap.c
diff --git a/keyboards/melody96/keymaps/zunger/readme.md b/keyboards/ymdk/melody96/keymaps/zunger/readme.md
index 3eb64a2e73..3eb64a2e73 100644
--- a/keyboards/melody96/keymaps/zunger/readme.md
+++ b/keyboards/ymdk/melody96/keymaps/zunger/readme.md
diff --git a/keyboards/melody96/keymaps/zunger/rules.mk b/keyboards/ymdk/melody96/keymaps/zunger/rules.mk
index a61cfa33fa..a61cfa33fa 100644
--- a/keyboards/melody96/keymaps/zunger/rules.mk
+++ b/keyboards/ymdk/melody96/keymaps/zunger/rules.mk
diff --git a/keyboards/melody96/melody96.c b/keyboards/ymdk/melody96/melody96.c
index 44e813586b..44e813586b 100644
--- a/keyboards/melody96/melody96.c
+++ b/keyboards/ymdk/melody96/melody96.c
diff --git a/keyboards/melody96/melody96.h b/keyboards/ymdk/melody96/melody96.h
index 3d3bc6070c..3d3bc6070c 100644
--- a/keyboards/melody96/melody96.h
+++ b/keyboards/ymdk/melody96/melody96.h
diff --git a/keyboards/melody96/readme.md b/keyboards/ymdk/melody96/readme.md
index 16338e9ed3..a6bf470b32 100644
--- a/keyboards/melody96/readme.md
+++ b/keyboards/ymdk/melody96/readme.md
@@ -10,7 +10,7 @@
 
 Make example for this keyboard (after setting up your build environment):
 
-    make melody96:default
+    make ymdk/melody96:default
 
 Flashing example for this keyboard:
 
diff --git a/keyboards/melody96/rules.mk b/keyboards/ymdk/melody96/rules.mk
index b27013f863..b27013f863 100644
--- a/keyboards/melody96/rules.mk
+++ b/keyboards/ymdk/melody96/rules.mk
diff --git a/keyboards/zvecr/split_blackpill/chconf.h b/keyboards/zvecr/split_blackpill/chconf.h
deleted file mode 100644
index e98ee9d790..0000000000
--- a/keyboards/zvecr/split_blackpill/chconf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2020 QMK
- *
- * 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/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/zvecr/split_blackpill/chconf.h -r platforms/chibios/common/configs/chconf.h`
- */
-
-#pragma once
-
-#define CH_CFG_ST_TIMEDELTA 0
-
-#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-
-#include_next <chconf.h>
-