279 files changed, 530 insertions, 699 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/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/gmmk/pro/ansi/keymaps/andrewcharnley/config.h b/keyboards/gmmk/pro/ansi/keymaps/andrewcharnley/config.h
new file mode 100644
index 0000000000..aee1ba39d5
--- /dev/null
+++ b/keyboards/gmmk/pro/ansi/keymaps/andrewcharnley/config.h
@@ -0,0 +1,24 @@
+/* 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/>.
+ */
+
+#pragma once
+
+#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
+
+
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/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/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/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/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/uno/rules.mk b/keyboards/keyhive/uno/rules.mk
index 367faedeaf..367faedeaf 100644
--- a/keyboards/uno/rules.mk
+++ b/keyboards/keyhive/uno/rules.mk
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..bb3248e293 100644
--- a/keyboards/uno/uno.h
+++ b/keyboards/keyhive/uno/uno.h
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/ut472/keymaps/via/rules.mk b/keyboards/keyhive/ut472/keymaps/via/rules.mk
index 36b7ba9cbc..36b7ba9cbc 100644
--- a/keyboards/ut472/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/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/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/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/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/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/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