405 files changed, 5174 insertions, 2929 deletions
diff --git a/.gitignore b/.gitignore
index 90f3d6752..3592abcea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 *.eep
 *.elf
 *.hex
+*.uf2
 *.qmk
 !util/bootloader.hex
 !quantum/tools/eeprom_reset.hex
diff --git a/Makefile b/Makefile
index 91ab9e4e8..e007ae367 100644
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,13 @@ $(info QMK Firmware $(QMK_VERSION))
 endif
 endif
+# Determine which qmk cli to use
+ifeq (,$(shell which qmk))
+    QMK_BIN = bin/qmk
+else
+    QMK_BIN = qmk
+endif
 # avoid 'Entering|Leaving directory' messages
 MAKEFLAGS += --no-print-directory
@@ -86,8 +93,8 @@ clean:
 .PHONY: distclean
 distclean: clean
-        echo -n 'Deleting *.bin and *.hex ... '
+        echo -n 'Deleting *.bin, *.hex, and *.uf2 ... '
-        rm -f *.bin *.hex
+        rm -f *.bin *.hex *.uf2
        echo 'done.'
 #Compatibility with the old make variables, anything you specify directly on the command line
@@ -384,7 +391,7 @@ define PARSE_KEYMAP
    # Format it in bold
    KB_SP := $(BOLD)$$(KB_SP)$(NO_COLOR)
    # Specify the variables that we are passing forward to submake
-    MAKE_VARS := KEYBOARD=$$(CURRENT_KB) KEYMAP=$$(CURRENT_KM) REQUIRE_PLATFORM_KEY=$$(REQUIRE_PLATFORM_KEY)
+    MAKE_VARS := KEYBOARD=$$(CURRENT_KB) KEYMAP=$$(CURRENT_KM) REQUIRE_PLATFORM_KEY=$$(REQUIRE_PLATFORM_KEY) QMK_BIN=$$(QMK_BIN)
    # And the first part of the make command
    MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk $$(MAKE_TARGET)
    # The message to display
@@ -501,8 +508,8 @@ endef
 %:
        # Check if we have the CMP tool installed
        cmp $(ROOT_DIR)/Makefile $(ROOT_DIR)/Makefile >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi;
-        # Ensure that bin/qmk works.
+        # Ensure that $(QMK_BIN) works.
-        if ! bin/qmk hello 1> /dev/null 2>&1; then printf "$(MSG_PYTHON_MISSING)"; exit 1; fi
+        if ! $(QMK_BIN) hello 1> /dev/null 2>&1; then printf "$(MSG_PYTHON_MISSING)"; exit 1; fi
        # Check if the submodules are dirty, and display a warning if they are
 ifndef SKIP_GIT
        if [ ! -e lib/chibios ]; then git submodule sync lib/chibios && git submodule update --depth 50 --init lib/chibios; fi
diff --git a/bin/qmk b/bin/qmk
index a3c1be328..a2af2951c 100755
--- a/bin/qmk
+++ b/bin/qmk
@@ -73,8 +73,11 @@ def main():
    """
    # Change to the root of our checkout
    os.environ['ORIG_CWD'] = os.getcwd()
+    os.environ['DEPRECATED_BIN_QMK'] = '1'
    os.chdir(qmk_dir)
+    print('Warning: The bin/qmk script is being deprecated. Please install the QMK CLI: python3 -m pip install qmk', file=sys.stderr)
    # Import the subcommands
    import qmk.cli  # noqa
diff --git a/bootloader.mk b/bootloader.mk
index fd76446e9..ead52cbe3 100644
--- a/bootloader.mk
+++ b/bootloader.mk
@@ -137,3 +137,6 @@ ifeq ($(strip $(BOOTLOADER)), stm32duino)
    DFU_ARGS = -d 1EAF:0003 -a 2 -R
    DFU_SUFFIX_ARGS = -v 1EAF -p 0003
 endif
+ifeq ($(strip $(BOOTLOADER)), tinyuf2)
+    OPT_DEFS += -DBOOTLOADER_TINYUF2
+endif
diff --git a/build_json.mk b/build_json.mk
index 6e2f9c4c8..8822be6a1 100644
--- a/build_json.mk
+++ b/build_json.mk
@@ -28,4 +28,4 @@ endif
 # Generate the keymap.c
 $(KEYBOARD_OUTPUT)/src/keymap.c: $(KEYMAP_JSON)
-        bin/qmk json2c --quiet --output $(KEYMAP_C) $(KEYMAP_JSON)
+        $(QMK_BIN) json2c --quiet --output $(KEYMAP_C) $(KEYMAP_JSON)
diff --git a/build_keyboard.mk b/build_keyboard.mk
index 366d1f5d2..74046a094 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -12,6 +12,9 @@ endif
 include common.mk
+# Set the qmk cli to use
+QMK_BIN ?= qmk
 # Set the filename for the final firmware binary
 KEYBOARD_FILESAFE := $(subst /,_,$(KEYBOARD))
 TARGET ?= $(KEYBOARD_FILESAFE)_$(KEYMAP)
@@ -97,7 +100,7 @@ MAIN_KEYMAP_PATH_4 := $(KEYBOARD_PATH_4)/keymaps/$(KEYMAP)
 MAIN_KEYMAP_PATH_5 := $(KEYBOARD_PATH_5)/keymaps/$(KEYMAP)
 # Pull in rules from info.json
-INFO_RULES_MK = $(shell bin/qmk generate-rules-mk --quiet --escape --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/rules.mk)
+INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/rules.mk)
 include $(INFO_RULES_MK)
 # Check for keymap.json first, so we can regenerate keymap.c
@@ -294,10 +297,10 @@ endif
 CONFIG_H += $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/layouts.h
 $(KEYBOARD_OUTPUT)/src/info_config.h: $(INFO_JSON_FILES)
-        bin/qmk generate-config-h --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/info_config.h
+        $(QMK_BIN) generate-config-h --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/info_config.h
 $(KEYBOARD_OUTPUT)/src/layouts.h: $(INFO_JSON_FILES)
-        bin/qmk generate-layouts --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/layouts.h
+        $(QMK_BIN) generate-layouts --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/layouts.h
 generated-files: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/layouts.h
diff --git a/common_features.mk b/common_features.mk
index 8c9d0a90c..5a1231de4 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -223,14 +223,17 @@ VALID_LED_MATRIX_TYPES := IS31FL3731 custom
 ifeq ($(strip $(LED_MATRIX_ENABLE)), yes)
    ifeq ($(filter $(LED_MATRIX_DRIVER),$(VALID_LED_MATRIX_TYPES)),)
-        $(error LED_MATRIX_DRIVER="$(LED_MATRIX_DRIVER)" is not a valid matrix type)
+        $(error "$(LED_MATRIX_DRIVER)" is not a valid matrix type)
-    else
-        BACKLIGHT_ENABLE = yes
-        BACKLIGHT_DRIVER = custom
-        OPT_DEFS += -DLED_MATRIX_ENABLE
-        SRC += $(QUANTUM_DIR)/led_matrix.c
-        SRC += $(QUANTUM_DIR)/led_matrix_drivers.c
    endif
+    OPT_DEFS += -DLED_MATRIX_ENABLE
+ifneq (,$(filter $(MCU), atmega16u2 atmega32u2 at90usb162))
+    # ATmegaxxU2 does not have hardware MUL instruction - lib8tion must be told to use software multiplication routines
+    OPT_DEFS += -DLIB8_ATTINY
+endif
+    SRC += $(QUANTUM_DIR)/process_keycode/process_backlight.c
+    SRC += $(QUANTUM_DIR)/led_matrix.c
+    SRC += $(QUANTUM_DIR)/led_matrix_drivers.c
+    CIE1931_CURVE := yes
    ifeq ($(strip $(LED_MATRIX_DRIVER)), IS31FL3731)
        OPT_DEFS += -DIS31FL3731 -DSTM32_I2C -DHAL_USE_I2C=TRUE
@@ -422,10 +425,6 @@ ifeq ($(strip $(TERMINAL_ENABLE)), yes)
    OPT_DEFS += -DUSER_PRINT
 endif
-ifeq ($(strip $(USB_HID_ENABLE)), yes)
-    include $(TMK_DIR)/protocol/usb_hid.mk
-endif
 ifeq ($(strip $(WPM_ENABLE)), yes)
    SRC += $(QUANTUM_DIR)/wpm.c
    OPT_DEFS += -DWPM_ENABLE
@@ -459,6 +458,23 @@ ifeq ($(strip $(DIP_SWITCH_ENABLE)), yes)
    SRC += $(QUANTUM_DIR)/dip_switch.c
 endif
+VALID_MAGIC_TYPES := yes full lite
+BOOTMAGIC_ENABLE ?= no
+ifneq ($(strip $(BOOTMAGIC_ENABLE)), no)
+  ifeq ($(filter $(BOOTMAGIC_ENABLE),$(VALID_MAGIC_TYPES)),)
+    $(error BOOTMAGIC_ENABLE="$(BOOTMAGIC_ENABLE)" is not a valid type of magic)
+  endif
+  ifneq ($(strip $(BOOTMAGIC_ENABLE)), full)
+      OPT_DEFS += -DBOOTMAGIC_LITE
+      QUANTUM_SRC += $(QUANTUM_DIR)/bootmagic/bootmagic_lite.c
+  else
+    OPT_DEFS += -DBOOTMAGIC_ENABLE
+    QUANTUM_SRC += $(QUANTUM_DIR)/bootmagic/bootmagic_full.c
+  endif
+endif
+COMMON_VPATH += $(QUANTUM_DIR)/bootmagic
+QUANTUM_SRC += $(QUANTUM_DIR)/bootmagic/magic.c
 VALID_CUSTOM_MATRIX_TYPES:= yes lite no
 CUSTOM_MATRIX ?= no
@@ -673,4 +689,4 @@ ifeq ($(strip $(USBPD_ENABLE)), yes)
            # Board designers can add their own driver to $(SRC)
        endif
    endif
-endif
-\ No newline at end of file
+endif
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index ec03a8828..99121d79e 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -25,7 +25,7 @@
        },
        "processor": {
            "type": "string",
-            "enum": ["cortex-m0", "cortex-m0plus", "cortex-m3", "cortex-m4", "MKL26Z64", "MK20DX128", "MK20DX256", "STM32F042", "STM32F072", "STM32F103", "STM32F303", "STM32F401", "STM32F411", "STM32G431", "STM32G474", "atmega16u2", "atmega32u2", "atmega16u4", "atmega32u4", "at90usb162", "at90usb646", "at90usb647", "at90usb1286", "at90usb1287", "atmega32a", "atmega328p", "atmega328", "attiny85", "unknown"]
+            "enum": ["cortex-m0", "cortex-m0plus", "cortex-m3", "cortex-m4", "MKL26Z64", "MK20DX128", "MK20DX256", "MK66F18", "STM32F042", "STM32F072", "STM32F103", "STM32F303", "STM32F401", "STM32F411", "STM32F446", "STM32G431", "STM32G474", "atmega16u2", "atmega32u2", "atmega16u4", "atmega32u4", "at90usb162", "at90usb646", "at90usb647", "at90usb1286", "at90usb1287", "atmega32a", "atmega328p", "atmega328", "attiny85", "unknown"]
        },
        "board": {
            "type": "string",
@@ -34,7 +34,7 @@
        },
        "bootloader": {
            "type": "string",
-            "enum": ["atmel-dfu", "bootloadHID", "caterina", "halfkay", "kiibohd", "lufa-dfu", "lufa-ms", "micronucleus", "qmk-dfu", "stm32-dfu", "stm32duino", "unknown", "USBasp"]
+            "enum": ["atmel-dfu", "bootloadHID", "caterina", "halfkay", "kiibohd", "lufa-dfu", "lufa-ms", "micronucleus", "qmk-dfu", "stm32-dfu", "stm32duino", "unknown", "USBasp", "tinyuf2"]
        },
        "diode_direction": {
            "type": "string",
diff --git a/docs/ChangeLog/20210529/PR12172.md b/docs/ChangeLog/20210529/PR12172.md
new file mode 100644
index 000000000..0c355c151
--- /dev/null
+++ b/docs/ChangeLog/20210529/PR12172.md
@@ -0,0 +1,13 @@
+## Bootmagic Deprecation and Refactor ([#12172](https://github.com/qmk/qmk_firmware/pull/12172))
+QMK has decided to deprecate the full Bootmagic feature and leave Bootmagic Lite as the only remaining option.
+This pull request changes the behavior of `BOOTMAGIC_ENABLE` such that specifying `BOOTMAGIC_ENABLE = yes` enables Bootmagic Lite instead of full Bootmagic.
+### Tentative Deprecation Schedule
+This is the current planned roadmap for the behavior of `BOOTMAGIC_ENABLE`:
+- From 2021-05-29, setting `BOOTMAGIC_ENABLE = yes` will enable Bootmagic Lite instead of full Bootmagic.
+- From 2021-08-28, `BOOTMAGIC_ENABLE` must be either `yes`, `lite`, or `no` – setting `BOOTMAGIC_ENABLE = full` will cause compilation to fail.
+- From 2021-11-27, `BOOTMAGIC_ENABLE` must be either `yes` or `no` – setting `BOOTMAGIC_ENABLE = lite` will cause compilation to fail.
diff --git a/docs/adc_driver.md b/docs/adc_driver.md
index 6e3d51386..69fff4b3c 100644
--- a/docs/adc_driver.md
+++ b/docs/adc_driver.md
@@ -47,73 +47,79 @@ Note that some of these pins are doubled-up on ADCs with the same channel. This
 Also note that the F0 and F3 use different numbering schemes. The F0 has a single ADC and the channels are 0-indexed, whereas the F3 has 4 ADCs and the channels are 1-indexed. This is because the F0 uses the `ADCv1` implementation of the ADC, whereas the F3 uses the `ADCv3` implementation.
-|ADC|Channel|STM32F0xx|STM32F3xx|
+|ADC|Channel|STM32F0xx|STM32F1xx|STM32F3xx|STM32F4xx|
-|---|-------|---------|---------|
+|---|-------|---------|---------|---------|---------|
-|1  |0      |`A0`     |         |
+|1  |0      |`A0`     |`A0`     |         |`A0`     |
-|1  |1      |`A1`     |`A0`     |
+|1  |1      |`A1`     |`A1`     |`A0`     |`A1`     |
-|1  |2      |`A2`     |`A1`     |
+|1  |2      |`A2`     |`A2`     |`A1`     |`A2`     |
-|1  |3      |`A3`     |`A2`     |
+|1  |3      |`A3`     |`A3`     |`A2`     |`A3`     |
-|1  |4      |`A4`     |`A3`     |
+|1  |4      |`A4`     |`A4`     |`A3`     |`A4`     |
-|1  |5      |`A5`     |`F4`     |
+|1  |5      |`A5`     |`A5`     |`F4`     |`A5`     |
-|1  |6      |`A6`     |`C0`     |
+|1  |6      |`A6`     |`A6`     |`C0`     |`A6`     |
-|1  |7      |`A7`     |`C1`     |
+|1  |7      |`A7`     |`A7`     |`C1`     |`A7`     |
-|1  |8      |`B0`     |`C2`     |
+|1  |8      |`B0`     |`B0`     |`C2`     |`B0`     |
-|1  |9      |`B1`     |`C3`     |
+|1  |9      |`B1`     |`B1`     |`C3`     |`B1`     |
-|1  |10     |`C0`     |`F2`     |
+|1  |10     |`C0`     |`C0`     |`F2`     |`C0`     |
-|1  |11     |`C1`     |         |
+|1  |11     |`C1`     |`C1`     |         |`C1`     |
-|1  |12     |`C2`     |         |
+|1  |12     |`C2`     |`C2`     |         |`C2`     |
-|1  |13     |`C3`     |         |
+|1  |13     |`C3`     |`C3`     |         |`C3`     |
-|1  |14     |`C4`     |         |
+|1  |14     |`C4`     |`C4`     |         |`C4`     |
-|1  |15     |`C5`     |         |
+|1  |15     |`C5`     |`C5`     |         |`C5`     |
-|1  |16     |         |         |
+|1  |16     |         |         |         |         |
-|2  |1      |         |`A4`     |
+|2  |0      |         |`A0`¹    |         |`A0`²    |
-|2  |2      |         |`A5`     |
+|2  |1      |         |`A1`¹    |`A4`     |`A1`²    |
-|2  |3      |         |`A6`     |
+|2  |2      |         |`A2`¹    |`A5`     |`A2`²    |
-|2  |4      |         |`A7`     |
+|2  |3      |         |`A3`¹    |`A6`     |`A3`²    |
-|2  |5      |         |`C4`     |
+|2  |4      |         |`A4`¹    |`A7`     |`A4`²    |
-|2  |6      |         |`C0`     |
+|2  |5      |         |`A5`¹    |`C4`     |`A5`²    |
-|2  |7      |         |`C1`     |
+|2  |6      |         |`A6`¹    |`C0`     |`A6`²    |
-|2  |8      |         |`C2`     |
+|2  |7      |         |`A7`¹    |`C1`     |`A7`²    |
-|2  |9      |         |`C3`     |
+|2  |8      |         |`B0`¹    |`C2`     |`B0`²    |
-|2  |10     |         |`F2`     |
+|2  |9      |         |`B1`¹    |`C3`     |`B1`²    |
-|2  |11     |         |`C5`     |
+|2  |10     |         |`C0`¹    |`F2`     |`C0`²    |
-|2  |12     |         |`B2`     |
+|2  |11     |         |`C1`¹    |`C5`     |`C1`²    |
-|2  |13     |         |         |
+|2  |12     |         |`C2`¹    |`B2`     |`C2`²    |
-|2  |14     |         |         |
+|2  |13     |         |`C3`¹    |         |`C3`²    |
-|2  |15     |         |         |
+|2  |14     |         |`C4`¹    |         |`C4`²    |
-|2  |16     |         |         |
+|2  |15     |         |`C5`¹    |         |`C5`²    |
-|3  |1      |         |`B1`     |
+|2  |16     |         |         |         |         |
-|3  |2      |         |`E9`     |
+|3  |0      |         |`A0`¹    |         |`A0`²    |
-|3  |3      |         |`E13`    |
+|3  |1      |         |`A1`¹    |`B1`     |`A1`²    |
-|3  |4      |         |         |
+|3  |2      |         |`A2`¹    |`E9`     |`A2`²    |
-|3  |5      |         |         |
+|3  |3      |         |`A3`¹    |`E13`    |`A3`²    |
-|3  |6      |         |`E8`     |
+|3  |4      |         |`F6`¹    |         |`F6`²    |
-|3  |7      |         |`D10`    |
+|3  |5      |         |`F7`¹    |`B13`    |`F7`²    |
-|3  |8      |         |`D11`    |
+|3  |6      |         |`F8`¹    |`E8`     |`F8`²    |
-|3  |9      |         |`D12`    |
+|3  |7      |         |`F9`¹    |`D10`    |`F9`²    |
-|3  |10     |         |`D13`    |
+|3  |8      |         |`F10`¹   |`D11`    |`F10`²   |
-|3  |11     |         |`D14`    |
+|3  |9      |         |         |`D12`    |`F3`²    |
-|3  |12     |         |`B0`     |
+|3  |10     |         |`C0`¹    |`D13`    |`C0`²    |
-|3  |13     |         |`E7`     |
+|3  |11     |         |`C1`¹    |`D14`    |`C1`²    |
-|3  |14     |         |`E10`    |
+|3  |12     |         |`C2`¹    |`B0`     |`C2`²    |
-|3  |15     |         |`E11`    |
+|3  |13     |         |`C3`¹    |`E7`     |`C3`²    |
-|3  |16     |         |`E12`    |
+|3  |14     |         |         |`E10`    |`F4`²    |
-|4  |1      |         |`E14`    |
+|3  |15     |         |         |`E11`    |`F5`²    |
-|4  |2      |         |`B12`    |
+|3  |16     |         |         |`E12`    |         |
-|4  |3      |         |`B13`    |
+|4  |1      |         |         |`E14`    |         |
-|4  |4      |         |`B14`    |
+|4  |2      |         |         |`E15`    |         |
-|4  |5      |         |`B15`    |
+|4  |3      |         |         |`B12`    |         |
-|4  |6      |         |`E8`     |
+|4  |4      |         |         |`B14`    |         |
-|4  |7      |         |`D10`    |
+|4  |5      |         |         |`B15`    |         |
-|4  |8      |         |`D11`    |
+|4  |6      |         |         |`E8`     |         |
-|4  |9      |         |`D12`    |
+|4  |7      |         |         |`D10`    |         |
-|4  |10     |         |`D13`    |
+|4  |8      |         |         |`D11`    |         |
-|4  |11     |         |`D14`    |
+|4  |9      |         |         |`D12`    |         |
-|4  |12     |         |`D8`     |
+|4  |10     |         |         |`D13`    |         |
-|4  |13     |         |`D9`     |
+|4  |11     |         |         |`D14`    |         |
-|4  |14     |         |         |
+|4  |12     |         |         |`D8`     |         |
-|4  |15     |         |         |
+|4  |13     |         |         |`D9`     |         |
-|4  |16     |         |         |
+|4  |14     |         |         |         |         |
+|4  |15     |         |         |         |         |
+|4  |16     |         |         |         |         |
+<sup>¹ As of ChibiOS 20.3.4, the ADC driver for STM32F1xx devices supports only ADC1, therefore any configurations involving ADC2 or ADC3 cannot actually be used. In particular, pins `F6`…`F10`, which are present at least on some STM32F103x[C-G] devices, cannot be used as ADC inputs because of this driver limitation.</sup>
+<sup>² Not all STM32F4xx devices have ADC2 and/or ADC3, therefore some configurations shown in this table may be unavailable; in particular, pins `F4`…`F10` cannot be used as ADC inputs on devices which do not have ADC3. Check the device datasheet to confirm which pin functions are supported.</sup>
 ## Functions
@@ -141,10 +147,10 @@ Also note that the F0 and F3 use different numbering schemes. The F0 has a singl
 The ARM implementation of the ADC has a few additional options that you can override in your own keyboards and keymaps to change how it operates. Please consult the corresponding `hal_adc_lld.h` in ChibiOS for your specific microcontroller for further documentation on your available options.
-|`#define`            |Type  |Default              |Description                                                                                                                                                                                                 |
+|`#define`            |Type  |Default                                       |Description                                                                                                                                                                                                 |
-|---------------------|------|---------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+|---------------------|------|----------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-|`ADC_CIRCULAR_BUFFER`|`bool`|`false`              |If `true`, then the implementation will use a circular buffer.                                                                                                                                              |
+|`ADC_CIRCULAR_BUFFER`|`bool`|`false`                                       |If `true`, then the implementation will use a circular buffer.                                                                                                                                              |
-|`ADC_NUM_CHANNELS`   |`int` |`1`                  |Sets the number of channels that will be scanned as part of an ADC operation. The current implementation only supports `1`.                                                                                 |
+|`ADC_NUM_CHANNELS`   |`int` |`1`                                           |Sets the number of channels that will be scanned as part of an ADC operation. The current implementation only supports `1`.                                                                                 |
-|`ADC_BUFFER_DEPTH`   |`int` |`2`                  |Sets the depth of each result. Since we are only getting a 12-bit result by default, we set this to 2 bytes so we can contain our one value. This could be set to 1 if you opt for an 8-bit or lower result.|
+|`ADC_BUFFER_DEPTH`   |`int` |`2`                                           |Sets the depth of each result. Since we are only getting a 10-bit result by default, we set this to 2 bytes so we can contain our one value. This could be set to 1 if you opt for an 8-bit or lower result.|
-|`ADC_SAMPLING_RATE`  |`int` |`ADC_SMPR_SMP_1P5`   |Sets the sampling rate of the ADC. By default, it is set to the fastest setting.                                                                                                                            |
+|`ADC_SAMPLING_RATE`  |`int` |`ADC_SMPR_SMP_1P5`                            |Sets the sampling rate of the ADC. By default, it is set to the fastest setting.                                                                                                                            |
-|`ADC_RESOLUTION`     |`int` |`ADC_CFGR1_RES_12BIT`|The resolution of your result. We choose 12 bit by default, but you can opt for 12, 10, 8, or 6 bit.                                                                                                        |
+|`ADC_RESOLUTION`     |`int` |`ADC_CFGR1_RES_10BIT` or `ADC_CFGR_RES_10BITS`|The resolution of your result. We choose 10 bit by default, but you can opt for 12, 10, 8, or 6 bit. Different MCUs use slightly different names for the resolution constants.                              |
diff --git a/docs/compatible_microcontrollers.md b/docs/compatible_microcontrollers.md
index 47a4844e7..5e16ab277 100644
--- a/docs/compatible_microcontrollers.md
+++ b/docs/compatible_microcontrollers.md
@@ -28,6 +28,7 @@ You can also use any ARM chip with USB that [ChibiOS](https://www.chibios.org) s
 * [STM32F303](https://www.st.com/en/microcontrollers-microprocessors/stm32f303.html)
 * [STM32F401](https://www.st.com/en/microcontrollers-microprocessors/stm32f401.html)
 * [STM32F411](https://www.st.com/en/microcontrollers-microprocessors/stm32f411.html)
+ * [STM32F446](https://www.st.com/en/microcontrollers-microprocessors/stm32f446.html)
 * [STM32G431](https://www.st.com/en/microcontrollers-microprocessors/stm32g4x1.html)
 * [STM32G474](https://www.st.com/en/microcontrollers-microprocessors/stm32g4x4.html)
diff --git a/docs/feature_auto_shift.md b/docs/feature_auto_shift.md
index 8e04d9dd3..ec7eeaaa0 100644
--- a/docs/feature_auto_shift.md
+++ b/docs/feature_auto_shift.md
@@ -109,6 +109,33 @@ Do not Auto Shift numeric keys, zero through nine.
 Do not Auto Shift alpha characters, which include A through Z.
+### Auto Shift Per Key 
+This is a function that allows you to determine which keys shold be autoshifted, much like the tap-hold keys. 
+The default function looks like this: 
+```c
+bool get_auto_shifted_key(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+#    ifndef NO_AUTO_SHIFT_ALPHA
+        case KC_A ... KC_Z:
+#    endif
+#    ifndef NO_AUTO_SHIFT_NUMERIC
+        case KC_1 ... KC_0:
+#    endif
+#    ifndef NO_AUTO_SHIFT_SPECIAL
+        case KC_TAB:
+        case KC_MINUS ... KC_SLASH:
+        case KC_NONUS_BSLASH:
+#    endif
+            return true;
+    }
+    return false;
+}
+```
+This functionality is enabled by default, and does not need a define.
 ### AUTO_SHIFT_REPEAT (simple define)
 Enables keyrepeat.
diff --git a/docs/feature_leader_key.md b/docs/feature_leader_key.md
index 41ff8f1a4..f10bca758 100644
--- a/docs/feature_leader_key.md
+++ b/docs/feature_leader_key.md
@@ -72,6 +72,19 @@ SEQ_THREE_KEYS(KC_C, KC_C, KC_C) {
 }
 ```
+## Infinite Leader key timeout
+Sometimes your leader key is not on a comfortable places as the rest of keys on your sequence. Imagine that your leader key is one of your outer top right keys, you may need to reposition your hand just to reach your leader key.
+This can make typing the entire sequence on time hard even if you are able to type most of the sequence fast. For example, if your sequence is `Leader + asd` typing `asd` fast is very easy once you have your hands in your home row. However starting the sequence in time after moving your hand out of the home row to reach the leader key and back is not.
+To remove the stress this situation produces to your hands you can enable an infinite timeout just for the leader key. This mean that, after you hit the leader key you will have an infinite amount of time to start the rest of the sequence, allowing you to proper position your hands on the best position to type the rest of the sequence comfortably.
+This infinite timeout only affects the leader key, so in our previous example of `Leader + asd` you will have an infinite amount of time between `Leader` and `a`, but once you start the sequence the timeout you have configured (global or per key) will work normally.
+This way you can configure a very short `LEADER_TIMEOUT` but still have plenty of time to position your hands.
+In order to enable this, place this in your `config.h`:
+```c
+#define LEADER_NO_TIMEOUT
+```
 ## Strict Key Processing
 By default, the Leader Key feature will filter the keycode out of [`Mod-Tap`](mod_tap.md) and [`Layer Tap`](feature_layers.md#switching-and-toggling-layers) functions when checking for the Leader sequences. That means if you're using `LT(3, KC_A)`, it will pick this up as `KC_A` for the sequence, rather than `LT(3, KC_A)`, giving a more expected behavior for newer users.
diff --git a/docs/feature_led_matrix.md b/docs/feature_led_matrix.md
index f4a661634..ac2be2e77 100644
--- a/docs/feature_led_matrix.md
+++ b/docs/feature_led_matrix.md
@@ -79,7 +79,7 @@ Custom layer effects can be done by defining this in your `<keyboard>.c`:
 ```c
 void led_matrix_indicators_kb(void) {
-    led_matrix_set_index_value(index, value);
+    led_matrix_set_value(index, value);
 }
 ```
diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index e996caddd..046b1f17f 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -447,6 +447,8 @@ These are defined in [`rgblight_list.h`](https://github.com/qmk/qmk_firmware/blo
 #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set
 #define RGB_MATRIX_STARTUP_SPD 127 // Sets the default animation speed, if none has been set
 #define RGB_MATRIX_DISABLE_KEYCODES // disables control of rgb matrix by keycodes (must use code functions to control the feature)
+#define RGB_MATRIX_SPLIT { X, Y }       // (Optional) For split keyboards, the number of LEDs connected on each half. X = left, Y = Right.
+                                        // If RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is enabled, you also will want to enable SPLIT_TRANSPORT_MIRROR
 ```
 ## EEPROM storage :id=eeprom-storage
diff --git a/docs/feature_rgblight.md b/docs/feature_rgblight.md
index d2612a6d1..8e8d6b81c 100644
--- a/docs/feature_rgblight.md
+++ b/docs/feature_rgblight.md
@@ -74,6 +74,7 @@ Changing the **Value** sets the overall brightness.<br>
 |`RGB_MODE_XMAS`    |`RGB_M_X` |Christmas animation mode                                            |
 |`RGB_MODE_GRADIENT`|`RGB_M_G` |Static gradient animation mode                                      |
 |`RGB_MODE_RGBTEST` |`RGB_M_T` |Red, Green, Blue test animation mode                                |
+|`RGB_MODE_TWINKLE` |`RGB_M_TW`|Twinkle animation mode                                              |
 !> By default, if you have both the RGB Light and the [RGB Matrix](feature_rgb_matrix.md) feature enabled, these keycodes will work for both features, at the same time. You can disable the keycode functionality by defining the `*_DISABLE_KEYCODES` option for the specific feature.
diff --git a/docs/feature_wpm.md b/docs/feature_wpm.md
index 12dd08057..c8ec3a7f3 100644
--- a/docs/feature_wpm.md
+++ b/docs/feature_wpm.md
@@ -1,25 +1,62 @@
 # Word Per Minute (WPM) Calculcation
-The WPM feature uses time between keystrokes to compute a rolling average words
+The WPM feature uses time between keystrokes to compute a rolling average words per minute rate and makes this available for various uses.
-per minute rate and makes this available for various uses.
 Enable the WPM system by adding this to your `rules.mk`:
    WPM_ENABLE = yes
-For split keyboards using soft serial, the computed WPM
+For split keyboards using soft serial, the computed WPM score will be available on the master AND slave half.
-score will be available on the master AND slave half.
-## Public Functions
+## Configuration
-`uint8_t get_current_wpm(void);`
-This function returns the current WPM as an unsigned integer.
+|Define                       |Default       | Description                                                                              |
+|-----------------------------|--------------|------------------------------------------------------------------------------------------|
+|`WPM_SMOOTHING`              |`0.0487`      | Sets the smoothing to about 40 keystrokes                                                |
+|`WPM_ESTIMATED_WORD_SIZE`    |`5`           | This is the value used when estimating average word size (for regression and normal use) |
+|`WPM_ALLOW_COUNT_REGRESSOIN` |_Not defined_ | If defined allows the WPM to be decreased when hitting Delete or Backspace               |
+## Public Functions
-## Customized keys for WPM calc
+|Function                  |Description                                       |
+|--------------------------|--------------------------------------------------|
-By default, the WPM score only includes letters, numbers, space and some
+|`get_current_wpm(void)`   | Returns the current WPM as a value between 0-255 |
-punctuation.  If you want to change the set of characters considered as part of
+|`set_current_wpm(x)`      | Sets the current WPM to `x` (between 0-255)      |
-the WPM calculation, you can implement `wpm_keycode_user(uint16_t keycode)`
-and return true for any characters you would like included in the calculation,
+## Callbacks
-or false to not count that particular keycode.
+By default, the WPM score only includes letters, numbers, space and some punctuation.  If you want to change the set of characters considered as part of the WPM calculation, you can implement your own `bool wpm_keycode_user(uint16_t keycode)` and return true for any characters you would like included in the calculation, or false to not count that particular keycode.
+For instance, the default is:
+```c
+bool wpm_keycode_user(uint16_t keycode) {
+    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX) || (keycode >= QK_MODS && keycode <= QK_MODS_MAX)) {
+        keycode = keycode & 0xFF;
+    } else if (keycode > 0xFF) {
+        keycode = 0;
+    }
+    if ((keycode >= KC_A && keycode <= KC_0) || (keycode >= KC_TAB && keycode <= KC_SLASH)) {
+        return true;
+    }
+    return false;
+}
+```
+Additionally, if `WPM_ALLOW_COUNT_REGRESSION` is defined, there is the `uint8_t wpm_regress_count(uint16_t keycode)` function that allows you to decrease the WPM. This is useful if you want to be able to penalize certain keycodes (or even combinations). 
+__attribute__((weak)) uint8_t wpm_regress_count(uint16_t keycode) {
+    bool weak_modded = (keycode >= QK_LCTL && keycode < QK_LSFT) || (keycode >= QK_RCTL && keycode < QK_RSFT);
+    
+    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX) || (keycode >= QK_MODS && keycode <= QK_MODS_MAX)) {
+        keycode = keycode & 0xFF;
+    } else if (keycode > 0xFF) {
+        keycode = 0;
+    }
+    if (((get_mods() | get_oneshot_mods()) & MOD_MASK_CTRL} || weak_modded) && (keycode == KC_DEL || keycode == KC_BSPC)) {
+        return WPM_ESTIMATED_WORD_SIZE;
+    }
+    if (keycode == KC_DEL || keycode == KC_BSPC) {
+        return 1;
+    }
+}
diff --git a/docs/flashing.md b/docs/flashing.md
index 7804a6bad..83c97444e 100644
--- a/docs/flashing.md
+++ b/docs/flashing.md
@@ -249,3 +249,29 @@ Flashing sequence:
 2. Wait for the OS to detect the device
 3. Flash a .bin file
 4. Reset the device into application mode (may be done automatically)
+## tinyuf2
+Keyboards may opt into supporting the tinyuf2 bootloader. This is currently only supported on the F411 blackpill.
+The `rules.mk` setting for this bootloader is `tinyuf2`, and can be specified at the keymap or user level.
+To ensure compatibility with the tinyuf2 bootloader, make sure this block is present in your `rules.mk`:
+```make
+# Bootloader selection
+BOOTLOADER = tinyuf2
+```
+Compatible flashers:
+* Any application able to copy a file from one place to another, such as _macOS Finder_ or _Windows Explorer_.
+Flashing sequence:
+1. Enter the bootloader using any of the following methods:
+    * Tap the `RESET` keycode
+    * Double-tap the `nRST` button on the PCB.
+2. Wait for the OS to detect the device
+3. Copy the .uf2 file to the new USB disk
+4. Wait for the keyboard to become available
diff --git a/docs/ja/compatible_microcontrollers.md b/docs/ja/compatible_microcontrollers.md
index fdd11f14f..69da70f2c 100644
--- a/docs/ja/compatible_microcontrollers.md
+++ b/docs/ja/compatible_microcontrollers.md
@@ -33,6 +33,7 @@ QMK は十分な容量のフラッシュメモリを備えた USB 対応 AVR ま
 * [STM32F303](https://www.st.com/en/microcontrollers-microprocessors/stm32f303.html)
 * [STM32F401](https://www.st.com/en/microcontrollers-microprocessors/stm32f401.html)
 * [STM32F411](https://www.st.com/en/microcontrollers-microprocessors/stm32f411.html)
+* [STM32F446](https://www.st.com/en/microcontrollers-microprocessors/stm32f446.html)
 * [STM32G431](https://www.st.com/en/microcontrollers-microprocessors/stm32g4x1.html)
 * [STM32G474](https://www.st.com/en/microcontrollers-microprocessors/stm32g4x4.html)
diff --git a/docs/ja/feature_led_matrix.md b/docs/ja/feature_led_matrix.md
index b73487ca6..62e22859f 100644
--- a/docs/ja/feature_led_matrix.md
+++ b/docs/ja/feature_led_matrix.md
@@ -76,7 +76,7 @@ I2C IS31FL3731 RGB コントローラを使ったアドレス指定可能な LED
 カスタムレイヤー効果は `<keyboard>.c` 内で以下を定義することで行うことができます:
    void led_matrix_indicators_kb(void) {
-    led_matrix_set_index_value(index, value);
+    led_matrix_set_value(index, value);
    }
 同様の関数がキーマップ内で `led_matrix_indicators_user` として動作します。
diff --git a/docs/keycodes.md b/docs/keycodes.md
index 9acf8b683..f3c519b13 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -516,6 +516,9 @@ See also: [One Shot Keys](one_shot_keys.md)
 |------------|----------------------------------|
 |`OSM(mod)`  |Hold `mod` for one keypress       |
 |`OSL(layer)`|Switch to `layer` for one keypress|
+|`OS_ON`     |Turns One Shot keys on            |
+|`OS_OFF`    |Turns One Shot keys off           |
+|`OS_TOGG`   |Toggles One Shot keys status      |
 ## Space Cadet :id=space-cadet
diff --git a/docs/one_shot_keys.md b/docs/one_shot_keys.md
index 9a082d7d6..9fc548629 100644
--- a/docs/one_shot_keys.md
+++ b/docs/one_shot_keys.md
@@ -17,6 +17,9 @@ You can control the behavior of one shot keys by defining these in `config.h`:
 * `OSM(mod)` - Momentarily hold down *mod*. You must use the `MOD_*` keycodes as shown in [Mod Tap](mod_tap.md), not the `KC_*` codes.
 * `OSL(layer)` - momentary switch to *layer*.
+* `OS_ON` - Turns on One Shot keys.
+* `OS_OFF` - Turns off One Shot keys. OSM act as regular mod keys, OSL act like `MO`.
+* `ON_TOGG` - Toggles the one shot key status.
 Sometimes, you want to activate a one-shot key as part of a macro or tap dance routine.  
diff --git a/docs/ws2812_driver.md b/docs/ws2812_driver.md
index cca6827ec..e69400364 100644
--- a/docs/ws2812_driver.md
+++ b/docs/ws2812_driver.md
@@ -77,6 +77,25 @@ Configure the hardware via your config.h:
 You must also turn on the SPI feature in your halconf.h and mcuconf.h
+#### Circular Buffer Mode
+Some boards may flicker while in the normal buffer mode. To fix this issue, circular buffer mode may be used to rectify the issue. 
+By default, the circular buffer mode is disabled.
+To enable this alternative buffer mode, place this into your `config.h` file:
+```c
+#define WS2812_SPI_USE_CIRCULAR_BUFFER
+```
+#### Setting baudrate with divisor
+To adjust the baudrate at which the SPI peripheral is configured, users will need to derive the target baudrate from the clock tree provided by STM32CubeMX.
+Only divisors of 2, 4, 8, 16, 32, 64, 128 and 256 are supported by hardware.
+|Define              |Default|Description                          |
+|--------------------|-------|-------------------------------------|
+|`WS2812_SPI_DIVISOR`|`16`   |SPI source clock peripheral divisor  |
 #### Testing Notes
 While not an exhaustive list, the following table provides the scenarios that have been partially validated:
@@ -102,11 +121,14 @@ Configure the hardware via your config.h:
 #define WS2812_PWM_DRIVER PWMD2  // default: PWMD2
 #define WS2812_PWM_CHANNEL 2  // default: 2
 #define WS2812_PWM_PAL_MODE 2  // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
+//#define WS2812_PWM_COMPLEMENTARY_OUTPUT // Define for a complementary timer output (TIMx_CHyN); omit for a normal timer output (TIMx_CHy).
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM2  // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
 #define WS2812_DMA_CHANNEL 2  // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
 #define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM2_UP // DMAMUX configuration for TIMx_UP -- only required if your MCU has a DMAMUX peripheral, see the respective reference manual for the appropriate values for your MCU.
 ```
+Note that using a complementary timer output (TIMx_CHyN) is possible only for advanced-control timers (TIM1, TIM8, TIM20 on STM32), and the `STM32_PWM_USE_ADVANCED` option in mcuconf.h must be set to `TRUE`.  Complementary outputs of general-purpose timers are not supported due to ChibiOS limitations.
 You must also turn on the PWM feature in your halconf.h and mcuconf.h
 #### Testing Notes
diff --git a/drivers/chibios/analog.c b/drivers/chibios/analog.c
index 2b3872afb..b1081623d 100644
--- a/drivers/chibios/analog.c
+++ b/drivers/chibios/analog.c
@@ -101,7 +101,11 @@
 // Options are 12, 10, 8, and 6 bit.
 #ifndef ADC_RESOLUTION
-#    define ADC_RESOLUTION ADC_CFGR1_RES_10BIT
+#    ifdef ADC_CFGR_RES_10BITS  // ADCv3, ADCv4
+#        define ADC_RESOLUTION ADC_CFGR_RES_10BITS
+#    else  // ADCv1, ADCv5, or the bodge for ADCv2 above
+#        define ADC_RESOLUTION ADC_CFGR1_RES_10BIT
+#    endif
 #endif
 static ADCConfig   adcCfg = {};
@@ -161,8 +165,8 @@ __attribute__((weak)) adc_mux pinToMux(pin_t pin) {
        case B0:  return TO_MUX( ADC_CHANNEL_IN12, 2 );
        case B1:  return TO_MUX( ADC_CHANNEL_IN1,  2 );
        case B2:  return TO_MUX( ADC_CHANNEL_IN12, 1 );
-        case B12: return TO_MUX( ADC_CHANNEL_IN2,  3 );
+        case B12: return TO_MUX( ADC_CHANNEL_IN3,  3 );
-        case B13: return TO_MUX( ADC_CHANNEL_IN3,  3 );
+        case B13: return TO_MUX( ADC_CHANNEL_IN5,  2 );
        case B14: return TO_MUX( ADC_CHANNEL_IN4,  3 );
        case B15: return TO_MUX( ADC_CHANNEL_IN5,  3 );
        case C0:  return TO_MUX( ADC_CHANNEL_IN6,  0 ); // Can also be ADC2
@@ -189,11 +193,52 @@ __attribute__((weak)) adc_mux pinToMux(pin_t pin) {
        case E15: return TO_MUX( ADC_CHANNEL_IN2,  3 );
        case F2:  return TO_MUX( ADC_CHANNEL_IN10, 0 ); // Can also be ADC2
        case F4:  return TO_MUX( ADC_CHANNEL_IN5,  0 );
-#elif defined(STM32F4XX) // TODO: add all pins
+#elif defined(STM32F4XX)
        case A0:  return TO_MUX( ADC_CHANNEL_IN0,  0 );
-        //case A1:  return TO_MUX( ADC_CHANNEL_IN1,  0 );
+        case A1:  return TO_MUX( ADC_CHANNEL_IN1,  0 );
-#elif defined(STM32F1XX) // TODO: add all pins
+        case A2:  return TO_MUX( ADC_CHANNEL_IN2,  0 );
+        case A3:  return TO_MUX( ADC_CHANNEL_IN3,  0 );
+        case A4:  return TO_MUX( ADC_CHANNEL_IN4,  0 );
+        case A5:  return TO_MUX( ADC_CHANNEL_IN5,  0 );
+        case A6:  return TO_MUX( ADC_CHANNEL_IN6,  0 );
+        case A7:  return TO_MUX( ADC_CHANNEL_IN7,  0 );
+        case B0:  return TO_MUX( ADC_CHANNEL_IN8,  0 );
+        case B1:  return TO_MUX( ADC_CHANNEL_IN9,  0 );
+        case C0:  return TO_MUX( ADC_CHANNEL_IN10, 0 );
+        case C1:  return TO_MUX( ADC_CHANNEL_IN11, 0 );
+        case C2:  return TO_MUX( ADC_CHANNEL_IN12, 0 );
+        case C3:  return TO_MUX( ADC_CHANNEL_IN13, 0 );
+        case C4:  return TO_MUX( ADC_CHANNEL_IN14, 0 );
+        case C5:  return TO_MUX( ADC_CHANNEL_IN15, 0 );
+#    if STM32_ADC_USE_ADC3
+        case F3:  return TO_MUX( ADC_CHANNEL_IN9,  2 );
+        case F4:  return TO_MUX( ADC_CHANNEL_IN14, 2 );
+        case F5:  return TO_MUX( ADC_CHANNEL_IN15, 2 );
+        case F6:  return TO_MUX( ADC_CHANNEL_IN4,  2 );
+        case F7:  return TO_MUX( ADC_CHANNEL_IN5,  2 );
+        case F8:  return TO_MUX( ADC_CHANNEL_IN6,  2 );
+        case F9:  return TO_MUX( ADC_CHANNEL_IN7,  2 );
+        case F10: return TO_MUX( ADC_CHANNEL_IN8,  2 );
+#    endif
+#elif defined(STM32F1XX)
        case A0:  return TO_MUX( ADC_CHANNEL_IN0,  0 );
+        case A1:  return TO_MUX( ADC_CHANNEL_IN1,  0 );
+        case A2:  return TO_MUX( ADC_CHANNEL_IN2,  0 );
+        case A3:  return TO_MUX( ADC_CHANNEL_IN3,  0 );
+        case A4:  return TO_MUX( ADC_CHANNEL_IN4,  0 );
+        case A5:  return TO_MUX( ADC_CHANNEL_IN5,  0 );
+        case A6:  return TO_MUX( ADC_CHANNEL_IN6,  0 );
+        case A7:  return TO_MUX( ADC_CHANNEL_IN7,  0 );
+        case B0:  return TO_MUX( ADC_CHANNEL_IN8,  0 );
+        case B1:  return TO_MUX( ADC_CHANNEL_IN9,  0 );
+        case C0:  return TO_MUX( ADC_CHANNEL_IN10, 0 );
+        case C1:  return TO_MUX( ADC_CHANNEL_IN11, 0 );
+        case C2:  return TO_MUX( ADC_CHANNEL_IN12, 0 );
+        case C3:  return TO_MUX( ADC_CHANNEL_IN13, 0 );
+        case C4:  return TO_MUX( ADC_CHANNEL_IN14, 0 );
+        case C5:  return TO_MUX( ADC_CHANNEL_IN15, 0 );
+        // STM32F103x[C-G] in 144-pin packages also have analog inputs on F6...F10, but they are on ADC3, and the
+        // ChibiOS ADC driver for STM32F1xx currently supports only ADC1, therefore these pins are not usable.
 #endif
    }
diff --git a/drivers/chibios/ws2812_pwm.c b/drivers/chibios/ws2812_pwm.c
index 140120d48..e6af55b6b 100644
--- a/drivers/chibios/ws2812_pwm.c
+++ b/drivers/chibios/ws2812_pwm.c
@@ -27,6 +27,15 @@
 #    error "please consult your MCU's datasheet and specify in your config.h: #define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM?_UP"
 #endif
+#ifndef WS2812_PWM_COMPLEMENTARY_OUTPUT
+#    define WS2812_PWM_OUTPUT_MODE PWM_OUTPUT_ACTIVE_HIGH
+#else
+#    if !STM32_PWM_USE_ADVANCED
+#        error "WS2812_PWM_COMPLEMENTARY_OUTPUT requires STM32_PWM_USE_ADVANCED == TRUE"
+#    endif
+#    define WS2812_PWM_OUTPUT_MODE PWM_COMPLEMENTARY_OUTPUT_ACTIVE_HIGH
+#endif
 // Push Pull or Open Drain Configuration
 // Default Push Pull
 #ifndef WS2812_EXTERNAL_PULLUP
@@ -247,7 +256,7 @@ void ws2812_init(void) {
        .channels =
            {
                [0 ... 3]                = {.mode = PWM_OUTPUT_DISABLED, .callback = NULL},     // Channels default to disabled
-                [WS2812_PWM_CHANNEL - 1] = {.mode = PWM_OUTPUT_ACTIVE_HIGH, .callback = NULL},  // Turn on the channel we care about
+                [WS2812_PWM_CHANNEL - 1] = {.mode = WS2812_PWM_OUTPUT_MODE, .callback = NULL},  // Turn on the channel we care about
            },
        .cr2  = 0,
        .dier = TIM_DIER_UDE,  // DMA on update event for next period
diff --git a/drivers/chibios/ws2812_spi.c b/drivers/chibios/ws2812_spi.c
index 89df2987b..e02cbabc0 100644
--- a/drivers/chibios/ws2812_spi.c
+++ b/drivers/chibios/ws2812_spi.c
@@ -32,6 +32,37 @@
 #    endif
 #endif
+// Define SPI config speed
+// baudrate should target 3.2MHz
+// F072 fpclk = 48MHz
+// 48/16 = 3Mhz
+#if WS2812_SPI_DIVISOR == 2
+#    define WS2812_SPI_DIVISOR (0)
+#elif WS2812_SPI_DIVISOR == 4
+#    define WS2812_SPI_DIVISOR (SPI_CR1_BR_0)
+#elif WS2812_SPI_DIVISOR == 8
+#    define WS2812_SPI_DIVISOR (SPI_CR1_BR_1)
+#elif WS2812_SPI_DIVISOR == 16  // same as default
+#    define WS2812_SPI_DIVISOR (SPI_CR1_BR_1 | SPI_CR1_BR_0)
+#elif WS2812_SPI_DIVISOR == 32
+#    define WS2812_SPI_DIVISOR (SPI_CR1_BR_2)
+#elif WS2812_SPI_DIVISOR == 64
+#    define WS2812_SPI_DIVISOR (SPI_CR1_BR_2 | SPI_CR1_BR_0)
+#elif WS2812_SPI_DIVISOR == 128
+#    define WS2812_SPI_DIVISOR (SPI_CR1_BR_2 | SPI_CR1_BR_1)
+#elif WS2812_SPI_DIVISOR == 256
+#    define WS2812_SPI_DIVISOR (SPI_CR1_BR_2 | SPI_CR1_BR_1 | SPI_CR1_BR_0)
+#else
+#    define WS2812_SPI_DIVISOR (SPI_CR1_BR_1 | SPI_CR1_BR_0)  // default
+#endif
+// Use SPI circular buffer
+#ifdef WS2812_SPI_USE_CIRCULAR_BUFFER
+#    define WS2812_SPI_BUFFER_MODE 1  // circular buffer
+#else
+#    define WS2812_SPI_BUFFER_MODE 0  // normal buffer
+#endif
 #define BYTES_FOR_LED_BYTE 4
 #define NB_COLORS 3
 #define BYTES_FOR_LED (BYTES_FOR_LED_BYTE * NB_COLORS)
@@ -81,14 +112,14 @@ void ws2812_init(void) {
    palSetLineMode(RGB_DI_PIN, WS2812_OUTPUT_MODE);
    // TODO: more dynamic baudrate
-    static const SPIConfig spicfg = {
+    static const SPIConfig spicfg = {WS2812_SPI_BUFFER_MODE, NULL, PAL_PORT(RGB_DI_PIN), PAL_PAD(RGB_DI_PIN), WS2812_SPI_DIVISOR};
-        0, NULL, PAL_PORT(RGB_DI_PIN), PAL_PAD(RGB_DI_PIN),
-        SPI_CR1_BR_1 | SPI_CR1_BR_0  // baudrate : fpclk / 8 => 1tick is 0.32us (2.25 MHz)
-    };
    spiAcquireBus(&WS2812_SPI);     /* Acquire ownership of the bus.    */
    spiStart(&WS2812_SPI, &spicfg); /* Setup transfer parameters.       */
    spiSelect(&WS2812_SPI);         /* Slave Select assertion.          */
+#ifdef WS2812_SPI_USE_CIRCULAR_BUFFER
+    spiStartSend(&WS2812_SPI, sizeof(txbuf) / sizeof(txbuf[0]), txbuf);
+#endif
 }
 void ws2812_setleds(LED_TYPE* ledarray, uint16_t leds) {
@@ -104,9 +135,11 @@ void ws2812_setleds(LED_TYPE* ledarray, uint16_t leds) {
    // Send async - each led takes ~0.03ms, 50 leds ~1.5ms, animations flushing faster than send will cause issues.
    // Instead spiSend can be used to send synchronously (or the thread logic can be added back).
-#ifdef WS2812_SPI_SYNC
+#ifndef WS2812_SPI_USE_CIRCULAR_BUFFER
+#    ifdef WS2812_SPI_SYNC
    spiSend(&WS2812_SPI, sizeof(txbuf) / sizeof(txbuf[0]), txbuf);
-#else
+#    else
    spiStartSend(&WS2812_SPI, sizeof(txbuf) / sizeof(txbuf[0]), txbuf);
+#    endif
 #endif
 }
diff --git a/drivers/oled/oled_driver.c b/drivers/oled/oled_driver.c
index 92c64399e..6c1238cd6 100644
--- a/drivers/oled/oled_driver.c
+++ b/drivers/oled/oled_driver.c
@@ -24,6 +24,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "progmem.h"
+#include "keyboard.h"
 // Used commands from spec sheet: https://cdn-shop.adafruit.com/datasheets/SSD1306.pdf
 // for SH1106: https://www.velleman.eu/downloads/29/infosheets/sh1106_datasheet.pdf
@@ -152,6 +154,12 @@ static void InvertCharacter(uint8_t *cursor) {
 }
 bool oled_init(uint8_t rotation) {
+#if defined(USE_I2C) && defined(SPLIT_KEYBOARD)
+    if (!is_keyboard_master()) {
+        return true;
+    }
+#endif
    oled_rotation = oled_init_user(rotation);
    if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) {
        oled_rotation_width = OLED_DISPLAY_WIDTH;
diff --git a/drivers/oled/oled_driver.h b/drivers/oled/oled_driver.h
index 72ab21247..00896f01c 100644
--- a/drivers/oled/oled_driver.h
+++ b/drivers/oled/oled_driver.h
@@ -158,6 +158,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define OLED_I2C_TIMEOUT 100
 #endif
+#if !defined(OLED_UPDATE_INTERVAL) && defined(SPLIT_KEYBOARD)
+#    define OLED_UPDATE_INTERVAL 50
+#endif
 typedef struct __attribute__((__packed__)) {
    uint8_t *current_element;
    uint16_t remaining_element_count;
diff --git a/keyboards/1upkeyboards/sweet16/rules.mk b/keyboards/1upkeyboards/sweet16/rules.mk
index d7e57eb33..22f9c36e6 100644
--- a/keyboards/1upkeyboards/sweet16/rules.mk
+++ b/keyboards/1upkeyboards/sweet16/rules.mk
@@ -1,7 +1,7 @@
 # Build Options
 #
 DEFAULT_FOLDER = 1upkeyboards/sweet16/v1
-#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+#BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes  # Mouse keys
 EXTRAKEY_ENABLE = yes  # Audio control and System control
 CONSOLE_ENABLE = no    # Console for debug
diff --git a/keyboards/40percentclub/gherkin/rules.mk b/keyboards/40percentclub/gherkin/rules.mk
index db971e00e..18a35b275 100644
--- a/keyboards/40percentclub/gherkin/rules.mk
+++ b/keyboards/40percentclub/gherkin/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes     # Mouse keys
 EXTRAKEY_ENABLE = yes     # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/40percentclub/luddite/rules.mk b/keyboards/40percentclub/luddite/rules.mk
index 6da5cd05a..3e42dddd6 100644
--- a/keyboards/40percentclub/luddite/rules.mk
+++ b/keyboards/40percentclub/luddite/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes     # Mouse keys
 EXTRAKEY_ENABLE = yes     # Audio control and System control
 CONSOLE_ENABLE = no                     # Console for debug
diff --git a/keyboards/40percentclub/tomato/rules.mk b/keyboards/40percentclub/tomato/rules.mk
index 312134b7c..80b40c719 100644
--- a/keyboards/40percentclub/tomato/rules.mk
+++ b/keyboards/40percentclub/tomato/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes     # Mouse keys
 EXTRAKEY_ENABLE = yes     # Audio control and System control
 CONSOLE_ENABLE = no                     # Console for debug
diff --git a/keyboards/40percentclub/ut47/rules.mk b/keyboards/40percentclub/ut47/rules.mk
index 50868429a..3c8a8f68f 100644
--- a/keyboards/40percentclub/ut47/rules.mk
+++ b/keyboards/40percentclub/ut47/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/acheron/arctic/rules.mk b/keyboards/acheron/arctic/rules.mk
index 5edab2afe..4a6aa0a4a 100644
--- a/keyboards/acheron/arctic/rules.mk
+++ b/keyboards/acheron/arctic/rules.mk
@@ -4,7 +4,7 @@ MCU = STM32F072
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
diff --git a/keyboards/acheron/austin/rules.mk b/keyboards/acheron/austin/rules.mk
index 6796ab140..b73c2cf7c 100644
--- a/keyboards/acheron/austin/rules.mk
+++ b/keyboards/acheron/austin/rules.mk
@@ -4,7 +4,7 @@ MCU = STM32F072
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
diff --git a/keyboards/acheron/keebspcb/rules.mk b/keyboards/acheron/keebspcb/rules.mk
index b08ad400c..849a137cd 100644
--- a/keyboards/acheron/keebspcb/rules.mk
+++ b/keyboards/acheron/keebspcb/rules.mk
@@ -4,7 +4,7 @@ MCU = STM32F072
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
diff --git a/keyboards/acheron/lasgweloth/rules.mk b/keyboards/acheron/lasgweloth/rules.mk
index 6bfb44ee9..56b91b692 100644
--- a/keyboards/acheron/lasgweloth/rules.mk
+++ b/keyboards/acheron/lasgweloth/rules.mk
@@ -4,7 +4,7 @@ MCU = STM32F072
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
diff --git a/keyboards/acheron/shark/rules.mk b/keyboards/acheron/shark/rules.mk
index 04f2a7b94..94accbd8f 100644
--- a/keyboards/acheron/shark/rules.mk
+++ b/keyboards/acheron/shark/rules.mk
@@ -5,7 +5,7 @@ BOARD = QMK_PROTON_C
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes     # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full     # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
diff --git a/keyboards/acr60/rules.mk b/keyboards/acr60/rules.mk
index c1f1f22ba..22fd09140 100644
--- a/keyboards/acr60/rules.mk
+++ b/keyboards/acr60/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = no     # Console for debug
diff --git a/keyboards/aeboards/ext65/rev2/config.h b/keyboards/aeboards/ext65/rev2/config.h
index 541f07ee9..dc1bfb71c 100644
--- a/keyboards/aeboards/ext65/rev2/config.h
+++ b/keyboards/aeboards/ext65/rev2/config.h
@@ -74,3 +74,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_LEVELS 6
 #define BACKLIGHT_BREATHING
 #define BREATHING_PERIOD 6
+#define SLEEP_LED_GPT_DRIVER GPTD1
diff --git a/keyboards/aeboards/ext65/rev2/halconf.h b/keyboards/aeboards/ext65/rev2/halconf.h
index 6e2f53640..9fa1eca60 100644
--- a/keyboards/aeboards/ext65/rev2/halconf.h
+++ b/keyboards/aeboards/ext65/rev2/halconf.h
@@ -27,5 +27,7 @@
 #define HAL_USE_SPI TRUE
+#define HAL_USE_GPT TRUE
 #include_next <halconf.h>
diff --git a/keyboards/aeboards/ext65/rev2/mcuconf.h b/keyboards/aeboards/ext65/rev2/mcuconf.h
index 26ce80615..43d53d4f2 100644
--- a/keyboards/aeboards/ext65/rev2/mcuconf.h
+++ b/keyboards/aeboards/ext65/rev2/mcuconf.h
@@ -32,3 +32,5 @@
 #undef STM32_SPI_USE_SPI2
 #define STM32_SPI_USE_SPI2 TRUE
+#undef STM32_GPT_USE_TIM1
+#define STM32_GPT_USE_TIM1 TRUE
diff --git a/keyboards/alf/x2/rules.mk b/keyboards/alf/x2/rules.mk
index c1f1f22ba..22fd09140 100644
--- a/keyboards/alf/x2/rules.mk
+++ b/keyboards/alf/x2/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = no     # Console for debug
diff --git a/keyboards/alpha/rules.mk b/keyboards/alpha/rules.mk
index 773655f2f..dceb6e307 100755
--- a/keyboards/alpha/rules.mk
+++ b/keyboards/alpha/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = no     # Console for debug
diff --git a/keyboards/alpine65/rules.mk b/keyboards/alpine65/rules.mk
index 56ee0e25b..4f9422096 100644
--- a/keyboards/alpine65/rules.mk
+++ b/keyboards/alpine65/rules.mk
@@ -4,7 +4,7 @@ MCU = STM32F072
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
diff --git a/keyboards/alu84/rules.mk b/keyboards/alu84/rules.mk
index 81dbad070..8d1652171 100755
--- a/keyboards/alu84/rules.mk
+++ b/keyboards/alu84/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = no    # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = no     # Console for debug
diff --git a/keyboards/at101_bh/rules.mk b/keyboards/at101_bh/rules.mk
index 1930d9f27..af0606f6d 100644
--- a/keyboards/at101_bh/rules.mk
+++ b/keyboards/at101_bh/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = halfkay
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = no     # Console for debug
diff --git a/keyboards/at_at/660m/rules.mk b/keyboards/at_at/660m/rules.mk
index a94604fb0..a272f6d34 100644
--- a/keyboards/at_at/660m/rules.mk
+++ b/keyboards/at_at/660m/rules.mk
@@ -6,7 +6,7 @@ BOARD = GENERIC_STM32_F072XB
 #   comment out to disable the options.
 #
-#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+#BOOTMAGIC_ENABLE = full        # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug
diff --git a/keyboards/bantam44/rules.mk b/keyboards/bantam44/rules.mk
index d90f8155e..e0fbf5a8c 100644
--- a/keyboards/bantam44/rules.mk
+++ b/keyboards/bantam44/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = halfkay
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug
diff --git a/keyboards/beatervan/rules.mk b/keyboards/beatervan/rules.mk
index 1ea4a84d5..fd23f3301 100644
--- a/keyboards/beatervan/rules.mk
+++ b/keyboards/beatervan/rules.mk
@@ -7,7 +7,7 @@ BOOTLOADER = caterina
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/bfake/rules.mk b/keyboards/bfake/rules.mk
index 5846b173b..c25b22249 100644
--- a/keyboards/bfake/rules.mk
+++ b/keyboards/bfake/rules.mk
@@ -12,7 +12,7 @@ MCU = atmega32a
 BOOTLOADER = bootloadHID
 # build options
-BOOTMAGIC_ENABLE = yes
+BOOTMAGIC_ENABLE = full
 MOUSEKEY_ENABLE = yes
 EXTRAKEY_ENABLE = yes
 CONSOLE_ENABLE = no
diff --git a/keyboards/blackplum/rules.mk b/keyboards/blackplum/rules.mk
index 6465dec7f..76aeee6ec 100644
--- a/keyboards/blackplum/rules.mk
+++ b/keyboards/blackplum/rules.mk
@@ -13,7 +13,7 @@ BOOTLOADER = qmk-dfu
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes     # Mouse keys
 EXTRAKEY_ENABLE = yes     # Audio control and System control
 CONSOLE_ENABLE = no                     # Console for debug
diff --git a/keyboards/boston/rules.mk b/keyboards/boston/rules.mk
index 47dc20576..e7bc2db59 100644
--- a/keyboards/boston/rules.mk
+++ b/keyboards/boston/rules.mk
@@ -4,7 +4,7 @@ MCU = STM32F072
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes     # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full     # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = no       # Mouse keys
 EXTRAKEY_ENABLE = yes      # Audio control and System control
 CONSOLE_ENABLE = no        # Console for debug
diff --git a/keyboards/box75/rules.mk b/keyboards/box75/rules.mk
index 2d2f71e19..a202eca61 100644
--- a/keyboards/box75/rules.mk
+++ b/keyboards/box75/rules.mk
@@ -4,7 +4,7 @@ MCU = STM32F072
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
diff --git a/keyboards/bpiphany/pegasushoof/keymaps/blowrak/rules.mk b/keyboards/bpiphany/pegasushoof/keymaps/blowrak/rules.mk
index 8254a8389..a605a865e 100644
--- a/keyboards/bpiphany/pegasushoof/keymaps/blowrak/rules.mk
+++ b/keyboards/bpiphany/pegasushoof/keymaps/blowrak/rules.mk
@@ -2,7 +2,7 @@
 #   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = yes        # Console for debug(+400)
diff --git a/keyboards/bpiphany/pegasushoof/keymaps/default/rules.mk b/keyboards/bpiphany/pegasushoof/keymaps/default/rules.mk
index d6ebcd5d7..972b7fc71 100644
--- a/keyboards/bpiphany/pegasushoof/keymaps/default/rules.mk
+++ b/keyboards/bpiphany/pegasushoof/keymaps/default/rules.mk
@@ -2,7 +2,7 @@
 #   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
diff --git a/keyboards/bpiphany/pegasushoof/keymaps/default_jis/rules.mk b/keyboards/bpiphany/pegasushoof/keymaps/default_jis/rules.mk
index 8254a8389..a605a865e 100644
--- a/keyboards/bpiphany/pegasushoof/keymaps/default_jis/rules.mk
+++ b/keyboards/bpiphany/pegasushoof/keymaps/default_jis/rules.mk
@@ -2,7 +2,7 @@
 #   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = yes        # Console for debug(+400)
diff --git a/keyboards/bpiphany/pegasushoof/rules.mk b/keyboards/bpiphany/pegasushoof/rules.mk
index ffb642a9c..ffc4fc0e8 100644
--- a/keyboards/bpiphany/pegasushoof/rules.mk
+++ b/keyboards/bpiphany/pegasushoof/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
diff --git a/keyboards/bpiphany/unloved_bastard/rules.mk b/keyboards/bpiphany/unloved_bastard/rules.mk
index b211fa5e9..d6c3d6232 100644
--- a/keyboards/bpiphany/unloved_bastard/rules.mk
+++ b/keyboards/bpiphany/unloved_bastard/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
diff --git a/keyboards/cannonkeys/an_c/rules.mk b/keyboards/cannonkeys/an_c/rules.mk
index 8ed2d0ead..7309744d1 100644
--- a/keyboards/cannonkeys/an_c/rules.mk
+++ b/keyboards/cannonkeys/an_c/rules.mk
@@ -11,7 +11,7 @@ MOUSEKEY_ENABLE = yes	# Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug
 COMMAND_ENABLE = yes    # Commands for debug and configuration
-SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
+SLEEP_LED_ENABLE = no   # Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes           # USB Nkey Rollover
 CUSTOM_MATRIX = no # Custom matrix file
 BACKLIGHT_ENABLE = yes
diff --git a/keyboards/cannonkeys/chimera65/rules.mk b/keyboards/cannonkeys/chimera65/rules.mk
index 4d940da78..a08f2fa49 100644
--- a/keyboards/cannonkeys/chimera65/rules.mk
+++ b/keyboards/cannonkeys/chimera65/rules.mk
@@ -11,7 +11,7 @@ MOUSEKEY_ENABLE = yes	# Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug
 COMMAND_ENABLE = yes    # Commands for debug and configuration
-SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
+SLEEP_LED_ENABLE = no   # Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes           # USB Nkey Rollover
 CUSTOM_MATRIX = no # Custom matrix file
 BACKLIGHT_ENABLE = yes
diff --git a/keyboards/cannonkeys/instant60/rules.mk b/keyboards/cannonkeys/instant60/rules.mk
index 0973ad954..e5ba2903b 100644
--- a/keyboards/cannonkeys/instant60/rules.mk
+++ b/keyboards/cannonkeys/instant60/rules.mk
@@ -10,7 +10,7 @@ MOUSEKEY_ENABLE = yes	# Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug
 COMMAND_ENABLE = yes    # Commands for debug and configuration
-SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
+SLEEP_LED_ENABLE = no   # Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes           # USB Nkey Rollover
 CUSTOM_MATRIX = no # Custom matrix file
 BACKLIGHT_ENABLE = yes
diff --git a/keyboards/cannonkeys/iron165/rules.mk b/keyboards/cannonkeys/iron165/rules.mk
index 3925458dd..9de75a614 100644
--- a/keyboards/cannonkeys/iron165/rules.mk
+++ b/keyboards/cannonkeys/iron165/rules.mk
@@ -9,7 +9,7 @@ MOUSEKEY_ENABLE = yes	# Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug
 COMMAND_ENABLE = yes    # Commands for debug and configuration
-SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
+SLEEP_LED_ENABLE = no   # Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes           # USB Nkey Rollover
 CUSTOM_MATRIX = no # Custom matrix file
 BACKLIGHT_ENABLE = yes
diff --git a/keyboards/cannonkeys/ortho48/rules.mk b/keyboards/cannonkeys/ortho48/rules.mk
index 6e468c49a..ac927481f 100644
--- a/keyboards/cannonkeys/ortho48/rules.mk
+++ b/keyboards/cannonkeys/ortho48/rules.mk
@@ -8,7 +8,7 @@ BOOTLOADER = stm32duino
 VPATH += keyboards/cannonkeys/bluepill
 SRC = keyboard.c
-#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+#BOOTMAGIC_ENABLE = full        # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug
diff --git a/keyboards/cannonkeys/ortho60/rules.mk b/keyboards/cannonkeys/ortho60/rules.mk
index ea9bd6b2d..ec91d3b81 100644
--- a/keyboards/cannonkeys/ortho60/rules.mk
+++ b/keyboards/cannonkeys/ortho60/rules.mk
@@ -8,7 +8,7 @@ BOOTLOADER = stm32duino
 VPATH += keyboards/cannonkeys/bluepill
 SRC =   keyboard.c
-#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+#BOOTMAGIC_ENABLE = full        # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug
diff --git a/keyboards/cannonkeys/ortho75/rules.mk b/keyboards/cannonkeys/ortho75/rules.mk
index e132ccaf1..9d6004656 100644
--- a/keyboards/cannonkeys/ortho75/rules.mk
+++ b/keyboards/cannonkeys/ortho75/rules.mk
@@ -8,7 +8,7 @@ BOOTLOADER = stm32duino
 VPATH += keyboards/cannonkeys/bluepill
 SRC =   keyboard.c
-#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+#BOOTMAGIC_ENABLE = full        # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug
diff --git a/keyboards/cannonkeys/practice60/rules.mk b/keyboards/cannonkeys/practice60/rules.mk
index 3f9ca1448..80bde01cf 100644
--- a/keyboards/cannonkeys/practice60/rules.mk
+++ b/keyboards/cannonkeys/practice60/rules.mk
@@ -8,7 +8,7 @@ BOOTLOADER = stm32duino
 VPATH += keyboards/cannonkeys/bluepill
 SRC =   keyboard.c
-#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+#BOOTMAGIC_ENABLE = full        # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug
diff --git a/keyboards/cannonkeys/practice65/rules.mk b/keyboards/cannonkeys/practice65/rules.mk
index 344844b0e..130f9b98e 100644
--- a/keyboards/cannonkeys/practice65/rules.mk
+++ b/keyboards/cannonkeys/practice65/rules.mk
@@ -8,7 +8,7 @@ BOOTLOADER = stm32duino
 VPATH += keyboards/cannonkeys/bluepill
 SRC =   keyboard.c
-#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+#BOOTMAGIC_ENABLE = full        # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug
diff --git a/keyboards/cannonkeys/satisfaction75/rules.mk b/keyboards/cannonkeys/satisfaction75/rules.mk
index e3abea546..3861b4849 100644
--- a/keyboards/cannonkeys/satisfaction75/rules.mk
+++ b/keyboards/cannonkeys/satisfaction75/rules.mk
@@ -15,7 +15,7 @@ MOUSEKEY_ENABLE = yes	# Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug
 COMMAND_ENABLE = yes    # Commands for debug and configuration
-SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
+SLEEP_LED_ENABLE = no   # Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes           # USB Nkey Rollover
 CUSTOM_MATRIX = no # Custom matrix file
 ENCODER_ENABLE = yes
diff --git a/keyboards/cannonkeys/savage65/rules.mk b/keyboards/cannonkeys/savage65/rules.mk
index 8e1b984fd..2454573d2 100644
--- a/keyboards/cannonkeys/savage65/rules.mk
+++ b/keyboards/cannonkeys/savage65/rules.mk
@@ -11,7 +11,7 @@ MOUSEKEY_ENABLE = yes	# Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug
 COMMAND_ENABLE = yes    # Commands for debug and configuration
-SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
+SLEEP_LED_ENABLE = no   # Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes           # USB Nkey Rollover
 CUSTOM_MATRIX = no # Custom matrix file
 BACKLIGHT_ENABLE = yes
diff --git a/keyboards/cannonkeys/tmov2/rules.mk b/keyboards/cannonkeys/tmov2/rules.mk
index 9b29e8fd1..294c873ee 100644
--- a/keyboards/cannonkeys/tmov2/rules.mk
+++ b/keyboards/cannonkeys/tmov2/rules.mk
@@ -11,7 +11,7 @@ MOUSEKEY_ENABLE = yes	# Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug
 COMMAND_ENABLE = yes    # Commands for debug and configuration
-SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
+SLEEP_LED_ENABLE = no   # Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes           # USB Nkey Rollover
 CUSTOM_MATRIX = no # Custom matrix file
 BACKLIGHT_ENABLE = yes
diff --git a/keyboards/cannonkeys/tsukuyomi/rules.mk b/keyboards/cannonkeys/tsukuyomi/rules.mk
index ce881f198..4e7791a79 100644
--- a/keyboards/cannonkeys/tsukuyomi/rules.mk
+++ b/keyboards/cannonkeys/tsukuyomi/rules.mk
@@ -10,7 +10,7 @@ EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
 COMMAND_ENABLE = yes        # Commands for debug and configuration
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = yes      # Breathing sleep LED during USB suspend
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 NKRO_ENABLE = yes           # USB Nkey Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
diff --git a/keyboards/chimera_ergo/rules.mk b/keyboards/chimera_ergo/rules.mk
index 01d5c3c70..b7084b4a1 100644
--- a/keyboards/chimera_ergo/rules.mk
+++ b/keyboards/chimera_ergo/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   comment out to disable the options.
 #
-#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+#BOOTMAGIC_ENABLE = full        # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug
diff --git a/keyboards/chimera_ls/rules.mk b/keyboards/chimera_ls/rules.mk
index 536e6053a..2f414ba81 100644
--- a/keyboards/chimera_ls/rules.mk
+++ b/keyboards/chimera_ls/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   comment out to disable the options.
 #
-#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+#BOOTMAGIC_ENABLE = full        # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug
diff --git a/keyboards/chimera_ortho/rules.mk b/keyboards/chimera_ortho/rules.mk
index e3bbaa39d..d97cff59f 100644
--- a/keyboards/chimera_ortho/rules.mk
+++ b/keyboards/chimera_ortho/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   comment out to disable the options.
 #
-#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+#BOOTMAGIC_ENABLE = full        # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug
diff --git a/keyboards/ck60i/rules.mk b/keyboards/ck60i/rules.mk
index 10f86791e..2360b9c85 100644
--- a/keyboards/ck60i/rules.mk
+++ b/keyboards/ck60i/rules.mk
@@ -4,7 +4,7 @@ MCU = STM32F072
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no        # Console for debug
diff --git a/keyboards/ckeys/thedora/rules.mk b/keyboards/ckeys/thedora/rules.mk
index aa378710c..508af7d39 100755
--- a/keyboards/ckeys/thedora/rules.mk
+++ b/keyboards/ckeys/thedora/rules.mk
@@ -6,7 +6,7 @@ BOARD = QMK_PROTON_C
 #   comment out to disable the options.
 #
 BACKLIGHT_ENABLE = no
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full  # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes # Mouse keys
 EXTRAKEY_ENABLE = yes # Audio control and System control
 CONSOLE_ENABLE = no  # Console for debug
diff --git a/keyboards/clueboard/66_hotswap/gen1/gen1.c b/keyboards/clueboard/66_hotswap/gen1/gen1.c
index dd399317c..339bd78d5 100644
--- a/keyboards/clueboard/66_hotswap/gen1/gen1.c
+++ b/keyboards/clueboard/66_hotswap/gen1/gen1.c
@@ -16,8 +16,6 @@
 #include "gen1.h"
 #ifdef LED_MATRIX_ENABLE
-    #include "is31fl3731-simple.h"
 const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
 /* Refer to IS31 manual for these locations
 *    driver
diff --git a/keyboards/contra/rules.mk b/keyboards/contra/rules.mk
index 5894ca132..9bd4c0851 100755
--- a/keyboards/contra/rules.mk
+++ b/keyboards/contra/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no        # Console for debug
diff --git a/keyboards/converter/siemens_tastatur/rules.mk b/keyboards/converter/siemens_tastatur/rules.mk
index 451d07e67..ff54cf24e 100644
--- a/keyboards/converter/siemens_tastatur/rules.mk
+++ b/keyboards/converter/siemens_tastatur/rules.mk
@@ -6,7 +6,7 @@ BOOTLOADER = stm32duino
 SRC = matrix.c
-#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+#BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug
diff --git a/keyboards/converter/usb_usb/rules.mk b/keyboards/converter/usb_usb/rules.mk
index d277853cf..d2b991837 100644
--- a/keyboards/converter/usb_usb/rules.mk
+++ b/keyboards/converter/usb_usb/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   comment out to disable the options.
 #
-#BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+#BOOTMAGIC_ENABLE = full  # Virtual DIP switch configuration
 #MOUSEKEY_ENABLE  = yes  # Mouse keys
 EXTRAKEY_ENABLE  = yes  # Audio control and System control
 #CONSOLE_ENABLE   = yes  # Console for debug
diff --git a/keyboards/crkbd/rev1/common/config.h b/keyboards/crkbd/rev1/common/config.h
index a2c2cde0b..b468fe395 100644
--- a/keyboards/crkbd/rev1/common/config.h
+++ b/keyboards/crkbd/rev1/common/config.h
@@ -23,6 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_SPLIT { 27, 27 }
+#    define SPLIT_TRANSPORT_MIRROR
 #endif
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/crkbd/rev1/common/rules.mk b/keyboards/crkbd/rev1/common/rules.mk
index 0b8106e3f..d38a61809 100644
--- a/keyboards/crkbd/rev1/common/rules.mk
+++ b/keyboards/crkbd/rev1/common/rules.mk
@@ -1,2 +1 @@
 SPLIT_KEYBOARD = yes
-SPLIT_TRANSPORT = mirror    # for when Split Mirroring drops, it will maintain mirroring functionality
diff --git a/keyboards/crkbd/rev1/rev1.c b/keyboards/crkbd/rev1/rev1.c
index f2df8942a..347f98150 100644
--- a/keyboards/crkbd/rev1/rev1.c
+++ b/keyboards/crkbd/rev1/rev1.c
@@ -87,7 +87,7 @@ led_config_t g_led_config = { {
 void matrix_init_kb(void) {
-#ifdef RGB_MATRIX_ENABLE
+#if defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_SPLIT)
    if (!isLeftHand) {
        g_led_config = (led_config_t){ {
            {  51,  50,  45,  44,  37,  36 },
diff --git a/keyboards/cutie_club/wraith/rules.mk b/keyboards/cutie_club/wraith/rules.mk
index dce4ad686..a42fd4257 100644
--- a/keyboards/cutie_club/wraith/rules.mk
+++ b/keyboards/cutie_club/wraith/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no             # Console for debug
diff --git a/keyboards/daji/seis_cinco/rules.mk b/keyboards/daji/seis_cinco/rules.mk
index fa34092cd..768e50069 100644
--- a/keyboards/daji/seis_cinco/rules.mk
+++ b/keyboards/daji/seis_cinco/rules.mk
@@ -11,7 +11,7 @@ EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = yes      # Breathing sleep LED during USB suspend
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 NKRO_ENABLE = yes           # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
diff --git a/keyboards/dichotomy/rules.mk b/keyboards/dichotomy/rules.mk
index d6f98125e..a9a01d867 100755
--- a/keyboards/dichotomy/rules.mk
+++ b/keyboards/dichotomy/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   comment out to disable the options.
 #
-#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+#BOOTMAGIC_ENABLE = full        # Virtual DIP switch configuration
 #MOUSEKEY_ENABLE = yes  # Mouse keys
 POINTING_DEVICE_ENABLE = yes # Generic Pointer, not as big as mouse keys hopefully.
 EXTRAKEY_ENABLE = yes   # Audio control and System control
diff --git a/keyboards/do60/rules.mk b/keyboards/do60/rules.mk
index 73bb4f096..106a1f06d 100644
--- a/keyboards/do60/rules.mk
+++ b/keyboards/do60/rules.mk
@@ -15,7 +15,7 @@ BOOTLOADER = atmel-dfu
 AUDIO_ENABLE = no           # Audio output on port C6
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 COMMAND_ENABLE = no         # Commands for debug and configuration
 CONSOLE_ENABLE = no         # Console for debug
 EXTRAKEY_ENABLE = yes       # Audio control and System control
diff --git a/keyboards/durgod/k320/board.h b/keyboards/durgod/boards/DURGOD_STM32_F070/board.h
index 17d08b17f..2d04bccbd 100644
--- a/keyboards/durgod/k320/board.h
+++ b/keyboards/durgod/boards/DURGOD_STM32_F070/board.h
@@ -20,4 +20,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define STM32_HSECLK                12000000U
 #include_next <board.h>
 #undef STM32_HSE_BYPASS
diff --git a/keyboards/durgod/boards/DURGOD_STM32_F070/board.mk b/keyboards/durgod/boards/DURGOD_STM32_F070/board.mk
new file mode 100644
index 000000000..479184833
--- /dev/null
+++ b/keyboards/durgod/boards/DURGOD_STM32_F070/board.mk
@@ -0,0 +1,12 @@
+# List of all the board related files.
+BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_F070RB/board.c
+# Required include directories
+BOARDINC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_F070RB
+# Include mcu configuration
+EXTRAINCDIRS = $(BOARD_PATH)/boards/DURGOD_STM32_F070
+# Shared variables
+ALLCSRC += $(BOARDSRC)
+ALLINC  += $(BOARDINC)
diff --git a/keyboards/durgod/k320/bootloader_defs.h b/keyboards/durgod/boards/DURGOD_STM32_F070/bootloader_defs.h
index 02c48c4e6..02c48c4e6 100644
--- a/keyboards/durgod/k320/bootloader_defs.h
+++ b/keyboards/durgod/boards/DURGOD_STM32_F070/bootloader_defs.h
diff --git a/keyboards/durgod/k320/chconf.h b/keyboards/durgod/boards/DURGOD_STM32_F070/chconf.h
index 374a03003..a7d95c51a 100644
--- a/keyboards/durgod/k320/chconf.h
+++ b/keyboards/durgod/boards/DURGOD_STM32_F070/chconf.h
@@ -25,19 +25,4 @@
 #define CH_CFG_ST_TIMEDELTA 0
-#define CH_CFG_OPTIMIZE_SPEED FALSE
-#define CH_CFG_USE_REGISTRY TRUE
-#define CH_CFG_USE_WAITEXIT TRUE
-#define CH_CFG_USE_CONDVARS TRUE
-#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-#define CH_CFG_USE_MESSAGES TRUE
-#define CH_CFG_USE_MAILBOXES TRUE
 #include_next <chconf.h>
diff --git a/keyboards/durgod/k320/mcuconf.h b/keyboards/durgod/boards/DURGOD_STM32_F070/mcuconf.h
index 6d67aa96a..6d67aa96a 100644
--- a/keyboards/durgod/k320/mcuconf.h
+++ b/keyboards/durgod/boards/DURGOD_STM32_F070/mcuconf.h
diff --git a/keyboards/durgod/k320/config.h b/keyboards/durgod/k320/config.h
index 70438900e..323a9ccff 100644
--- a/keyboards/durgod/k320/config.h
+++ b/keyboards/durgod/k320/config.h
@@ -1,19 +1,18 @@
-/*
+/* Copyright 2021 kuenhlee and Don Kjer
-Copyright 2021 kuenhlee and Don Kjer
+ *
+ * This program is free software: you can redistribute it and/or modify
-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
-it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
-the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
-(at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
-This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
-GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
-You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
-*/
 #pragma once
@@ -36,8 +35,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
+// Dynamic EEPROM
+// Something sensible or else VIA may crash
+// Users may enable more if they wish
+#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR  4095
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 7
+#define DEBOUNCE 5
 /* Bootmagic Lite key configuration */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
@@ -50,4 +54,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LED_WIN_LOCK_PIN    A9
 #define LED_MR_LOCK_PIN     A10
 #define LED_PIN_ON_STATE    0
diff --git a/keyboards/durgod/k320/info.json b/keyboards/durgod/k320/info.json
index 5e33d8fcd..6c67c3d45 100644
--- a/keyboards/durgod/k320/info.json
+++ b/keyboards/durgod/k320/info.json
@@ -7,913 +7,293 @@
    "layouts": {
        "LAYOUT_tkl_ansi": {
            "layout": [
-                {
+                { "label": "Esc", "x": 0, "y": 0 },
-                    "label": "Esc",
+                { "label": "F1", "x": 2, "y": 0 },
-                    "x": 0,
+                { "label": "F2", "x": 3, "y": 0 },
-                    "y": 0
+                { "label": "F3", "x": 4, "y": 0 },
-                },
+                { "label": "F4", "x": 5, "y": 0 },
-                {
+                { "label": "F5", "x": 6.5, "y": 0 },
-                    "label": "F1",
+                { "label": "F6", "x": 7.5, "y": 0 },
-                    "x": 2,
+                { "label": "F7", "x": 8.5, "y": 0 },
-                    "y": 0
+                { "label": "F8", "x": 9.5, "y": 0 },
-                },
+                { "label": "F9", "x": 11, "y": 0 },
-                {
+                { "label": "F10", "x": 12, "y": 0 },
-                    "label": "F2",
+                { "label": "F11", "x": 13, "y": 0 },
-                    "x": 3,
+                { "label": "F12", "x": 14, "y": 0 },
-                    "y": 0
+                { "label": "PrtSc", "x": 15.25, "y": 0 },
-                },
+                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-                {
+                { "label": "Pause", "x": 17.25, "y": 0 },
-                    "label": "F3",
-                    "x": 4,
+                { "label": "~", "x": 0, "y": 1.5 },
-                    "y": 0
+                { "label": "!", "x": 1, "y": 1.5 },
-                },
+                { "label": "@", "x": 2, "y": 1.5 },
-                {
+                { "label": "#", "x": 3, "y": 1.5 },
-                    "label": "F4",
+                { "label": "$", "x": 4, "y": 1.5 },
-                    "x": 5,
+                { "label": "%", "x": 5, "y": 1.5 },
-                    "y": 0
+                { "label": "^", "x": 6, "y": 1.5 },
-                },
+                { "label": "&", "x": 7, "y": 1.5 },
-                {
+                { "label": "*", "x": 8, "y": 1.5 },
-                    "label": "F5",
+                { "label": "(", "x": 9, "y": 1.5 },
-                    "x": 6.5,
+                { "label": ")", "x": 10, "y": 1.5 },
-                    "y": 0
+                { "label": "_", "x": 11, "y": 1.5 },
-                },
+                { "label": "+", "x": 12, "y": 1.5 },
-                {
+                { "label": "Backspace", "x": 13, "y": 1.5, "w": 2 },
-                    "label": "F6",
+                { "label": "Insert", "x": 15.25, "y": 1.5 },
-                    "x": 7.5,
+                { "label": "Home", "x": 16.25, "y": 1.5 },
-                    "y": 0
+                { "label": "PgUp", "x": 17.25, "y": 1.5 },
-                },
-                {
+                { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 },
-                    "label": "F7",
+                { "label": "Q", "x": 1.5, "y": 2.5 },
-                    "x": 8.5,
+                { "label": "W", "x": 2.5, "y": 2.5 },
-                    "y": 0
+                { "label": "E", "x": 3.5, "y": 2.5 },
-                },
+                { "label": "R", "x": 4.5, "y": 2.5 },
-                {
+                { "label": "T", "x": 5.5, "y": 2.5 },
-                    "label": "F8",
+                { "label": "Y", "x": 6.5, "y": 2.5 },
-                    "x": 9.5,
+                { "label": "U", "x": 7.5, "y": 2.5 },
-                    "y": 0
+                { "label": "I", "x": 8.5, "y": 2.5 },
-                },
+                { "label": "O", "x": 9.5, "y": 2.5 },
-                {
+                { "label": "P", "x": 10.5, "y": 2.5 },
-                    "label": "F9",
+                { "label": "{", "x": 11.5, "y": 2.5 },
-                    "x": 11,
+                { "label": "}", "x": 12.5, "y": 2.5 },
-                    "y": 0
+                { "label": "|", "x": 13.5, "y": 2.5, "w": 1.5 },
-                },
+                { "label": "Delete", "x": 15.25, "y": 2.5 },
-                {
+                { "label": "End", "x": 16.25, "y": 2.5 },
-                    "label": "F10",
+                { "label": "PgDn", "x": 17.25, "y": 2.5 },
-                    "x": 12,
-                    "y": 0
+                { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 },
-                },
+                { "label": "A", "x": 1.75, "y": 3.5 },
-                {
+                { "label": "S", "x": 2.75, "y": 3.5 },
-                    "label": "F11",
+                { "label": "D", "x": 3.75, "y": 3.5 },
-                    "x": 13,
+                { "label": "F", "x": 4.75, "y": 3.5 },
-                    "y": 0
+                { "label": "G", "x": 5.75, "y": 3.5 },
-                },
+                { "label": "H", "x": 6.75, "y": 3.5 },
-                {
+                { "label": "J", "x": 7.75, "y": 3.5 },
-                    "label": "F12",
+                { "label": "K", "x": 8.75, "y": 3.5 },
-                    "x": 14,
+                { "label": "L", "x": 9.75, "y": 3.5 },
-                    "y": 0
+                { "label": ":", "x": 10.75, "y": 3.5 },
-                },
+                { "label": "\"", "x": 11.75, "y": 3.5 },
-                {
+                { "label": "Enter", "x": 12.75, "y": 3.5, "w": 2.25 },
-                    "label": "PrtSc",
-                    "x": 15.25,
+                { "label": "Shift", "x": 0, "y": 4.5, "w": 2.25 },
-                    "y": 0
+                { "label": "Z", "x": 2.25, "y": 4.5 },
-                },
+                { "label": "X", "x": 3.25, "y": 4.5 },
-                {
+                { "label": "C", "x": 4.25, "y": 4.5 },
-                    "label": "Scroll Lock",
+                { "label": "V", "x": 5.25, "y": 4.5 },
-                    "x": 16.25,
+                { "label": "B", "x": 6.25, "y": 4.5 },
-                    "y": 0
+                { "label": "N", "x": 7.25, "y": 4.5 },
-                },
+                { "label": "M", "x": 8.25, "y": 4.5 },
-                {
+                { "label": "<", "x": 9.25, "y": 4.5 },
-                    "label": "Pause",
+                { "label": ">", "x": 10.25, "y": 4.5 },
-                    "x": 17.25,
+                { "label": "?", "x": 11.25, "y": 4.5 },
-                    "y": 0
+                { "label": "Shift", "x": 12.25, "y": 4.5, "w": 2.75 },
-                },
+                { "label": "\u2191", "x": 16.25, "y": 4.5 },
-                {
-                    "label": "~",
+                { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.25 },
-                    "x": 0,
+                { "label": "Win", "x": 1.25, "y": 5.5, "w": 1.25 },
-                    "y": 1.5
+                { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.25 },
-                },
+                { "x": 3.75, "y": 5.5, "w": 6.25 },
-                {
+                { "label": "Alt", "x": 10, "y": 5.5, "w": 1.25 },
-                    "label": "!",
+                { "label": "Fn", "x": 11.25, "y": 5.5, "w": 1.25 },
-                    "x": 1,
+                { "label": "Menu", "x": 12.5, "y": 5.5, "w": 1.25 },
-                    "y": 1.5
+                { "label": "Ctrl", "x": 13.75, "y": 5.5, "w": 1.25 },
-                },
+                { "label": "\u2190", "x": 15.25, "y": 5.5 },
-                {
+                { "label": "\u2193", "x": 16.25, "y": 5.5 },
-                    "label": "@",
+                { "label": "\u2192", "x": 17.25, "y": 5.5 }
-                    "x": 2,
-                    "y": 1.5
-                },
-                {
-                    "label": "#",
-                    "x": 3,
-                    "y": 1.5
-                },
-                {
-                    "label": "$",
-                    "x": 4,
-                    "y": 1.5
-                },
-                {
-                    "label": "%",
-                    "x": 5,
-                    "y": 1.5
-                },
-                {
-                    "label": "^",
-                    "x": 6,
-                    "y": 1.5
-                },
-                {
-                    "label": "&",
-                    "x": 7,
-                    "y": 1.5
-                },
-                {
-                    "label": "*",
-                    "x": 8,
-                    "y": 1.5
-                },
-                {
-                    "label": "(",
-                    "x": 9,
-                    "y": 1.5
-                },
-                {
-                    "label": ")",
-                    "x": 10,
-                    "y": 1.5
-                },
-                {
-                    "label": "_",
-                    "x": 11,
-                    "y": 1.5
-                },
-                {
-                    "label": "+",
-                    "x": 12,
-                    "y": 1.5
-                },
-                {
-                    "label": "Backspace",
-                    "x": 13,
-                    "y": 1.5,
-                    "w": 2
-                },
-                {
-                    "label": "Insert",
-                    "x": 15.25,
-                    "y": 1.5
-                },
-                {
-                    "label": "Home",
-                    "x": 16.25,
-                    "y": 1.5
-                },
-                {
-                    "label": "PgUp",
-                    "x": 17.25,
-                    "y": 1.5
-                },
-                {
-                    "label": "Tab",
-                    "x": 0,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "label": "Q",
-                    "x": 1.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "W",
-                    "x": 2.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "E",
-                    "x": 3.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "R",
-                    "x": 4.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "T",
-                    "x": 5.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "Y",
-                    "x": 6.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "U",
-                    "x": 7.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "I",
-                    "x": 8.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "O",
-                    "x": 9.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "P",
-                    "x": 10.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "{",
-                    "x": 11.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "}",
-                    "x": 12.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "|",
-                    "x": 13.5,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "label": "Delete",
-                    "x": 15.25,
-                    "y": 2.5
-                },
-                {
-                    "label": "End",
-                    "x": 16.25,
-                    "y": 2.5
-                },
-                {
-                    "label": "PgDn",
-                    "x": 17.25,
-                    "y": 2.5
-                },
-                {
-                    "label": "Caps Lock",
-                    "x": 0,
-                    "y": 3.5,
-                    "w": 1.75
-                },
-                {
-                    "label": "A",
-                    "x": 1.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "S",
-                    "x": 2.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "D",
-                    "x": 3.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "F",
-                    "x": 4.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "G",
-                    "x": 5.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "H",
-                    "x": 6.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "J",
-                    "x": 7.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "K",
-                    "x": 8.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "L",
-                    "x": 9.75,
-                    "y": 3.5
-                },
-                {
-                    "label": ":",
-                    "x": 10.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "\"",
-                    "x": 11.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "Enter",
-                    "x": 12.75,
-                    "y": 3.5,
-                    "w": 2.25
-                },
-                {
-                    "label": "Shift",
-                    "x": 0,
-                    "y": 4.5,
-                    "w": 2.25
-                },
-                {
-                    "label": "Z",
-                    "x": 2.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "X",
-                    "x": 3.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "C",
-                    "x": 4.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "V",
-                    "x": 5.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "B",
-                    "x": 6.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "N",
-                    "x": 7.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "M",
-                    "x": 8.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "<",
-                    "x": 9.25,
-                    "y": 4.5
-                },
-                {
-                    "label": ">",
-                    "x": 10.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "?",
-                    "x": 11.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "Shift",
-                    "x": 12.25,
-                    "y": 4.5,
-                    "w": 2.75
-                },
-                {
-                    "label": "\u2191",
-                    "x": 16.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "Ctrl",
-                    "x": 0,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "label": "Win",
-                    "x": 1.25,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "label": "Alt",
-                    "x": 2.5,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "x": 3.75,
-                    "y": 5.5,
-                    "w": 6.25
-                },
-                {
-                    "label": "Alt",
-                    "x": 10,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "label": "Fn",
-                    "x": 11.25,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "label": "Menu",
-                    "x": 12.5,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "label": "Ctrl",
-                    "x": 13.75,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "label": "\u2190",
-                    "x": 15.25,
-                    "y": 5.5
-                },
-                {
-                    "label": "\u2193",
-                    "x": 16.25,
-                    "y": 5.5
-                },
-                {
-                    "label": "\u2192",
-                    "x": 17.25,
-                    "y": 5.5
-                }
            ]
        },
        "LAYOUT_tkl_iso": {
            "layout": [
-                {
+                { "label": "Esc", "x": 0, "y": 0 },
-                    "label": "Esc",
+                { "label": "F1", "x": 2, "y": 0 },
-                    "x": 0,
+                { "label": "F2", "x": 3, "y": 0 },
-                    "y": 0
+                { "label": "F3", "x": 4, "y": 0 },
-                },
+                { "label": "F4", "x": 5, "y": 0 },
-                {
+                { "label": "F5", "x": 6.5, "y": 0 },
-                    "label": "F1",
+                { "label": "F6", "x": 7.5, "y": 0 },
-                    "x": 2,
+                { "label": "F7", "x": 8.5, "y": 0 },
-                    "y": 0
+                { "label": "F8", "x": 9.5, "y": 0 },
-                },
+                { "label": "F9", "x": 11, "y": 0 },
-                {
+                { "label": "F10", "x": 12, "y": 0 },
-                    "label": "F2",
+                { "label": "F11", "x": 13, "y": 0 },
-                    "x": 3,
+                { "label": "F12", "x": 14, "y": 0 },
-                    "y": 0
+                { "label": "PrtSc", "x": 15.25, "y": 0 },
-                },
+                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-                {
+                { "label": "Pause", "x": 17.25, "y": 0 },
-                    "label": "F3",
-                    "x": 4,
+                { "label": "~", "x": 0, "y": 1.5 },
-                    "y": 0
+                { "label": "!", "x": 1, "y": 1.5 },
-                },
+                { "label": "@", "x": 2, "y": 1.5 },
-                {
+                { "label": "#", "x": 3, "y": 1.5 },
-                    "label": "F4",
+                { "label": "$", "x": 4, "y": 1.5 },
-                    "x": 5,
+                { "label": "%", "x": 5, "y": 1.5 },
-                    "y": 0
+                { "label": "^", "x": 6, "y": 1.5 },
-                },
+                { "label": "&", "x": 7, "y": 1.5 },
-                {
+                { "label": "*", "x": 8, "y": 1.5 },
-                    "label": "F5",
+                { "label": "(", "x": 9, "y": 1.5 },
-                    "x": 6.5,
+                { "label": ")", "x": 10, "y": 1.5 },
-                    "y": 0
+                { "label": "_", "x": 11, "y": 1.5 },
-                },
+                { "label": "+", "x": 12, "y": 1.5 },
-                {
+                { "label": "Backspace", "x": 13, "y": 1.5, "w": 2 },
-                    "label": "F6",
+                { "label": "Insert", "x": 15.25, "y": 1.5 },
-                    "x": 7.5,
+                { "label": "Home", "x": 16.25, "y": 1.5 },
-                    "y": 0
+                { "label": "PgUp", "x": 17.25, "y": 1.5 },
-                },
-                {
+                { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 },
-                    "label": "F7",
+                { "label": "Q", "x": 1.5, "y": 2.5 },
-                    "x": 8.5,
+                { "label": "W", "x": 2.5, "y": 2.5 },
-                    "y": 0
+                { "label": "E", "x": 3.5, "y": 2.5 },
-                },
+                { "label": "R", "x": 4.5, "y": 2.5 },
-                {
+                { "label": "T", "x": 5.5, "y": 2.5 },
-                    "label": "F8",
+                { "label": "Y", "x": 6.5, "y": 2.5 },
-                    "x": 9.5,
+                { "label": "U", "x": 7.5, "y": 2.5 },
-                    "y": 0
+                { "label": "I", "x": 8.5, "y": 2.5 },
-                },
+                { "label": "O", "x": 9.5, "y": 2.5 },
-                {
+                { "label": "P", "x": 10.5, "y": 2.5 },
-                    "label": "F9",
+                { "label": "{", "x": 11.5, "y": 2.5 },
-                    "x": 11,
+                { "label": "}", "x": 12.5, "y": 2.5 },
-                    "y": 0
+                { "label": "Delete", "x": 15.25, "y": 2.5 },
-                },
+                { "label": "End", "x": 16.25, "y": 2.5 },
-                {
+                { "label": "PgDn", "x": 17.25, "y": 2.5 },
-                    "label": "F10",
-                    "x": 12,
+                { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 },
-                    "y": 0
+                { "label": "A", "x": 1.75, "y": 3.5 },
-                },
+                { "label": "S", "x": 2.75, "y": 3.5 },
-                {
+                { "label": "D", "x": 3.75, "y": 3.5 },
-                    "label": "F11",
+                { "label": "F", "x": 4.75, "y": 3.5 },
-                    "x": 13,
+                { "label": "G", "x": 5.75, "y": 3.5 },
-                    "y": 0
+                { "label": "H", "x": 6.75, "y": 3.5 },
-                },
+                { "label": "J", "x": 7.75, "y": 3.5 },
-                {
+                { "label": "K", "x": 8.75, "y": 3.5 },
-                    "label": "F12",
+                { "label": "L", "x": 9.75, "y": 3.5 },
-                    "x": 14,
+                { "label": ":", "x": 10.75, "y": 3.5 },
-                    "y": 0
+                { "label": "\"", "x": 11.75, "y": 3.5 },
-                },
+                { "label": "#", "x": 12.75, "y": 3.5 },
-                {
+                { "label": "Enter", "x": 13.75, "y": 2.5, "w": 1.25, "h": 2 },
-                    "label": "PrtSc",
-                    "x": 15.25,
+                { "label": "Shift", "x": 0, "y": 4.5, "w": 1.25 },
-                    "y": 0
+                { "label": "\\", "x": 1.25, "y": 4.5 },
-                },
+                { "label": "Z", "x": 2.25, "y": 4.5 },
-                {
+                { "label": "X", "x": 3.25, "y": 4.5 },
-                    "label": "Scroll Lock",
+                { "label": "C", "x": 4.25, "y": 4.5 },
-                    "x": 16.25,
+                { "label": "V", "x": 5.25, "y": 4.5 },
-                    "y": 0
+                { "label": "B", "x": 6.25, "y": 4.5 },
-                },
+                { "label": "N", "x": 7.25, "y": 4.5 },
-                {
+                { "label": "M", "x": 8.25, "y": 4.5 },
-                    "label": "Pause",
+                { "label": "<", "x": 9.25, "y": 4.5 },
-                    "x": 17.25,
+                { "label": ">", "x": 10.25, "y": 4.5 },
-                    "y": 0
+                { "label": "?", "x": 11.25, "y": 4.5 },
-                },
+                { "label": "Shift", "x": 12.25, "y": 4.5, "w": 2.75 },
-                {
+                { "label": "\u2191", "x": 16.25, "y": 4.5 },
-                    "label": "~",
-                    "x": 0,
+                { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.25 },
-                    "y": 1.5
+                { "label": "Win", "x": 1.25, "y": 5.5, "w": 1.25 },
-                },
+                { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.25 },
-                {
+                { "x": 3.75, "y": 5.5, "w": 6.25 },
-                    "label": "!",
+                { "label": "Alt", "x": 10, "y": 5.5, "w": 1.25 },
-                    "x": 1,
+                { "label": "Fn", "x": 11.25, "y": 5.5, "w": 1.25 },
-                    "y": 1.5
+                { "label": "Menu", "x": 12.5, "y": 5.5, "w": 1.25 },
-                },
+                { "label": "Ctrl", "x": 13.75, "y": 5.5, "w": 1.25 },
-                {
+                { "label": "\u2190", "x": 15.25, "y": 5.5 },
-                    "label": "@",
+                { "label": "\u2193", "x": 16.25, "y": 5.5 },
-                    "x": 2,
+                { "label": "\u2192", "x": 17.25, "y": 5.5 }
-                    "y": 1.5
+            ]
-                },
+        },
-                {
+        "LAYOUT_all": {
-                    "label": "#",
+            "layout": [
-                    "x": 3,
+                { "label": "Esc", "x": 0, "y": 0 },
-                    "y": 1.5
+                { "label": "F1", "x": 2, "y": 0 },
-                },
+                { "label": "F2", "x": 3, "y": 0 },
-                {
+                { "label": "F3", "x": 4, "y": 0 },
-                    "label": "$",
+                { "label": "F4", "x": 5, "y": 0 },
-                    "x": 4,
+                { "label": "F5", "x": 6.5, "y": 0 },
-                    "y": 1.5
+                { "label": "F6", "x": 7.5, "y": 0 },
-                },
+                { "label": "F7", "x": 8.5, "y": 0 },
-                {
+                { "label": "F8", "x": 9.5, "y": 0 },
-                    "label": "%",
+                { "label": "F9", "x": 11, "y": 0 },
-                    "x": 5,
+                { "label": "F10", "x": 12, "y": 0 },
-                    "y": 1.5
+                { "label": "F11", "x": 13, "y": 0 },
-                },
+                { "label": "F12", "x": 14, "y": 0 },
-                {
+                { "label": "PrtSc", "x": 15.25, "y": 0 },
-                    "label": "^",
+                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-                    "x": 6,
+                { "label": "Pause", "x": 17.25, "y": 0 },
-                    "y": 1.5
-                },
+                { "label": "~", "x": 0, "y": 1.5 },
-                {
+                { "label": "!", "x": 1, "y": 1.5 },
-                    "label": "&",
+                { "label": "@", "x": 2, "y": 1.5 },
-                    "x": 7,
+                { "label": "#", "x": 3, "y": 1.5 },
-                    "y": 1.5
+                { "label": "$", "x": 4, "y": 1.5 },
-                },
+                { "label": "%", "x": 5, "y": 1.5 },
-                {
+                { "label": "^", "x": 6, "y": 1.5 },
-                    "label": "*",
+                { "label": "&", "x": 7, "y": 1.5 },
-                    "x": 8,
+                { "label": "*", "x": 8, "y": 1.5 },
-                    "y": 1.5
+                { "label": "(", "x": 9, "y": 1.5 },
-                },
+                { "label": ")", "x": 10, "y": 1.5 },
-                {
+                { "label": "_", "x": 11, "y": 1.5 },
-                    "label": "(",
+                { "label": "+", "x": 12, "y": 1.5 },
-                    "x": 9,
+                { "label": "Backspace", "x": 13, "y": 1.5, "w": 2 },
-                    "y": 1.5
+                { "label": "Insert", "x": 15.25, "y": 1.5 },
-                },
+                { "label": "Home", "x": 16.25, "y": 1.5 },
-                {
+                { "label": "PgUp", "x": 17.25, "y": 1.5 },
-                    "label": ")",
-                    "x": 10,
+                { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 },
-                    "y": 1.5
+                { "label": "Q", "x": 1.5, "y": 2.5 },
-                },
+                { "label": "W", "x": 2.5, "y": 2.5 },
-                {
+                { "label": "E", "x": 3.5, "y": 2.5 },
-                    "label": "_",
+                { "label": "R", "x": 4.5, "y": 2.5 },
-                    "x": 11,
+                { "label": "T", "x": 5.5, "y": 2.5 },
-                    "y": 1.5
+                { "label": "Y", "x": 6.5, "y": 2.5 },
-                },
+                { "label": "U", "x": 7.5, "y": 2.5 },
-                {
+                { "label": "I", "x": 8.5, "y": 2.5 },
-                    "label": "+",
+                { "label": "O", "x": 9.5, "y": 2.5 },
-                    "x": 12,
+                { "label": "P", "x": 10.5, "y": 2.5 },
-                    "y": 1.5
+                { "label": "{", "x": 11.5, "y": 2.5 },
-                },
+                { "label": "}", "x": 12.5, "y": 2.5 },
-                {
+                { "label": "|", "x": 13.5, "y": 2.5, "w": 1.5 },
-                    "label": "Backspace",
+                { "label": "Delete", "x": 15.25, "y": 2.5 },
-                    "x": 13,
+                { "label": "End", "x": 16.25, "y": 2.5 },
-                    "y": 1.5,
+                { "label": "PgDn", "x": 17.25, "y": 2.5 },
-                    "w": 2
-                },
+                { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 },
-                {
+                { "label": "A", "x": 1.75, "y": 3.5 },
-                    "label": "Insert",
+                { "label": "S", "x": 2.75, "y": 3.5 },
-                    "x": 15.25,
+                { "label": "D", "x": 3.75, "y": 3.5 },
-                    "y": 1.5
+                { "label": "F", "x": 4.75, "y": 3.5 },
-                },
+                { "label": "G", "x": 5.75, "y": 3.5 },
-                {
+                { "label": "H", "x": 6.75, "y": 3.5 },
-                    "label": "Home",
+                { "label": "J", "x": 7.75, "y": 3.5 },
-                    "x": 16.25,
+                { "label": "K", "x": 8.75, "y": 3.5 },
-                    "y": 1.5
+                { "label": "L", "x": 9.75, "y": 3.5 },
-                },
+                { "label": ":", "x": 10.75, "y": 3.5 },
-                {
+                { "label": "\"", "x": 11.75, "y": 3.5 },
-                    "label": "PgUp",
+                { "label": "#", "x": 12.75, "y": 3.5 },
-                    "x": 17.25,
+                { "label": "Enter", "x": 13.75, "y": 3.5, "w": 1.25 },
-                    "y": 1.5
-                },
+                { "label": "Shift", "x": 0, "y": 4.5, "w": 1.25 },
-                {
+                { "label": "\\", "x": 1.25, "y": 4.5 },
-                    "label": "Tab",
+                { "label": "Z", "x": 2.25, "y": 4.5 },
-                    "x": 0,
+                { "label": "X", "x": 3.25, "y": 4.5 },
-                    "y": 2.5,
+                { "label": "C", "x": 4.25, "y": 4.5 },
-                    "w": 1.5
+                { "label": "V", "x": 5.25, "y": 4.5 },
-                },
+                { "label": "B", "x": 6.25, "y": 4.5 },
-                {
+                { "label": "N", "x": 7.25, "y": 4.5 },
-                    "label": "Q",
+                { "label": "M", "x": 8.25, "y": 4.5 },
-                    "x": 1.5,
+                { "label": "<", "x": 9.25, "y": 4.5 },
-                    "y": 2.5
+                { "label": ">", "x": 10.25, "y": 4.5 },
-                },
+                { "label": "?", "x": 11.25, "y": 4.5 },
-                {
+                { "label": "Shift", "x": 12.25, "y": 4.5, "w": 2.75 },
-                    "label": "W",
+                { "label": "\u2191", "x": 16.25, "y": 4.5 },
-                    "x": 2.5,
-                    "y": 2.5
+                { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.25 },
-                },
+                { "label": "Win", "x": 1.25, "y": 5.5, "w": 1.25 },
-                {
+                { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.25 },
-                    "label": "E",
+                { "x": 3.75, "y": 5.5, "w": 6.25 },
-                    "x": 3.5,
+                { "label": "Alt", "x": 10, "y": 5.5, "w": 1.25 },
-                    "y": 2.5
+                { "label": "Fn", "x": 11.25, "y": 5.5, "w": 1.25 },
-                },
+                { "label": "Menu", "x": 12.5, "y": 5.5, "w": 1.25 },
-                {
+                { "label": "Ctrl", "x": 13.75, "y": 5.5, "w": 1.25 },
-                    "label": "R",
+                { "label": "\u2190", "x": 15.25, "y": 5.5 },
-                    "x": 4.5,
+                { "label": "\u2193", "x": 16.25, "y": 5.5 },
-                    "y": 2.5
+                { "label": "\u2192", "x": 17.25, "y": 5.5 }
-                },
-                {
-                    "label": "T",
-                    "x": 5.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "Y",
-                    "x": 6.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "U",
-                    "x": 7.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "I",
-                    "x": 8.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "O",
-                    "x": 9.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "P",
-                    "x": 10.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "{",
-                    "x": 11.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "}",
-                    "x": 12.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "Enter",
-                    "x": 13.75,
-                    "y": 2.5,
-                    "w": 1.25,
-                    "h": 2
-                },
-                {
-                    "label": "Delete",
-                    "x": 15.25,
-                    "y": 2.5
-                },
-                {
-                    "label": "End",
-                    "x": 16.25,
-                    "y": 2.5
-                },
-                {
-                    "label": "PgDn",
-                    "x": 17.25,
-                    "y": 2.5
-                },
-                {
-                    "label": "Caps Lock",
-                    "x": 0,
-                    "y": 3.5,
-                    "w": 1.75
-                },
-                {
-                    "label": "A",
-                    "x": 1.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "S",
-                    "x": 2.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "D",
-                    "x": 3.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "F",
-                    "x": 4.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "G",
-                    "x": 5.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "H",
-                    "x": 6.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "J",
-                    "x": 7.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "K",
-                    "x": 8.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "L",
-                    "x": 9.75,
-                    "y": 3.5
-                },
-                {
-                    "label": ":",
-                    "x": 10.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "\"",
-                    "x": 11.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "#",
-                    "x": 12.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "Shift",
-                    "x": 0,
-                    "y": 4.5,
-                    "w": 1.25
-                },
-                {
-                    "label": "\\",
-                    "x": 1.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "Z",
-                    "x": 2.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "X",
-                    "x": 3.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "C",
-                    "x": 4.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "V",
-                    "x": 5.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "B",
-                    "x": 6.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "N",
-                    "x": 7.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "M",
-                    "x": 8.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "<",
-                    "x": 9.25,
-                    "y": 4.5
-                },
-                {
-                    "label": ">",
-                    "x": 10.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "?",
-                    "x": 11.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "Shift",
-                    "x": 12.25,
-                    "y": 4.5,
-                    "w": 2.75
-                },
-                {
-                    "label": "\u2191",
-                    "x": 16.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "Ctrl",
-                    "x": 0,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "label": "Win",
-                    "x": 1.25,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "label": "Alt",
-                    "x": 2.5,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "x": 3.75,
-                    "y": 5.5,
-                    "w": 6.25
-                },
-                {
-                    "label": "Alt",
-                    "x": 10,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "label": "Fn",
-                    "x": 11.25,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "label": "Menu",
-                    "x": 12.5,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "label": "Ctrl",
-                    "x": 13.75,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "label": "\u2190",
-                    "x": 15.25,
-                    "y": 5.5
-                },
-                {
-                    "label": "\u2193",
-                    "x": 16.25,
-                    "y": 5.5
-                },
-                {
-                    "label": "\u2192",
-                    "x": 17.25,
-                    "y": 5.5
-                }
            ]
        }
    }
diff --git a/keyboards/durgod/k320/k320.c b/keyboards/durgod/k320/k320.c
index f5500ea83..42091f36c 100644
--- a/keyboards/durgod/k320/k320.c
+++ b/keyboards/durgod/k320/k320.c
@@ -40,3 +40,23 @@ void led_init_ports(void) {
    off_all_leds();
 }
+#ifndef WINLOCK_DISABLED
+static bool win_key_locked = false;
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_TGUI:
+            if (record->event.pressed) {
+                // Toggle GUI lock on key press
+                win_key_locked = !win_key_locked;
+                writePin(LED_WIN_LOCK_PIN, !win_key_locked);
+            }
+            break;
+        case KC_LGUI:
+            if (win_key_locked) { return false; }
+            break;
+    }
+    return process_record_user(keycode, record);
+}
+#endif /* WINLOCK_DISABLED */
diff --git a/keyboards/durgod/k320/k320.h b/keyboards/durgod/k320/k320.h
index 48da04841..c504f5a2b 100644
--- a/keyboards/durgod/k320/k320.h
+++ b/keyboards/durgod/k320/k320.h
@@ -17,6 +17,17 @@
 #include "quantum.h"
+#ifndef WINLOCK_DISABLED
+// Define the TGUI key here so it is available in QMK configurator
+enum K320_keycodes {
+    KC_TGUI = SAFE_RANGE,   // Toggle between GUI Lock or Unlock
+    NEW_SAFE_RANGE
+};
+#undef SAFE_RANGE
+#define SAFE_RANGE NEW_SAFE_RANGE
+#endif /* WINLOCK_DISABLED */
 /* Function Prototype */
 void off_all_leds(void);
 void on_all_leds(void);
@@ -26,12 +37,12 @@ void on_all_leds(void);
 // This a shortcut to help you visually see your layout.
 #define LAYOUT_tkl_ansi( \
-      K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,            K0D,  K0E,  K0F, \
+      K00,        K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,      K0D,  K0E,  K0F,  \
-      K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1E,      K2E,  K2F,  K1F, \
+      K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1E,      K2E,  K2F,  K1F,  \
-      K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D,      K3D,  K3E,  K3F, \
+      K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D,      K3D,  K3E,  K3F,  \
-      K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K4E, \
+      K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,        K4E,                        \
-      K40,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,  K4D,                   K4F, \
+      K40,        K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,        K4D,            K4F,        \
-      K50,  K51,  K52,              K56,                    K5A,  K5B,  K5C,  K5D,       K5E,  K5F,  K6F \
+      K50,  K51,  K52,                    K56,                    K5A,  K5B,  K5C,  K5D,      K5E,  K5F,  K6F   \
 ) { \
    { K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D,  K0E,  K0F },  \
    { K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  XXX,  K1E,  K1F },  \
@@ -45,10 +56,10 @@ void on_all_leds(void);
 // This a shortcut to help you visually see your layout.
 #define LAYOUT_tkl_iso( \
-      K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,            K0D,  K0E,  K0F,  \
+      K00,        K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,      K0D,  K0E,  K0F,  \
      K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1E,      K2E,  K2F,  K1F,  \
-      K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K4E,      K3D,  K3E,  K3F,  \
+      K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,            K3D,  K3E,  K3F,  \
-      K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K3C,                              \
+      K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K3C,  K4E,                        \
      K40,  K41,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,        K4D,            K4F,        \
      K50,  K51,  K52,                    K56,                    K5A,  K5B,  K5C,  K5D,      K5E,  K5F,  K6F   \
 ) { \
@@ -64,7 +75,7 @@ void on_all_leds(void);
 // This a shortcut to help you visually see your layout.
 #define LAYOUT_all( \
-      K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,            K0D,  K0E,  K0F,  \
+      K00,        K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,      K0D,  K0E,  K0F,  \
      K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1E,      K2E,  K2F,  K1F,  \
      K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D,      K3D,  K3E,  K3F,  \
      K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K3C,  K4E,                        \
diff --git a/keyboards/durgod/k320/keymaps/default/keymap.c b/keyboards/durgod/k320/keymaps/default/keymap.c
deleted file mode 100644
index 49a14ec29..000000000
--- a/keyboards/durgod/k320/keymaps/default/keymap.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Copyright 2021 kuenhlee and Don Kjer
- *
- * 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
-// Layer shorthand
-enum _layer {
-    _BASE,
-    _FUNC
-};
-static bool win_key_locked = false;
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-    KC_TGUI = SAFE_RANGE   // Toggle between GUI Lock or Unlock
-};
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BASE: Base Layer (Default Layer)
-   * ,-----------------------------------------------------------.  ,--------------.
-   * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
-   * |-----------------------------------------------------------|  |--------------|
-   * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
-   * |-----------------------------------------------------------|  |--------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|  | Del| End|PgDn|
-   * |-----------------------------------------------------------|  `--------------'
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-   * |-----------------------------------------------------------|        ,----.
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
-   * |-----------------------------------------------------------|   ,-------------.
-   * |Ctrl|Gui |Alt |      Space            |Alt |Func |App |Ctrl|   |Lft| Dn |Rig |
-   * `-----------------------------------------------------------'   `-------------'
-   */
-  [_BASE] = LAYOUT_tkl_ansi( /* Base Layer */
-      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_SLCK,  KC_PAUS,
-      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_INS,   KC_HOME,  KC_PGUP,
-      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_DEL,   KC_END,   KC_PGDN,
-      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_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_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(_FUNC),KC_APP,   KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
-  ),
-  /* Keymap _FUNC: Function Layer
-   * ,-----------------------------------------------------------.  ,--------------.
-   * |   |Play|Stop|Prev|Next| |Mute|Vol+|Vol-|    | |  |  |  |  |  |    |    |    |
-   * |-----------------------------------------------------------|  |--------------|
-   * |   |   |   |   |   |   |   |   |   |   |   |   |   |       |  |    |    |    |
-   * |-----------------------------------------------------------|  |--------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |  |    |    |    |
-   * |-----------------------------------------------------------|  `--------------'
-   * |       |   |   |   |   |   |   |   |   |   |   |   |       |
-   * |-----------------------------------------------------------|        ,----.
-   * |        |   |   |   |   |   |   |   |   |   |   |          |        |    |
-   * |-----------------------------------------------------------|   ,-------------.
-   * |    |Lock|    |                       |    |Func |    |    |   |   |    |    |
-   * `-----------------------------------------------------------'   `-------------'
-   */
-  [_FUNC] = LAYOUT_tkl_ansi( /* Function Layer */
-      _______,  KC_MPLY,  KC_MSTP,  KC_MRWD,  KC_MFFD,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-      _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,
-      _______,  KC_TGUI,  _______,                                _______,                                _______,  _______,  _______,  _______,  _______,  _______,   _______
-  )
-};
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_TGUI:
-            if (!record->event.pressed) {
-                // Toggle GUI lock on key release
-                win_key_locked = !win_key_locked;
-                writePin(LED_WIN_LOCK_PIN, !win_key_locked);
-            }
-            break;
-        case KC_LGUI:
-            if (win_key_locked) { return false; }
-            break;
-    }
-    return true;
-}
diff --git a/keyboards/durgod/k320/keymaps/default/keymap.json b/keyboards/durgod/k320/keymaps/default/keymap.json
new file mode 100644
index 000000000..d8242ae76
--- /dev/null
+++ b/keyboards/durgod/k320/keymaps/default/keymap.json
@@ -0,0 +1,26 @@
+{
+  "keyboard": "durgod/k320",
+  "keymap": "default",
+  "layout": "LAYOUT_all",
+  "layers": [
+    [
+      "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_SLCK", "KC_PAUS",
+      "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_INS",  "KC_HOME", "KC_PGUP",
+      "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_DEL",  "KC_END",  "KC_PGDN",
+      "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_NUHS", "KC_ENT",
+      "KC_LSFT", "KC_NUBS", "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_LCTL", "KC_LGUI", "KC_LALT",                                  "KC_SPC",                                   "KC_RALT", "MO(1)",   "KC_APP",  "KC_RCTL",    "KC_LEFT", "KC_DOWN", "KC_RGHT"
+    ],
+    [
+      "KC_TRNS",            "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_MUTE", "KC_VOLD", "KC_VOLU", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",    "KC_TRNS", "KC_TRNS", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",    "KC_TRNS", "KC_TRNS", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",    "KC_TRNS", "KC_TRNS", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",            "KC_TRNS",               "KC_TRNS",
+      "KC_TRNS", "KC_TGUI", "KC_TRNS",                                  "KC_TRNS",                                  "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",    "KC_TRNS", "KC_TRNS",  "KC_TRNS"
+    ]
+  ],
+  "author":"dkjer",
+  "notes":"",
+  "version":1
+}
diff --git a/keyboards/durgod/k320/keymaps/default/readme.md b/keyboards/durgod/k320/keymaps/default/readme.md
index e26c79c8a..c94943a83 100644
--- a/keyboards/durgod/k320/keymaps/default/readme.md
+++ b/keyboards/durgod/k320/keymaps/default/readme.md
@@ -1,6 +1,8 @@
 # The default keymap for Durgod Taurus K320.
-Layer 0 : Standard ANSI 87 Keys TKL layout (Windows)
+Supports both ANSI and ISO layouts.
+Layer 0 : Standard 87/88 keys TKL layout (Windows)
 Layer 1 : Media control and Windows lock key
 - Reusing Durgod's Original Media Control for Fn + F1 ~ Fn + F7
diff --git a/keyboards/durgod/k320/keymaps/default_iso/keymap.c b/keyboards/durgod/k320/keymaps/default_iso/keymap.c
deleted file mode 100644
index 559b6fe71..000000000
--- a/keyboards/durgod/k320/keymaps/default_iso/keymap.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright 2021 kuenhlee and Don Kjer
- *
- * 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
-// Layer shorthand
-enum _layer {
-    _BASE,
-    _FUNC
-};
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BASE: Base Layer (Default Layer)
-   * ,-----------------------------------------------------------.  ,--------------.
-   * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
-   * |-----------------------------------------------------------|  |--------------|
-   * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
-   * |-----------------------------------------------------------|  |--------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     |  | Del| End|PgDn|
-   * |------------------------------------------------------ Ret |  `--------------'
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '| #|    |
-   * |-----------------------------------------------------------|        ,----.
-   * |Shift| \|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
-   * |-----------------------------------------------------------|   ,-------------.
-   * |Ctrl|Gui |Alt |      Space            |Alt | Fn  |App |Ctrl|   |Lft| Dn |Rig |
-   * `-----------------------------------------------------------'   `-------------'
-   */
-  [_BASE] = LAYOUT_tkl_iso( /* Base Layer */
-      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_SLCK,  KC_PAUS,
-      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_INS,   KC_HOME,  KC_PGUP,
-      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_ENT,   KC_DEL,   KC_END,   KC_PGDN,  
-      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_NUHS,
-      KC_LSFT,  KC_NUBS,  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_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(_FUNC),KC_APP,   KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
-  ),
-  /* Keymap _FUNC: Function Layer
-   * ,-----------------------------------------------------------.  ,--------------.
-   * |   |Play|Stop|Prev|Next| |Mute|Vol+|Vol-|    | |  |  |  |  |  |    |    |    |
-   * |-----------------------------------------------------------|  |--------------|
-   * |   |   |   |   |   |   |   |   |   |   |   |   |   |       |  |    |    |    |
-   * |-----------------------------------------------------------|  |--------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |  |    |    |    |
-   * |-------------------------------------------------------    |  `--------------'
-   * |       |   |   |   |   |   |   |   |   |   |   |   |  |    |
-   * |-----------------------------------------------------------|        ,----.
-   * |     |  |   |   |   |   |   |   |   |   |   |   |          |        |    |
-   * |-----------------------------------------------------------|   ,-------------.
-   * |    |    |    |                       |    |Func |    |    |   |   |    |    |
-   * `-----------------------------------------------------------'   `-------------'
-   */
-  [_FUNC] = LAYOUT_tkl_iso( /* Function Layer */
-      _______,  KC_MPLY,  KC_MSTP,  KC_MRWD,  KC_MFFD,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______,  _______,  _______,  _______,                _______,  _______,  _______,
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,  _______,  _______,
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,  _______,  _______,
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, 
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,                _______,
-      _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,      _______,  _______,  _______
-  )
-};
diff --git a/keyboards/durgod/k320/keymaps/default_iso/readme.md b/keyboards/durgod/k320/keymaps/default_iso/readme.md
deleted file mode 100644
index a7d1d5f1d..000000000
--- a/keyboards/durgod/k320/keymaps/default_iso/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# The ISO keymap for Durgod Taurus K320.
-Layer 0 : Standard ISO 88 Keys TKL layout (Windows)
-Layer 1 : Media control and Windows lock key
- Reusing Durgod's Original Media Control for Fn + F1 ~ Fn + F7
diff --git a/keyboards/durgod/k320/keymaps/default_iso_mac/keymap.c b/keyboards/durgod/k320/keymaps/default_iso_mac/keymap.c
deleted file mode 100644
index 783fc45f1..000000000
--- a/keyboards/durgod/k320/keymaps/default_iso_mac/keymap.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2021 kuenhlee and Don Kjer
- *
- * 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
-// Layer shorthand
-enum _layer {
-    _BASE,
-    _FUNC
-};
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BASE: Base Layer (Default Layer)
-   * ,-----------------------------------------------------------.  ,--------------.
-   * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
-   * |-----------------------------------------------------------|  |--------------|
-   * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
-   * |-----------------------------------------------------------|  |--------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     |  | Del| End|PgDn|
-   * |------------------------------------------------------ Ret |  `--------------'
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '| #|    |
-   * |-----------------------------------------------------------|        ,----.
-   * |Shift| \|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
-   * |-----------------------------------------------------------|   ,-------------.
-   * |Ctrl|Alt |Gui |      Space            |Alt | Fn  |App |Ctrl|   |Lft| Dn |Rig |
-   * `-----------------------------------------------------------'   `-------------'
-   */
-  [_BASE] = LAYOUT_tkl_iso( /* Base Layer */
-      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_SLCK,  KC_PAUS,
-      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_INS,   KC_HOME,  KC_PGUP,
-      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_ENT,   KC_DEL,   KC_END,   KC_PGDN,
-      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_NUHS, 
-      KC_LSFT,  KC_NUBS,  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_LCTL,  KC_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RALT,  MO(_FUNC),KC_APP,   KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
-  ),
-  /* Keymap _FUNC: Function Layer
-   * ,-----------------------------------------------------------.  ,--------------.
-   * |   |Play|Stop|Prev|Next| |Mute|Vol+|Vol-|    | |  |  |  |  |  |    |    |    |
-   * |-----------------------------------------------------------|  |--------------|
-   * |   |   |   |   |   |   |   |   |   |   |   |   |   |       |  |    |    |    |
-   * |-----------------------------------------------------------|  |--------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |  |    |    |    |
-   * |-------------------------------------------------------    |  `--------------'
-   * |       |   |   |   |   |   |   |   |   |   |   |   |  |    |
-   * |-----------------------------------------------------------|        ,----.
-   * |     |  |   |   |   |   |   |   |   |   |   |   |          |        |    |
-   * |-----------------------------------------------------------|   ,-------------.
-   * |    |    |    |                       |    |Func |    |    |   |   |    |    |
-   * `-----------------------------------------------------------'   `-------------'
-   */
-  [_FUNC] = LAYOUT_tkl_iso( /* Function Layer */
-      _______,  KC_MPLY,  KC_MSTP,  KC_MRWD,  KC_MFFD,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______,  _______,  _______,  _______,                _______,  _______,  _______,
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,  _______,  _______,
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,  _______,  _______,
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, 
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,                _______,
-      _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,      _______,  _______,  _______
-  )
-};
diff --git a/keyboards/durgod/k320/keymaps/default_iso_mac/readme.md b/keyboards/durgod/k320/keymaps/default_iso_mac/readme.md
deleted file mode 100644
index 354f7b4cb..000000000
--- a/keyboards/durgod/k320/keymaps/default_iso_mac/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# The ISO (Mac) keymap for Durgod Taurus K320.
-Layer 0 : Standard ISO 88 Keys TKL layout (Mac)
-Layer 1 : Media control
- Reusing Durgod's Original Media Control for Fn + F1 ~ Fn + F7
diff --git a/keyboards/durgod/k320/keymaps/default_mac/keymap.json b/keyboards/durgod/k320/keymaps/default_mac/keymap.json
new file mode 100644
index 000000000..dc5d3d3fd
--- /dev/null
+++ b/keyboards/durgod/k320/keymaps/default_mac/keymap.json
@@ -0,0 +1,26 @@
+{
+  "keyboard": "durgod/k320",
+  "keymap": "default_mac",
+  "layout": "LAYOUT_all",
+  "layers": [
+    [
+      "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_F13",  "KC_F14",  "KC_F15",
+      "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_INS",  "KC_HOME", "KC_PGUP",
+      "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_DEL",  "KC_END",  "KC_PGDN",
+      "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_NUHS", "KC_ENT",
+      "KC_LSFT", "KC_NUBS", "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_LCTL", "KC_LALT", "KC_LGUI",                                  "KC_SPC",                                   "KC_RGUI", "KC_RALT", "MO(1)",   "KC_RCTL",    "KC_LEFT", "KC_DOWN", "KC_RGHT"
+    ],
+    [
+      "KC_TRNS",            "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_MUTE", "KC_VOLD", "KC_VOLU", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",    "KC_TRNS", "KC_TRNS", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",    "KC_TRNS", "KC_TRNS", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",    "KC_TRNS", "KC_TRNS", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",            "KC_TRNS",               "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS",                                  "KC_TRNS",                                  "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",    "KC_TRNS", "KC_TRNS",  "KC_TRNS"
+    ]
+  ],
+  "author":"AlCutter",
+  "notes":"",
+  "version":1
+}
diff --git a/keyboards/durgod/k320/keymaps/default_mac/readme.md b/keyboards/durgod/k320/keymaps/default_mac/readme.md
new file mode 100644
index 000000000..2765f14f9
--- /dev/null
+++ b/keyboards/durgod/k320/keymaps/default_mac/readme.md
@@ -0,0 +1,8 @@
+# The default (Mac) keymap for Durgod Taurus K320.
+Supports both ANSI and ISO layouts.
+Layer 0 : Standard 87/88 keys TKL layout (Mac)
+Layer 1 : Media control
+- Reusing Durgod's Original Media Control for Fn + F1 ~ Fn + F7
diff --git a/keyboards/durgod/k320/keymaps/default_toggle_mac_windows/keymap.c b/keyboards/durgod/k320/keymaps/default_toggle_mac_windows/keymap.c
index 834d2ca55..8494fbe03 100644
--- a/keyboards/durgod/k320/keymaps/default_toggle_mac_windows/keymap.c
+++ b/keyboards/durgod/k320/keymaps/default_toggle_mac_windows/keymap.c
@@ -59,20 +59,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   * |-----------------------------------------------------------|  |--------------|
   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|  | Del| End|PgDn|
   * |-----------------------------------------------------------|  `--------------'
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
+   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '| #|Ret |
   * |-----------------------------------------------------------|        ,----.
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
+   * |Shift| \|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
   * |-----------------------------------------------------------|   ,-------------.
   * |Ctrl|Gui |Alt |      Space            |Alt |Func |App|Ctrl |   |Lft| Dn |Rig |
   * `-----------------------------------------------------------'   `-------------'
   */
-  [_WBL] = LAYOUT_tkl_ansi( /* Windows Base Layer */
+  [_WBL] = LAYOUT_all( /* Windows Base Layer */
-      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_SLCK,  KC_PAUS,
+      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_SLCK,  KC_PAUS,
-      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_INS,   KC_HOME,  KC_PGUP,
+      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_INS,   KC_HOME,  KC_PGUP,
-      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_DEL,   KC_END,   KC_PGDN,
+      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_DEL,   KC_END,   KC_PGDN,
-      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_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
-      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_LSFT,  KC_NUBS,  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_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_WFN,   KC_APP,   KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
+      KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_WFN,   KC_APP,   KC_RCTL,     KC_LEFT,  KC_DOWN,  KC_RGHT
  ),
  /* Keymap _WFL: Windows Function Layer
   * ,-----------------------------------------------------------.  ,--------------.
@@ -82,20 +82,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   * |-----------------------------------------------------------|  |--------------|
   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |  |    |    |    |
   * |-----------------------------------------------------------|  `--------------'
-   * |       |   |   |   |   |   |   |   |   |   |   |   |       |
+   * |       |   |   |   |   |   |   |   |   |   |   |   |  |    |
   * |-----------------------------------------------------------|        ,----.
-   * |        |   |   |   |   |   |   |   |   |   |   |          |        |    |
+   * |     |  |   |   |   |   |   |   |   |   |   |   |          |        |    |
   * |-----------------------------------------------------------|   ,-------------.
   * |    |Lock|    |                       |    |Func |Sys|     |   |   |    |    |
   * `-----------------------------------------------------------'   `-------------'
   */
-  [_WFL] = LAYOUT_tkl_ansi( /* Windows First Layer */
+  [_WFL] = LAYOUT_all( /* Windows First Layer */
-      _______,  KC_MPLY,  KC_MSTP,  KC_MRWD,  KC_MFFD,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,
+      _______,            KC_MPLY,  KC_MSTP,  KC_MPRV,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______,  _______,  _______,  _______,     _______,  _______,  _______,
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,     _______,  _______,  _______,
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,     _______,  _______,  _______,
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-      _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,
+      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,               _______,
-      _______,  KC_TGUI,  _______,                                _______,                                _______,  _______,  MO_WSL,   _______,  _______,  _______,  _______
+      _______,  KC_TGUI,  _______,                                _______,                                _______,  _______,  MO_WSL,   _______,     _______,  _______,  _______
  ),
  /* Keymap _WSL: Windows System Layer
   * ,-----------------------------------------------------------.  ,--------------.
@@ -105,20 +105,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   * |-----------------------------------------------------------|  |--------------|
   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |  |    |    |    |
   * |-----------------------------------------------------------|  `--------------'
-   * |       |   |   |   |   |   |   |   |   |   |   |   |       |
+   * |       |   |   |   |   |   |   |   |   |   |   |   |  |    |
   * |-----------------------------------------------------------|        ,----.
-   * |        |   |   |   |   |   |   |   |   |   |   |          |        |    |
+   * |     |  |   |   |   |   |   |   |   |   |   |   |          |        |    |
   * |-----------------------------------------------------------|   ,-------------.
   * |    |    |    |                       |    |Func |Sys|     |   |   |    |    |
   * `-----------------------------------------------------------'   `-------------'
   */
-  [_WSL] = LAYOUT_tkl_ansi( /* Windows Second / System Layer */
+  [_WSL] = LAYOUT_all( /* Windows Second / System Layer */
-      RESET,    KC_SLEP,  XXXXXXX,  XXXXXXX,  KC_PWR,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  DF_W2MBL,           XXXXXXX,  XXXXXXX,  XXXXXXX,
+      RESET,              KC_SLEP,  XXXXXXX,  XXXXXXX,  KC_PWR,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  DF_W2MBL,    XXXXXXX,  XXXXXXX,  XXXXXXX,
-      XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+      XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,     XXXXXXX,  XXXXXXX,  XXXXXXX,
-      XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+      XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,     XXXXXXX,  XXXXXXX,  XXXXXXX,
-      XXXXXXX,  XXXXXXX,  XXXXXXX,  DEBUG,    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  
+      XXXXXXX,  XXXXXXX,  XXXXXXX,  DEBUG,    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-      XXXXXXX,            XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,                      XXXXXXX,
+      XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,            XXXXXXX,               XXXXXXX,
-      XXXXXXX,  XXXXXXX,  XXXXXXX,                                XXXXXXX,                                XXXXXXX,  _______,  _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX
+      XXXXXXX,  XXXXXXX,  XXXXXXX,                                XXXXXXX,                                XXXXXXX,  _______,  _______,  XXXXXXX,     XXXXXXX,  XXXXXXX,  XXXXXXX
  ),
  /* Keymap _MBL: Mac Base Layer (Alternate Layout)
@@ -129,20 +129,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   * |-----------------------------------------------------------|  |--------------|
   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|  | Del| End|PgDn|
   * |-----------------------------------------------------------|  `--------------'
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
+   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '| #|Ret |
   * |-----------------------------------------------------------|        ,----.
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
+   * |Shift| \|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
   * |-----------------------------------------------------------|   ,-------------.
   * |Ctrl|Alt |Gui |      Space            |Gui |Alt|Func |Ctrl |   |Lft| Dn |Rig |
   * `-----------------------------------------------------------'   `-------------'
   */
-  [_MBL] = LAYOUT_tkl_ansi( /* Mac Base Layer */
+  [_MBL] = LAYOUT_all( /* Mac Base Layer */
-      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_F13,   KC_F14,   KC_F15,
+      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_F13,   KC_F14,   KC_F15,
-      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_INS,   KC_HOME,  KC_PGUP,
+      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_INS,   KC_HOME,  KC_PGUP,
-      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_DEL,   KC_END,   KC_PGDN,
+      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_DEL,   KC_END,   KC_PGDN,
-      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_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
-      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_LSFT,  KC_NUBS,  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_LCTL,  KC_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RGUI,  KC_RALT,  KC_MFN,   KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
+      KC_LCTL,  KC_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RGUI,  KC_RALT,  KC_MFN,   KC_RCTL,     KC_LEFT,  KC_DOWN,  KC_RGHT
  ),
  /* Keymap _MFL: Mac Function Layer
   * ,-----------------------------------------------------------.  ,--------------.
@@ -152,20 +152,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   * |-----------------------------------------------------------|  |--------------|
   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |  |    |    |    |
   * |-----------------------------------------------------------|  `--------------'
-   * |       |   |   |   |   |   |   |   |   |   |   |   |       |
+   * |       |   |   |   |   |   |   |   |   |   |   |   |  |    |
   * |-----------------------------------------------------------|        ,----.
-   * |        |   |   |   |   |   |   |   |   |   |   |          |        |    |
+   * |     |  |   |   |   |   |   |   |   |   |   |   |          |        |    |
   * |-----------------------------------------------------------|   ,-------------.
   * |    |    |    |                       |    |Sys|Func |     |   |   |    |    |
   * `-----------------------------------------------------------'   `-------------'
   */
-  [_MFL] = LAYOUT_tkl_ansi( /* Mac First Layer */
+  [_MFL] = LAYOUT_all( /* Mac First Layer */
-      _______,  KC_BRID,  KC_BRIU,  _______,  _______,  _______,  _______,  KC_MRWD,  KC_MPLY,  KC_MFFD,  KC_MUTE,  KC_VOLD,  KC_VOLU,            KC_TMED,  _______,  _______,
+      _______,            KC_BRID,  KC_BRIU,  _______,  _______,  _______,  _______,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,     KC_TMED,  _______,  _______,
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,     _______,  _______,  _______,
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,     _______,  _______,  _______,
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-      _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,
+      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,               _______,
-      _______,  _______,  _______,                                _______,                                _______,  MO_MSL,   _______,  _______,  _______,  _______,  _______
+      _______,  _______,  _______,                                _______,                                _______,  MO_MSL,   _______,  _______,     _______,  _______,  _______
  ),
  /* Keymap _MSL: Mac System Layer
   * ,-----------------------------------------------------------.  ,--------------.
@@ -175,20 +175,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   * |-----------------------------------------------------------|  |--------------|
   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |  |    |    |    |
   * |-----------------------------------------------------------|  `--------------'
-   * |       |   |   |   |   |   |   |   |   |   |   |   |       |
+   * |       |   |   |   |   |   |   |   |   |   |   |   |  |    |
   * |-----------------------------------------------------------|        ,----.
-   * |        |   |   |   |   |   |   |   |   |   |   |          |        |    |
+   * |     |  |   |   |   |   |   |   |   |   |   |   |          |        |    |
   * |-----------------------------------------------------------|   ,-------------.
   * |    |    |    |                       |    |Sys|Func |     |   |   |    |    |
   * `-----------------------------------------------------------'   `-------------'
   */
-  [_MSL] = LAYOUT_tkl_ansi( /* Mac Second / System Layer */
+  [_MSL] = LAYOUT_all( /* Mac Second / System Layer */
-      RESET,    XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_SLEP,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  DF_M2WBL,           XXXXXXX,  XXXXXXX,  XXXXXXX,
+      RESET,              XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_SLEP,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  DF_M2WBL,    XXXXXXX,  XXXXXXX,  XXXXXXX,
-      XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+      XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,     XXXXXXX,  XXXXXXX,  XXXXXXX,
-      XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+      XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,     XXXXXXX,  XXXXXXX,  XXXXXXX,
-      XXXXXXX,  XXXXXXX,  XXXXXXX,  DEBUG,    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+      XXXXXXX,  XXXXXXX,  XXXXXXX,  DEBUG,    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-      XXXXXXX,            XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,                      XXXXXXX,
+      XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,            XXXXXXX,               XXXXXXX,
-      XXXXXXX,  XXXXXXX,  XXXXXXX,                                XXXXXXX,                                XXXXXXX,  _______,  _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX
+      XXXXXXX,  XXXXXXX,  XXXXXXX,                                XXXXXXX,                                XXXXXXX,  _______,  _______,  XXXXXXX,     XXXXXXX,  XXXXXXX,  XXXXXXX
  )
 };
diff --git a/keyboards/durgod/k320/keymaps/default_toggle_mac_windows/readme.md b/keyboards/durgod/k320/keymaps/default_toggle_mac_windows/readme.md
index 821c8b26a..0eef77fd4 100644
--- a/keyboards/durgod/k320/keymaps/default_toggle_mac_windows/readme.md
+++ b/keyboards/durgod/k320/keymaps/default_toggle_mac_windows/readme.md
@@ -1,6 +1,8 @@
 # A keymap for Durgod Taurus K320 that supports toggling between Mac and Windows
-Layer 0 : Standard ANSI 87 Keys TKL layout (Windows)
+Supports both ANSI and ISO layouts.
+Layer 0 : Standard 87/88 keys TKL layout (Windows)
 Layer 1 : Media control and Windows lock key (Windows)
 - Reusing Durgod's Original Media Control for Fn + F1 ~ Fn + F7
@@ -12,7 +14,7 @@ Layer 2 : System layer (Windows)
 - Fn + Menu + F4  : Turning Off System
 - Fn + Menu + F12 : Switch to Mac layout
-Layer 3 : Mac 87 Keys TKL layout
+Layer 3 : Mac 87/88 keys TKL layout
 Layer 4 : Media control and Media lock key (Mac)
 - Standard Mac Media keys for Fn + F1 ~ Fn + F12.
@@ -61,4 +63,3 @@ For repeating Flashing you have two options with this keymap:
 2. Use key combination if using default keymap
 - Hold down Fn + Menu (Windows Layout) or Fn + Right-Alt (Mac layout)  (These are the same physical keys)
 - Press Esc.  Keyboard should go into booloader state.
diff --git a/keyboards/durgod/k320/keymaps/default_toggle_mac_windows/rules.mk b/keyboards/durgod/k320/keymaps/default_toggle_mac_windows/rules.mk
new file mode 100644
index 000000000..19843e8a2
--- /dev/null
+++ b/keyboards/durgod/k320/keymaps/default_toggle_mac_windows/rules.mk
@@ -0,0 +1 @@
+OPT_DEFS += -DWINLOCK_DISABLED
diff --git a/keyboards/durgod/k320/keymaps/kuenhlee/keymap.c b/keyboards/durgod/k320/keymaps/kuenhlee/keymap.c
index bf79f24db..866e522fc 100644
--- a/keyboards/durgod/k320/keymaps/kuenhlee/keymap.c
+++ b/keyboards/durgod/k320/keymaps/kuenhlee/keymap.c
@@ -35,11 +35,6 @@
 #define KC_STOP LCTL(LSFT(KC_HOME))   // Select from Cursor to Home
 #define KC_SEND LCTL(LSFT(KC_END))    // Select from Cursor to End
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-  KC_TGUI = SAFE_RANGE  // Toggle between GUI Lock or Unlock
-};
 // °±²³µ©ΩθΩ√∞∆≈≠→↓←↑≡■□●○∴«»÷≤≥Σ
 // Defines the Enumeration for Unicode Map
 enum unicode_names {
diff --git a/keyboards/durgod/k320/keymaps/via/keymap.c b/keyboards/durgod/k320/keymaps/via/keymap.c
index 9a4d9ff38..fc46e3860 100644
--- a/keyboards/durgod/k320/keymaps/via/keymap.c
+++ b/keyboards/durgod/k320/keymaps/via/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 kuenhlee and Don Kjer
+/* Copyright 2021 Maxime Coirault
 *
 * 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
@@ -19,7 +19,8 @@
 enum _layer {
    _BASE,
    _FUNC,
-    _LAYER3
+    _LAYER3,
+    _LAYER4
 };
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -39,12 +40,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   * `-----------------------------------------------------------'   `-------------'
   */
  [_BASE] = LAYOUT_all( /* Base Layer */
-      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_SLCK,  KC_PAUS,
+      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_SLCK,  KC_PAUS,
-      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_INS,   KC_HOME,  KC_PGUP,
+      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_INS,   KC_HOME,  KC_PGUP,
-      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_DEL,   KC_END,   KC_PGDN,
+      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_DEL,   KC_END,   KC_PGDN,
      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_NUHS,  KC_ENT,
-      KC_LSFT,  KC_NUBS,  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_LSFT,  KC_NUBS,  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_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(_FUNC),KC_APP,   KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
+      KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(_FUNC),KC_APP,   KC_RCTL,      KC_LEFT,  KC_DOWN,  KC_RGHT
  ),
  /* Keymap _FUNC: Function Layer
   * ,-----------------------------------------------------------.  ,--------------.
@@ -62,20 +63,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   * `-----------------------------------------------------------'   `-------------'
   */
  [_FUNC] = LAYOUT_all( /* Function Layer */
-      _______,  KC_MPLY,  KC_MSTP,  KC_MRWD,  KC_MFFD,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______,  _______,  _______,  _______,                _______,  _______,  _______,
+      _______,            KC_MPLY,  KC_MSTP,  KC_MPRV,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______,  _______,  _______,  _______,      _______,  _______,  _______,
      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,  _______,  _______,
      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,  _______,  _______,
      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,                _______,
      _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,      _______,  _______,  _______
  ),
-  [_LAYER3] = LAYOUT_all( /* Function Layer */
+  [_LAYER3] = LAYOUT_all( /* Layer 3 */
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                _______,  _______,  _______,
+      _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,  _______,  _______,
      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,  _______,  _______,
      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,  _______,  _______,
      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,                _______,
      _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,      _______,  _______,  _______
  ),
+  [_LAYER4] = LAYOUT_all( /* Layer 4 */
+      _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,  _______,  _______,
+      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,  _______,  _______,
+      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,  _______,  _______,
+      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,                _______,
+      _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,      _______,  _______,  _______
+  )
 };
diff --git a/keyboards/durgod/k320/keymaps/via/readme.md b/keyboards/durgod/k320/keymaps/via/readme.md
index 1ed99238c..d1b2ac191 100644
--- a/keyboards/durgod/k320/keymaps/via/readme.md
+++ b/keyboards/durgod/k320/keymaps/via/readme.md
@@ -1,6 +1,6 @@
 # The default keymap for Durgod Taurus K320.
-Layer 0 : Standard Keys TKL layout
+Layer 0 : Standard 87/88 keys TKL layout
 Layer 1 : Media control
 - Reusing Durgod's Original Media Control for Fn + F1 ~ Fn + F7
diff --git a/keyboards/durgod/k320/keymaps/via/rules.mk b/keyboards/durgod/k320/keymaps/via/rules.mk
index 36b7ba9cb..8815b6a0a 100644
--- a/keyboards/durgod/k320/keymaps/via/rules.mk
+++ b/keyboards/durgod/k320/keymaps/via/rules.mk
@@ -1,2 +1,4 @@
+OPT_DEFS += -DWINLOCK_DISABLED
 VIA_ENABLE = yes
 LTO_ENABLE = yes
diff --git a/keyboards/durgod/k320/readme.md b/keyboards/durgod/k320/readme.md
index 115029435..551a29282 100644
--- a/keyboards/durgod/k320/readme.md
+++ b/keyboards/durgod/k320/readme.md
@@ -1,6 +1,6 @@
 # K320
-This is a standard fixed ANSI TKL from off the shelf Durgod Taurus K320 without Backlight.
+This is a standard off-the-shelf Durgod Taurus K320 TKL (87/88-key) keyboard without backlight.
 * Keyboard Maintainer: [dkjer](https://github.com/dkjer)
 * Hardware Supported: Durgod Taurus K320 board with STM32F070RBT6
@@ -30,7 +30,7 @@ For first Flashing from initial Stock's Firmware
 - Plug In USB
 - Make a Flash Image's Backup in case you wanted to restore the Keyboard to Stock's Image:
  - Using DFUseDemo.exe from ST's STSW-STM32080: https://www.st.com/en/development-tools/stsw-stm32080.html
-  - Using dfu-util (thanks to [tylert](https://github.com/tylert) for instructions!):
+  - Using dfu-util:
        dfu-util --list
        dfu-util --alt 0 --dfuse-address 0x08000000 --upload ${OLD_STOCK_BIN}
@@ -55,4 +55,3 @@ For repeating Flashing you can use BootMagic:
 - Unplug USB Cable
 - Holding Esc Button 
 - Plug in USB Cable, Keyboard should be in ST-Bootloader state
diff --git a/keyboards/durgod/k320/rules.mk b/keyboards/durgod/k320/rules.mk
index 040ea2dc8..7e910174f 100644
--- a/keyboards/durgod/k320/rules.mk
+++ b/keyboards/durgod/k320/rules.mk
@@ -2,7 +2,7 @@
 # Actually F070, but close enough
 MCU = STM32F072
-BOARD = ST_NUCLEO64_F070RB
+BOARD = DURGOD_STM32_F070
 # Do not put the microcontroller into power saving mode
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
diff --git a/keyboards/dz60/keymaps/LEdiodes/rules.mk b/keyboards/dz60/keymaps/LEdiodes/rules.mk
index 38b067eb0..251d25fad 100644
--- a/keyboards/dz60/keymaps/LEdiodes/rules.mk
+++ b/keyboards/dz60/keymaps/LEdiodes/rules.mk
@@ -1,7 +1,7 @@
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes   # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes   # Audio control and System control(+450)
 CONSOLE_ENABLE = no     # Console for debug(+400)
diff --git a/keyboards/dz60/keymaps/krusli/rules.mk b/keyboards/dz60/keymaps/krusli/rules.mk
index 3138a24b6..1e7c0f745 100644
--- a/keyboards/dz60/keymaps/krusli/rules.mk
+++ b/keyboards/dz60/keymaps/krusli/rules.mk
@@ -1,7 +1,7 @@
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes   # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes   # Audio control and System control(+450)
 CONSOLE_ENABLE = no     # Console for debug(+400)
diff --git a/keyboards/dz60/keymaps/marianas/rules.mk b/keyboards/dz60/keymaps/marianas/rules.mk
index 230d194ab..b68cc80cf 100644
--- a/keyboards/dz60/keymaps/marianas/rules.mk
+++ b/keyboards/dz60/keymaps/marianas/rules.mk
@@ -3,7 +3,7 @@
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = no    # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes   # Audio control and System control(+450)
 CONSOLE_ENABLE = no     # Console for debug(+400)
diff --git a/keyboards/dz60/rules.mk b/keyboards/dz60/rules.mk
index a626f1f5d..1671c42e9 100644
--- a/keyboards/dz60/rules.mk
+++ b/keyboards/dz60/rules.mk
@@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/dztech/bocc/rules.mk b/keyboards/dztech/bocc/rules.mk
index 6695a40a6..2668874ea 100644
--- a/keyboards/dztech/bocc/rules.mk
+++ b/keyboards/dztech/bocc/rules.mk
@@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/dztech/volcano660/rules.mk b/keyboards/dztech/volcano660/rules.mk
index c23060121..e7aea4087 100644
--- a/keyboards/dztech/volcano660/rules.mk
+++ b/keyboards/dztech/volcano660/rules.mk
@@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/ergodone/rules.mk b/keyboards/ergodone/rules.mk
index f0008e48f..acd485f2f 100644
--- a/keyboards/ergodone/rules.mk
+++ b/keyboards/ergodone/rules.mk
@@ -16,7 +16,7 @@ BOOTLOADER = caterina
 #
 CUSTOM_MATRIX           = yes # Custom matrix file for the ErgoDone
 UNICODE_ENABLE          = yes # Unicode
-BOOTMAGIC_ENABLE        = yes   # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE        = full  # Virtual DIP switch configuration
 MOUSEKEY_ENABLE         = yes   # Mouse keys
 EXTRAKEY_ENABLE         = yes   # Audio control and System control
 CONSOLE_ENABLE          = no    # Console for debug
diff --git a/keyboards/espectro/rules.mk b/keyboards/espectro/rules.mk
index 065014b97..57a846fb3 100755
--- a/keyboards/espectro/rules.mk
+++ b/keyboards/espectro/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = no    # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = no     # Console for debug
diff --git a/keyboards/exclusive/e6_rgb/rules.mk b/keyboards/exclusive/e6_rgb/rules.mk
index e9db9676b..7fbd7e81f 100644
--- a/keyboards/exclusive/e6_rgb/rules.mk
+++ b/keyboards/exclusive/e6_rgb/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = no        # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/fc660c/rules.mk b/keyboards/fc660c/rules.mk
index 54fadc826..b4ed65362 100644
--- a/keyboards/fc660c/rules.mk
+++ b/keyboards/fc660c/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-# BOOTMAGIC_ENABLE = yes        # Virtual DIP switch configuration
+# BOOTMAGIC_ENABLE = full       # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug
diff --git a/keyboards/fc980c/rules.mk b/keyboards/fc980c/rules.mk
index 54fadc826..b4ed65362 100644
--- a/keyboards/fc980c/rules.mk
+++ b/keyboards/fc980c/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-# BOOTMAGIC_ENABLE = yes        # Virtual DIP switch configuration
+# BOOTMAGIC_ENABLE = full       # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug
diff --git a/keyboards/felix/rules.mk b/keyboards/felix/rules.mk
index 01db7a212..1fcdf216c 100644
--- a/keyboards/felix/rules.mk
+++ b/keyboards/felix/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/flehrad/numbrero/rules.mk b/keyboards/flehrad/numbrero/rules.mk
index 969dd0b50..d83407139 100644
--- a/keyboards/flehrad/numbrero/rules.mk
+++ b/keyboards/flehrad/numbrero/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes   # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes   # Audio control and System control(+450)
 CONSOLE_ENABLE = no     # Console for debug(+400)
diff --git a/keyboards/flehrad/snagpad/rules.mk b/keyboards/flehrad/snagpad/rules.mk
index 566a398fe..fbc918ba4 100644
--- a/keyboards/flehrad/snagpad/rules.mk
+++ b/keyboards/flehrad/snagpad/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = no     # Console for debug
diff --git a/keyboards/flehrad/tradestation/rules.mk b/keyboards/flehrad/tradestation/rules.mk
index d3612c3c2..cf6c47d74 100644
--- a/keyboards/flehrad/tradestation/rules.mk
+++ b/keyboards/flehrad/tradestation/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes   # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes   # Audio control and System control(+450)
 CONSOLE_ENABLE = no     # Console for debug(+400)
diff --git a/keyboards/four_banger/rules.mk b/keyboards/four_banger/rules.mk
index ae77f0a0e..b989b893b 100644
--- a/keyboards/four_banger/rules.mk
+++ b/keyboards/four_banger/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes  # Mouse keys
 EXTRAKEY_ENABLE = yes  # Audio control and System control
 CONSOLE_ENABLE = no    # Console for debug
diff --git a/keyboards/foxlab/leaf60/hotswap/rules.mk b/keyboards/foxlab/leaf60/hotswap/rules.mk
index 6d4bcc7ef..b8332901c 100644
--- a/keyboards/foxlab/leaf60/hotswap/rules.mk
+++ b/keyboards/foxlab/leaf60/hotswap/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no        # Console for debug
diff --git a/keyboards/fr4/southpaw75/rules.mk b/keyboards/fr4/southpaw75/rules.mk
index e70a8a7d6..bde08efba 100644
--- a/keyboards/fr4/southpaw75/rules.mk
+++ b/keyboards/fr4/southpaw75/rules.mk
@@ -7,7 +7,7 @@ BOOTLOADER = caterina
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/fractal/rules.mk b/keyboards/fractal/rules.mk
index d83deb422..0952b247a 100755
--- a/keyboards/fractal/rules.mk
+++ b/keyboards/fractal/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no        # Console for debug
diff --git a/keyboards/funky40/rules.mk b/keyboards/funky40/rules.mk
index 138ac68e2..c50d7999b 100644
--- a/keyboards/funky40/rules.mk
+++ b/keyboards/funky40/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/gh60/satan/keymaps/denolfe/rules.mk b/keyboards/gh60/satan/keymaps/denolfe/rules.mk
index 5a8745b68..4e002fc0f 100644
--- a/keyboards/gh60/satan/keymaps/denolfe/rules.mk
+++ b/keyboards/gh60/satan/keymaps/denolfe/rules.mk
@@ -2,7 +2,7 @@
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = no    # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes   # Audio control and System control(+450)
 CONSOLE_ENABLE = yes    # Console for debug(+400)
diff --git a/keyboards/gh60/satan/keymaps/iso_split_rshift/rules.mk b/keyboards/gh60/satan/keymaps/iso_split_rshift/rules.mk
index 7b395f4cc..071edf30e 100644
--- a/keyboards/gh60/satan/keymaps/iso_split_rshift/rules.mk
+++ b/keyboards/gh60/satan/keymaps/iso_split_rshift/rules.mk
@@ -1,4 +1,4 @@
-BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE  = no  # Mouse keys
 EXTRAKEY_ENABLE  = yes # Audio control and System control
 CONSOLE_ENABLE   = yes # Console for debug
diff --git a/keyboards/gh60/satan/keymaps/olligranlund_iso/rules.mk b/keyboards/gh60/satan/keymaps/olligranlund_iso/rules.mk
index 3d886f14f..4175ab137 100644
--- a/keyboards/gh60/satan/keymaps/olligranlund_iso/rules.mk
+++ b/keyboards/gh60/satan/keymaps/olligranlund_iso/rules.mk
@@ -2,7 +2,7 @@
 #   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = yes       # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full       # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = no         # Console for debug(+400)
diff --git a/keyboards/gskt00/rules.mk b/keyboards/gskt00/rules.mk
index f0bbcad81..0011ec6ce 100755
--- a/keyboards/gskt00/rules.mk
+++ b/keyboards/gskt00/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug
diff --git a/keyboards/handwired/2x5keypad/rules.mk b/keyboards/handwired/2x5keypad/rules.mk
index 997c9c0e9..52f64eb3f 100644
--- a/keyboards/handwired/2x5keypad/rules.mk
+++ b/keyboards/handwired/2x5keypad/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 AUDIO_ENABLE = no
 BACKLIGHT_ENABLE = no   # Enable keyboard backlight functionality
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 COMMAND_ENABLE = no     # Commands for debug and configuration
 CONSOLE_ENABLE= no      # Console for debug
 EXTRAKEY_ENABLE = yes   # Audio control and System control
diff --git a/keyboards/handwired/aek64/rules.mk b/keyboards/handwired/aek64/rules.mk
index 52c306130..e5a1d648a 100644
--- a/keyboards/handwired/aek64/rules.mk
+++ b/keyboards/handwired/aek64/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = halfkay
 # Build Options
 #   change to no to disable the options.
 #
-BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE  = yes # Mouse keys(+4700)
 EXTRAKEY_ENABLE  = yes # Audio control and System control(+450)
 CONSOLE_ENABLE   = yes # Console for debug(+400)
diff --git a/keyboards/handwired/arrow_pad/keymaps/pad_21/rules.mk b/keyboards/handwired/arrow_pad/keymaps/pad_21/rules.mk
index d2403c9ec..702538af3 100644
--- a/keyboards/handwired/arrow_pad/keymaps/pad_21/rules.mk
+++ b/keyboards/handwired/arrow_pad/keymaps/pad_21/rules.mk
@@ -1,4 +1,4 @@
-BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE  = no  # Mouse keys(+4700)
 EXTRAKEY_ENABLE  = no  # Audio control and System control(+450)
 CONSOLE_ENABLE   = no  # Console for debug(+400)
diff --git a/keyboards/handwired/arrow_pad/keymaps/pad_24/rules.mk b/keyboards/handwired/arrow_pad/keymaps/pad_24/rules.mk
index b305f8482..12c820839 100644
--- a/keyboards/handwired/arrow_pad/keymaps/pad_24/rules.mk
+++ b/keyboards/handwired/arrow_pad/keymaps/pad_24/rules.mk
@@ -1,4 +1,4 @@
-BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE  = no  # Mouse keys(+4700)
 EXTRAKEY_ENABLE  = no  # Audio control and System control(+450)
 CONSOLE_ENABLE   = no  # Console for debug(+400)
diff --git a/keyboards/handwired/arrow_pad/rules.mk b/keyboards/handwired/arrow_pad/rules.mk
index 65fc42a06..e1eb35c51 100644
--- a/keyboards/handwired/arrow_pad/rules.mk
+++ b/keyboards/handwired/arrow_pad/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = halfkay
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = yes        # Console for debug(+400)
diff --git a/keyboards/handwired/ck4x4/rules.mk b/keyboards/handwired/ck4x4/rules.mk
index 0709f341b..ebf1648c2 100644
--- a/keyboards/handwired/ck4x4/rules.mk
+++ b/keyboards/handwired/ck4x4/rules.mk
@@ -5,12 +5,12 @@ MCU = STM32F072
 #   comment out to disable the options.
 #
-#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+#BOOTMAGIC_ENABLE = full        # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug
 COMMAND_ENABLE = yes    # Commands for debug and configuration
-SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
+SLEEP_LED_ENABLE = no   # Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes           # USB Nkey Rollover
 CUSTOM_MATRIX = no # Custom matrix file
diff --git a/keyboards/handwired/co60/rev1/rules.mk b/keyboards/handwired/co60/rev1/rules.mk
index ae50334a3..0986bed20 100644
--- a/keyboards/handwired/co60/rev1/rules.mk
+++ b/keyboards/handwired/co60/rev1/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = no        # Console for debug(+400)
diff --git a/keyboards/handwired/colorlice/rules.mk b/keyboards/handwired/colorlice/rules.mk
index 77e6d03d6..077b197ef 100644
--- a/keyboards/handwired/colorlice/rules.mk
+++ b/keyboards/handwired/colorlice/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/handwired/curiosity/rules.mk b/keyboards/handwired/curiosity/rules.mk
index dace27ef3..d410771e8 100644
--- a/keyboards/handwired/curiosity/rules.mk
+++ b/keyboards/handwired/curiosity/rules.mk
@@ -7,7 +7,7 @@ BOOTLOADER = caterina
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/handwired/ddg_56/rules.mk b/keyboards/handwired/ddg_56/rules.mk
index dfbb0959f..814338430 100644
--- a/keyboards/handwired/ddg_56/rules.mk
+++ b/keyboards/handwired/ddg_56/rules.mk
@@ -6,7 +6,7 @@ BOARD = QMK_PROTON_C
 #   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = no      # Mouse keys
 EXTRAKEY_ENABLE = no       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/handwired/eagleii/rules.mk b/keyboards/handwired/eagleii/rules.mk
index e45af67e5..aeee86d3a 100644
--- a/keyboards/handwired/eagleii/rules.mk
+++ b/keyboards/handwired/eagleii/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes
+BOOTMAGIC_ENABLE = full
 MOUSEKEY_ENABLE = yes
 EXTRAKEY_ENABLE = yes
 CONSOLE_ENABLE = no
diff --git a/keyboards/handwired/fc200rt_qmk/rules.mk b/keyboards/handwired/fc200rt_qmk/rules.mk
index fb1748db0..55a088771 100644
--- a/keyboards/handwired/fc200rt_qmk/rules.mk
+++ b/keyboards/handwired/fc200rt_qmk/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = halfkay
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes       # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full       # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
diff --git a/keyboards/handwired/hexon38/rules.mk b/keyboards/handwired/hexon38/rules.mk
index fb5e1b0c9..93b7a1176 100644
--- a/keyboards/handwired/hexon38/rules.mk
+++ b/keyboards/handwired/hexon38/rules.mk
@@ -12,7 +12,7 @@ MCU = atmega32u4
 BOOTLOADER = halfkay
 # Enabled build options:
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes   # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes   # Audio control and System control(+450)
 CONSOLE_ENABLE = yes    # Console for debug(+400)
diff --git a/keyboards/handwired/minorca/rules.mk b/keyboards/handwired/minorca/rules.mk
index 64837b88e..f3f1502de 100644
--- a/keyboards/handwired/minorca/rules.mk
+++ b/keyboards/handwired/minorca/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = halfkay
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/chconf.h b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/chconf.h
new file mode 100644
index 000000000..3d9a39363
--- /dev/null
+++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/chconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#define CH_CFG_ST_FREQUENCY 10000
+#include_next <chconf.h>
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h
new file mode 100755
index 000000000..95e99aacc
--- /dev/null
+++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h
@@ -0,0 +1,31 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include "config_common.h"
+#define MATRIX_COL_PINS { B0 }
+#define MATRIX_ROW_PINS { A7 }
+#define UNUSED_PINS
+#define BACKLIGHT_PIN           A0
+#define BACKLIGHT_PWM_DRIVER    PWMD5
+#define BACKLIGHT_PWM_CHANNEL   1
+#define RGB_DI_PIN A1
+#define ADC_PIN A0
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/halconf.h b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/halconf.h
new file mode 100644
index 000000000..e15870984
--- /dev/null
+++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/halconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#define HAL_USE_I2C TRUE
+#define HAL_USE_PWM TRUE
+#include_next <halconf.h>
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/mcuconf.h b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/mcuconf.h
new file mode 100755
index 000000000..ad8aecdb1
--- /dev/null
+++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/mcuconf.h
@@ -0,0 +1,24 @@
+/* Copyright 2021 QMK
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 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 <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include_next "mcuconf.h"
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
+#undef STM32_PWM_USE_TIM5
+#define STM32_PWM_USE_TIM5 TRUE
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/readme.md b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/readme.md
new file mode 100755
index 000000000..ff43658f4
--- /dev/null
+++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/readme.md
@@ -0,0 +1,9 @@
+# f411 blackpill onekey
+Supported Hardware: *STM32F411CEU6 WeAct v1.3*.
+To trigger keypress, short together pins *B0* and *A7*.
+This variant requires the TinyUF2 bootloader to be installed. This can be downloaded from the [tinyuf2 releases page](https://github.com/adafruit/tinyuf2/releases). The F401 blackpill binary works for both F401- and F411-based blackpill devices.
+Double-tap reset to enter bootloader mode. Copy the built uf2 file to the device by dragging the file to the new USB disk.
+\ No newline at end of file
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk
new file mode 100755
index 000000000..ec38577b2
--- /dev/null
+++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk
@@ -0,0 +1,10 @@
+# MCU name
+MCU = STM32F411
+# Build Options
+#   change yes to no to disable
+#
+KEYBOARD_SHARED_EP       = yes
+# We want to use the tinyuf2 bootloader...
+BOOTLOADER = tinyuf2
+\ No newline at end of file
diff --git a/keyboards/handwired/onekey/rules.mk b/keyboards/handwired/onekey/rules.mk
index 259050d55..df2ec1ecf 100644
--- a/keyboards/handwired/onekey/rules.mk
+++ b/keyboards/handwired/onekey/rules.mk
@@ -7,9 +7,9 @@ EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = yes        # Console for debug(+400)
 COMMAND_ENABLE = no         # Commands for debug and configuration
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = yes       # Breathing sleep LED during USB suspend
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes            # USB Nkey Rollover
+NKRO_ENABLE = yes           # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
diff --git a/keyboards/handwired/p1800fl/rules.mk b/keyboards/handwired/p1800fl/rules.mk
index b85602bb9..cde197a0d 100644
--- a/keyboards/handwired/p1800fl/rules.mk
+++ b/keyboards/handwired/p1800fl/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = qmk-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes          # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full         # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes           # Audio control and System control
 CONSOLE_ENABLE = yes                    # Console for debug
diff --git a/keyboards/handwired/p65rgb/rules.mk b/keyboards/handwired/p65rgb/rules.mk
index 7e8ac8d55..00d15f090 100644
--- a/keyboards/handwired/p65rgb/rules.mk
+++ b/keyboards/handwired/p65rgb/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = qmk-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/handwired/prkl30/feather/rules.mk b/keyboards/handwired/prkl30/feather/rules.mk
index 27df4272a..366e53cf7 100644
--- a/keyboards/handwired/prkl30/feather/rules.mk
+++ b/keyboards/handwired/prkl30/feather/rules.mk
@@ -18,7 +18,7 @@ BOOTLOADER = caterina
 #   change yes to no to disable
 #
 BLUETOOTH = AdafruitBLE
-BOOTMAGIC_ENABLE  = yes     # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE  = full     # Virtual DIP switch configuration
 ENCODER_ENABLE = yes
 MOUSEKEY_ENABLE  = no       # Mouse keys
 EXTRAKEY_ENABLE  = no       # Audio control and System control
diff --git a/keyboards/handwired/retro_refit/rules.mk b/keyboards/handwired/retro_refit/rules.mk
index 04db510d1..1506838a4 100644
--- a/keyboards/handwired/retro_refit/rules.mk
+++ b/keyboards/handwired/retro_refit/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = halfkay
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes          # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full         # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes           # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes           # Audio control and System control(+450)
 CONSOLE_ENABLE = yes            # Console for debug(+400)
diff --git a/keyboards/handwired/space_oddity/rules.mk b/keyboards/handwired/space_oddity/rules.mk
index a2e63690b..97f9cfd80 100644
--- a/keyboards/handwired/space_oddity/rules.mk
+++ b/keyboards/handwired/space_oddity/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes     # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full     # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes      # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes      # Audio control and System control(+450)
 CONSOLE_ENABLE = no        # Console for debug(+400)
diff --git a/keyboards/handwired/symmetry60/rules.mk b/keyboards/handwired/symmetry60/rules.mk
index 905b15699..f41c45fff 100644
--- a/keyboards/handwired/symmetry60/rules.mk
+++ b/keyboards/handwired/symmetry60/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
diff --git a/keyboards/handwired/wulkan/rules.mk b/keyboards/handwired/wulkan/rules.mk
index 96bfe18dd..94086e14f 100644
--- a/keyboards/handwired/wulkan/rules.mk
+++ b/keyboards/handwired/wulkan/rules.mk
@@ -6,7 +6,7 @@ BOARD = QMK_PROTON_C
 #   comment out to disable the options.
 #
 BACKLIGHT_ENABLE = no
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/hecomi/rules.mk b/keyboards/hecomi/rules.mk
index 75686f922..f91432cad 100644
--- a/keyboards/hecomi/rules.mk
+++ b/keyboards/hecomi/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
diff --git a/keyboards/hhkb/ansi/rules.mk b/keyboards/hhkb/ansi/rules.mk
index a367ef48d..3ff7170e0 100644
--- a/keyboards/hhkb/ansi/rules.mk
+++ b/keyboards/hhkb/ansi/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes  # Mouse keys
 EXTRAKEY_ENABLE = yes  # Audio control and System control
 CONSOLE_ENABLE = yes   # Console for debug
diff --git a/keyboards/hhkb/jp/rules.mk b/keyboards/hhkb/jp/rules.mk
index 774b444c5..f1294ed61 100644
--- a/keyboards/hhkb/jp/rules.mk
+++ b/keyboards/hhkb/jp/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes  # Mouse keys
 EXTRAKEY_ENABLE = yes  # Audio control and System control
 CONSOLE_ENABLE = yes   # Console for debug
diff --git a/keyboards/hhkb_lite_2/rules.mk b/keyboards/hhkb_lite_2/rules.mk
index dd0271792..aa224ffe4 100644
--- a/keyboards/hhkb_lite_2/rules.mk
+++ b/keyboards/hhkb_lite_2/rules.mk
@@ -7,7 +7,7 @@ BOOTLOADER = halfkay
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/hid_liber/keymaps/bakageta/rules.mk b/keyboards/hid_liber/keymaps/bakageta/rules.mk
index 0f131bce9..1697e07c5 100755
--- a/keyboards/hid_liber/keymaps/bakageta/rules.mk
+++ b/keyboards/hid_liber/keymaps/bakageta/rules.mk
@@ -18,7 +18,7 @@
 #   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = yes        # Console for debug(+400)
diff --git a/keyboards/hid_liber/rules.mk b/keyboards/hid_liber/rules.mk
index 44833d755..ea64be00d 100755
--- a/keyboards/hid_liber/rules.mk
+++ b/keyboards/hid_liber/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
diff --git a/keyboards/honeycomb/rules.mk b/keyboards/honeycomb/rules.mk
index d6f98125e..a9a01d867 100755
--- a/keyboards/honeycomb/rules.mk
+++ b/keyboards/honeycomb/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   comment out to disable the options.
 #
-#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+#BOOTMAGIC_ENABLE = full        # Virtual DIP switch configuration
 #MOUSEKEY_ENABLE = yes  # Mouse keys
 POINTING_DEVICE_ENABLE = yes # Generic Pointer, not as big as mouse keys hopefully.
 EXTRAKEY_ENABLE = yes   # Audio control and System control
diff --git a/keyboards/hotdox/rules.mk b/keyboards/hotdox/rules.mk
index 95f6c7ec6..dd175e9f6 100644
--- a/keyboards/hotdox/rules.mk
+++ b/keyboards/hotdox/rules.mk
@@ -16,7 +16,7 @@ BOOTLOADER = atmel-dfu
 #
 CUSTOM_MATRIX           = yes # Custom matrix file for the ErgoDone
 UNICODE_ENABLE          = yes # Unicode
-BOOTMAGIC_ENABLE        = yes # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE        = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE         = yes  # Mouse keys
 EXTRAKEY_ENABLE         = yes # Audio control and System control
 CONSOLE_ENABLE          = yes # Console for debug
diff --git a/keyboards/iron180/rules.mk b/keyboards/iron180/rules.mk
index 2d2f71e19..a202eca61 100644
--- a/keyboards/iron180/rules.mk
+++ b/keyboards/iron180/rules.mk
@@ -4,7 +4,7 @@ MCU = STM32F072
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
diff --git a/keyboards/jd40/rules.mk b/keyboards/jd40/rules.mk
index 73336244e..18780b47b 100644
--- a/keyboards/jd40/rules.mk
+++ b/keyboards/jd40/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes          # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full         # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes           # Mouse keys
 EXTRAKEY_ENABLE = yes           # Audio control and System control
 # CONSOLE_ENABLE = yes          # Console for debug
diff --git a/keyboards/jd45/rules.mk b/keyboards/jd45/rules.mk
index cc5af4b7a..82e70975d 100644
--- a/keyboards/jd45/rules.mk
+++ b/keyboards/jd45/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug
diff --git a/keyboards/jj40/keymaps/fun40/rules.mk b/keyboards/jj40/keymaps/fun40/rules.mk
index 92f168a16..3ec0a7515 100644
--- a/keyboards/jj40/keymaps/fun40/rules.mk
+++ b/keyboards/jj40/keymaps/fun40/rules.mk
@@ -1,6 +1,6 @@
-BOOTMAGIC_ENABLE = yes       # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full       # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = no       # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = no         # Console for debug(+400)
diff --git a/keyboards/jj40/keymaps/waples/rules.mk b/keyboards/jj40/keymaps/waples/rules.mk
index 69b7c18d4..4395f7f8f 100644
--- a/keyboards/jj40/keymaps/waples/rules.mk
+++ b/keyboards/jj40/keymaps/waples/rules.mk
@@ -1,5 +1,5 @@
 # build options
-BOOTMAGIC_ENABLE = yes
+BOOTMAGIC_ENABLE = full
 MOUSEKEY_ENABLE = no
 EXTRAKEY_ENABLE = yes
 CONSOLE_ENABLE = no
diff --git a/keyboards/kbdfans/bella/rgb/rules.mk b/keyboards/kbdfans/bella/rgb/rules.mk
index a4fcb5782..bba2c1a6c 100644
--- a/keyboards/kbdfans/bella/rgb/rules.mk
+++ b/keyboards/kbdfans/bella/rgb/rules.mk
@@ -23,3 +23,5 @@ AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
+LTO_ENABLE = yes
diff --git a/keyboards/kbdfans/bella/rgb_iso/rules.mk b/keyboards/kbdfans/bella/rgb_iso/rules.mk
index a4fcb5782..bba2c1a6c 100644
--- a/keyboards/kbdfans/bella/rgb_iso/rules.mk
+++ b/keyboards/kbdfans/bella/rgb_iso/rules.mk
@@ -23,3 +23,5 @@ AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
+LTO_ENABLE = yes
diff --git a/keyboards/kbdfans/kbd6x/rules.mk b/keyboards/kbdfans/kbd6x/rules.mk
index e95a436c3..7d9f13e31 100644
--- a/keyboards/kbdfans/kbd6x/rules.mk
+++ b/keyboards/kbdfans/kbd6x/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = no       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
diff --git a/keyboards/kbdfans/kbd75/keymaps/tucznak/rules.mk b/keyboards/kbdfans/kbd75/keymaps/tucznak/rules.mk
index 7d6400f97..c854fdd2d 100644
--- a/keyboards/kbdfans/kbd75/keymaps/tucznak/rules.mk
+++ b/keyboards/kbdfans/kbd75/keymaps/tucznak/rules.mk
@@ -1,7 +1,7 @@
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = no         # Console for debug(+400)
diff --git a/keyboards/kbdfans/kbd75/rev1/rules.mk b/keyboards/kbdfans/kbd75/rev1/rules.mk
index ae6507a85..054cb687b 100644
--- a/keyboards/kbdfans/kbd75/rev1/rules.mk
+++ b/keyboards/kbdfans/kbd75/rev1/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = no     # Console for debug
diff --git a/keyboards/kbdfans/kbd75/rev2/rules.mk b/keyboards/kbdfans/kbd75/rev2/rules.mk
index ae6507a85..054cb687b 100644
--- a/keyboards/kbdfans/kbd75/rev2/rules.mk
+++ b/keyboards/kbdfans/kbd75/rev2/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = no     # Console for debug
diff --git a/keyboards/kc60/keymaps/stanleylai/rules.mk b/keyboards/kc60/keymaps/stanleylai/rules.mk
index a826c2bf2..b4471d606 100644
--- a/keyboards/kc60/keymaps/stanleylai/rules.mk
+++ b/keyboards/kc60/keymaps/stanleylai/rules.mk
@@ -3,7 +3,7 @@
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = no         # Console for debug(+400)
diff --git a/keyboards/kc60/keymaps/wigguno/rules.mk b/keyboards/kc60/keymaps/wigguno/rules.mk
index db084a76a..d95742d42 100644
--- a/keyboards/kc60/keymaps/wigguno/rules.mk
+++ b/keyboards/kc60/keymaps/wigguno/rules.mk
@@ -3,7 +3,7 @@
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = no         # Console for debug(+400)
diff --git a/keyboards/keebio/dilly/rules.mk b/keyboards/keebio/dilly/rules.mk
index dbb338e3a..dd730c950 100644
--- a/keyboards/keebio/dilly/rules.mk
+++ b/keyboards/keebio/dilly/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = no     # Console for debug
diff --git a/keyboards/keebio/iris/keymaps/vyolle/rules.mk b/keyboards/keebio/iris/keymaps/vyolle/rules.mk
index e7cbfb83d..f93940de3 100644
--- a/keyboards/keebio/iris/keymaps/vyolle/rules.mk
+++ b/keyboards/keebio/iris/keymaps/vyolle/rules.mk
@@ -4,4 +4,4 @@ STENO_ENABLE = no         # Additional protocols for Stenography(+1700), require
 AUDIO_ENABLE = no           # Audio output on port C6
 MIDI_ENABLE = no            # MIDI controls
 NKRO_ENABLE = yes
-BOOTMAGIC_ENABLE = yes
+BOOTMAGIC_ENABLE = full
diff --git a/keyboards/keebio/levinson/keymaps/steno/rules.mk b/keyboards/keebio/levinson/keymaps/steno/rules.mk
index 47cd0563d..7693b24b5 100644
--- a/keyboards/keebio/levinson/keymaps/steno/rules.mk
+++ b/keyboards/keebio/levinson/keymaps/steno/rules.mk
@@ -4,4 +4,4 @@ STENO_ENABLE = yes          # Additional protocols for Stenography, requires VIR
 AUDIO_ENABLE = no           # Audio output on port C6
 MIDI_ENABLE = no            # MIDI controls
 NKRO_ENABLE = yes
-BOOTMAGIC_ENABLE = yes
+BOOTMAGIC_ENABLE = full
diff --git a/keyboards/keebio/nyquist/keymaps/danielhklein/rules.mk b/keyboards/keebio/nyquist/keymaps/danielhklein/rules.mk
index 12ad2fec5..93cf3c8ea 100644
--- a/keyboards/keebio/nyquist/keymaps/danielhklein/rules.mk
+++ b/keyboards/keebio/nyquist/keymaps/danielhklein/rules.mk
@@ -18,7 +18,7 @@
 #   change to "no" to disable the options, or define them in the Makefile in 
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = no         # Console for debug(+400)
diff --git a/keyboards/kinesis/alvicstep/config.h b/keyboards/kinesis/alvicstep/config.h
index 88b7e2644..73aa4dd4d 100644
--- a/keyboards/kinesis/alvicstep/config.h
+++ b/keyboards/kinesis/alvicstep/config.h
@@ -2,6 +2,7 @@
 #define ALVICSTEP_CONFIG_H
 #include "../config.h"
+#include "config_common.h"
 /* USB Device descriptor parameter */
 #define PRODUCT_ID      0x6060
diff --git a/keyboards/kinesis/config.h b/keyboards/kinesis/config.h
index ddb16d33b..c5a89d453 100644
--- a/keyboards/kinesis/config.h
+++ b/keyboards/kinesis/config.h
@@ -18,8 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef CONFIG_H
 #define CONFIG_H
-#include "config_common.h"
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xFEED
 #define MANUFACTURER    You
diff --git a/keyboards/kinesis/kinesis.h b/keyboards/kinesis/kinesis.h
index 444322d1f..0833992b8 100644
--- a/keyboards/kinesis/kinesis.h
+++ b/keyboards/kinesis/kinesis.h
@@ -13,6 +13,9 @@
 #ifdef KEYBOARD_kinesis_nguyenvietyen
        #include "nguyenvietyen.h"
 #endif
+#ifdef KEYBOARD_kinesis_kint36
+        #include "kint36.h"
+#endif
 #include "quantum.h"
diff --git a/keyboards/kinesis/kint2pp/config.h b/keyboards/kinesis/kint2pp/config.h
index 902c9b24a..ff5761b6b 100644
--- a/keyboards/kinesis/kint2pp/config.h
+++ b/keyboards/kinesis/kint2pp/config.h
@@ -36,3 +36,7 @@
 #define DEBOUNCE 5
 #define IGNORE_MOD_TAP_INTERRUPT
+// Reduce input latency by lowering the USB polling interval
+// from its 10ms default to the 1ms minimum that USB 1.x (Full Speed) allows:
+#define USB_POLLING_INTERVAL_MS 1
diff --git a/keyboards/kinesis/kint2pp/rules.mk b/keyboards/kinesis/kint2pp/rules.mk
index e69de29bb..7c48a98bf 100644
--- a/keyboards/kinesis/kint2pp/rules.mk
+++ b/keyboards/kinesis/kint2pp/rules.mk
@@ -0,0 +1,3 @@
+# Debounce eagerly (report change immediately), keep per-key timers. We can use
+# this because the kinT does not have to deal with noise.
+DEBOUNCE_TYPE = sym_eager_pk
diff --git a/keyboards/kinesis/kint36/chconf.h b/keyboards/kinesis/kint36/chconf.h
new file mode 100644
index 000000000..81dfcd5a2
--- /dev/null
+++ b/keyboards/kinesis/kint36/chconf.h
@@ -0,0 +1,28 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/kinesis/kint36/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ */
+#pragma once
+#define CH_CFG_ST_TIMEDELTA 0
+#define CH_CFG_TIME_QUANTUM 20
+#include_next <chconf.h>
diff --git a/keyboards/kinesis/kint36/config.h b/keyboards/kinesis/kint36/config.h
new file mode 100644
index 000000000..be5752603
--- /dev/null
+++ b/keyboards/kinesis/kint36/config.h
@@ -0,0 +1,66 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+/* USB Device descriptor parameter */
+#undef VENDOR_ID
+#define VENDOR_ID 0x1209
+#undef PRODUCT_ID
+#define PRODUCT_ID 0x345C
+#undef DEVICE_VER
+#define DEVICE_VER 0x0001
+#undef MANUFACTURER
+#define MANUFACTURER "https://github.com/stapelberg"
+#undef PRODUCT
+#define PRODUCT "kinT (kint36)"
+/* key matrix size */
+#define MATRIX_ROWS 15
+#define MATRIX_COLS 7
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { D3, C3, C4, C6, D2, B0, D7, A12, A13, B17, B16, D0, B1, C2, D6 }
+#define MATRIX_COL_PINS { B3, D1, C0, D5, C1, B2, D4 }
+#define UNUSED_PINS
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+#define IGNORE_MOD_TAP_INTERRUPT
+// Reduce input latency by lowering the USB polling interval
+// from its 10ms default to the 1ms minimum that USB 1.x (Full Speed) allows:
+#define USB_POLLING_INTERVAL_MS 1
+#define LED_PIN_ON_STATE 0
+#define LED_NUM_LOCK_PIN A14
+#define LED_CAPS_LOCK_PIN C7
+#define LED_SCROLL_LOCK_PIN A5
+#define LED_COMPOSE_PIN E26
diff --git a/keyboards/durgod/k320/keymaps/via/config.h b/keyboards/kinesis/kint36/keymaps/kzar/config.h
index 2ae6fca9d..6b03aa6a7 100644
--- a/keyboards/durgod/k320/keymaps/via/config.h
+++ b/keyboards/kinesis/kint36/keymaps/kzar/config.h
@@ -1,5 +1,4 @@
-/*
+/* Copyright 2021 Dave Vandyke <kzar@kzar.co.uk>
- * Copyright 2021 Maxime Coirault
 *
 * 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
@@ -17,4 +16,4 @@
 #pragma once
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
+#undef LED_COMPOSE_PIN
diff --git a/keyboards/kinesis/kint36/keymaps/kzar/keymap.c b/keyboards/kinesis/kint36/keymaps/kzar/keymap.c
new file mode 100644
index 000000000..20b135268
--- /dev/null
+++ b/keyboards/kinesis/kint36/keymaps/kzar/keymap.c
@@ -0,0 +1,405 @@
+/* Copyright 2021 Dave Vandyke <kzar@kzar.co.uk>,
+ *   Based upon Xyverz's Kinesis keymap Copyright 2017-2020.
+ *
+ * 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
+#include "version.h"
+enum layer_names {_QWERTY, _DVORAK, _MAC, _PC, _KEYPAD, _PROGRAM};
+enum my_keycodes {QWERTY = SAFE_RANGE, DVORAK, WIN, MAC, PC, STATUS, PROGRAM};
+#define LED_KEYPAD E26
+// clang-format off
+/*
+        QWERTY layer:
+        ,---------------------------------------------------------------------------.
+        |    ESC   |  F1  |  F2  |  F3  |  F4  |    F5    |   F6   |   F7   |  F8   |
+        `---------------------------------------------------------------------------'
+        ,---------------------------------------------------------------------------.
+        |    F9    |  F10 |  F11 |  F12 | PScr |   SLck   |  Pause | Keypad | Prgrm |
+        `---------------------------------------------------------------------------'
+        ,-------------------------------------------.,-------------------------------------------.
+        |   =    |   1  |   2  |   3  |   4  |   5  ||   6  |   7  |   8  |   9  |   0  |   -    |
+        |--------+------+------+------+------+------||------+------+------+------+------+--------|
+        | Tab    |   Q  |   W  |   E  |   R  |   T  ||   Y  |   U  |   I  |   O  |   P  |   \    |
+        |--------+------+------+------+------+------||------+------+------+------+------+--------|
+        | CapsLk |   A  |   S  |   D  |   F  |   G  ||   H  |   J  |   K  |   L  |   ;  |   '    |
+        |--------+------+------+------+------+------||------+------+------+------+------+--------|
+        | LShift |   Z  |   X  |   C  |   V  |   B  ||   N  |   M  |   ,  |   .  |   /  | RShift |
+        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
+                 |   `  |   \  | Left | Rght |              |  Up  |  Dn  |   [  |   ]  |
+                 `---------------------------'              `---------------------------'
+                                     ,--------------.,--------------.
+                                     | LCtl  | LAlt || LGUI | RCtl  |
+                              ,------|-------|------||------+-------+-------.
+                              |      |       | Home || PgUp | Enter |       |
+                              | BkSp |  Del  |------||------|   /   | Space |
+                              |      |       | End  || PgDn | KeyPd |       |
+                              `---------------------'`----------------------'
+        Dvorak layer:
+        ,---------------------------------------------------------------------------.
+        |          |      |      |      |      |          |        |        |       |
+        `---------------------------------------------------------------------------'
+        ,---------------------------------------------------------------------------.
+        |          |      |      |      |      |          |        |        |       |
+        `---------------------------------------------------------------------------'
+        ,-------------------------------------------.,-------------------------------------------.
+        |        |      |      |      |      |      ||      |      |      |      |      |        |
+        |--------+------+------+------+------+------||------+------+------+------+------+--------|
+        |        |   '  |   ,  |   .  |   P  |   Y  ||   F  |   G  |   C  |   R  |   L  |   /    |
+        |--------+------+------+------+------+------||------+------+------+------+------+--------|
+        |        |   A  |   O  |   E  |   U  |   I  ||   D  |   H  |   T  |   N  |   S  |   \    |
+        |--------+------+------+------+------+------||------+------+------+------+------+--------|
+        |        |   ;  |   Q  |   J  |   K  |   X  ||   B  |   M  |   W  |   V  |   Z  |        |
+        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
+                 |      |      |      |      |              |      |      |      |      |
+                 `---------------------------'              `---------------------------'
+                                     ,--------------.,--------------.
+                                     |       |      ||      |       |
+                              ,------|-------|------||------+-------+-------.
+                              |      |       |      ||      |       |       |
+                              |      |       |------||------|       |       |
+                              |      |       |      ||      |       |       |
+                              `---------------------'`----------------------'
+        Mac layer:
+        ,-------------------------------------------------------------------------------.
+        |          |      |      |        |        |          |        |        |       |
+        `-------------------------------------------------------------------------------'
+        ,-------------------------------------------------------------------------------.
+        |          |      |      |        |        |   Power  |        |        |       |
+        `-------------------------------------------------------------------------------'
+        ,-------------------------------------------.,-------------------------------------------.
+        |        |      |      |      |      |      ||      |      |      |      |      |        |
+        |--------+------+------+------+------+------||------+------+------+------+------+--------|
+        |        |      |      |      |      |      ||      |      |      |      |      |        |
+        |--------+------+------+------+------+------||------+------+------+------+------+--------|
+        |        |      |      |      |      |      ||      |      |      |      |      |        |
+        |--------+------+------+------+------+------||------+------+------+------+------+--------|
+        |        |      |      |      |      |      ||      |      |      |      |      |        |
+        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
+                 |      |      |      |      |              |      |      |      |      |
+                 `---------------------------'              `---------------------------'
+                                      ,-------------.,-------------.
+                                      | LGUI | LAlt || RCtl | RGUI |
+                               ,------|------|------||------+------+------.
+                               |      |      |      ||      |      |      |
+                               |      |      |------||------|      |      |
+                               |      |      |      ||      |      |      |
+                               `--------------------'`--------------------'
+        PC layer:
+        ,-------------------------------------------------------------------------------.
+        |          |      |      |        |        |          |        |        |       |
+        `-------------------------------------------------------------------------------'
+        ,-------------------------------------------------------------------------------.
+        |          |      |      |        |        |          |        |        |       |
+        `-------------------------------------------------------------------------------'
+        ,-------------------------------------------.,-------------------------------------------.
+        |        |      |      |      |      |      ||      |      |      |      |      |        |
+        |--------+------+------+------+------+------||------+------+------+------+------+--------|
+        |        |      |      |      |      |      ||      |      |      |      |      |        |
+        |--------+------+------+------+------+------||------+------+------+------+------+--------|
+        |        |      |      |      |      |      ||      |      |      |      |      |        |
+        |--------+------+------+------+------+------||------+------+------+------+------+--------|
+        |        |      |      |      |      |      ||      |      |      |      |      |        |
+        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
+                 |      |      |      |      |              |      |      |      |      |
+                 `---------------------------'              `---------------------------'
+                                      ,-------------.,-------------.
+                                      |      |      || RAlt |      |
+                               ,------|------|------||------+------+------.
+                               |      |      |      ||      |      |      |
+                               |      |      |------||------|      |      |
+                               |      |      |      ||      |      |      |
+                               `--------------------'`--------------------'
+        Keypad layer:
+        ,---------------------------------------------------------------------------.
+        |          |      |      |      |      |          |        |        |       |
+        `---------------------------------------------------------------------------'
+        ,---------------------------------------------------------------------------.
+        |          |      |      |      | Mute | Vol Down | Vol Up | Keypad |       |
+        `---------------------------------------------------------------------------'
+        ,-------------------------------------------.,-------------------------------------------.
+        |        |      |      |      |      |      ||      | NmLk | KP = | KP / | KP * |        |
+        |--------+------+------+------+------+------||------+------+------+------+------+--------|
+        |        |      |      |      |      |      ||      | KP 7 | KP 8 | KP 9 | KP - |        |
+        |--------+------+------+------+------+------||------+------+------+------+------+--------|
+        |        |      |      |      |      |      ||      | KP 4 | KP 5 | KP 6 | KP + |        |
+        |--------+------+------+------+------+------||------+------+------+------+------+--------|
+        |        |      |      |      |      |      ||      | KP 1 | KP 2 | KP 3 |KP Ent|        |
+        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
+                 |      |  INS |      |      |              |      |      | KP . |KP Ent|
+                 `---------------------------'              `---------------------------'
+                                      ,-------------.,-------------.
+                                      |      |      ||      |      |
+                               ,------|------|------||------+------+------.
+                               |      |      |      ||      |      |      |
+                               |      |      |------||------|      | KP 0 |
+                               |      |      |      ||      |      |      |
+                               `--------------------'`--------------------'
+        Program layer:
+        ,-------------------------------------------------------------------------------.
+        |  STATUS  |      |      | QWERTY | DVORAK |          |        |        |       |
+        `-------------------------------------------------------------------------------'
+        ,-------------------------------------------------------------------------------.
+        |   RESET  |      |      |        |        |          |        |        |       |
+        `-------------------------------------------------------------------------------'
+        ,-------------------------------------------.,-------------------------------------------.
+        |        |      |      |      |      |      ||      |      |      |      |      |        |
+        |--------+------+------+------+------+------||------+------+------+------+------+--------|
+        |        |      |      |      |      |      ||      |      |      |      |      |        |
+        |--------+------+------+------+------+------||------+------+------+------+------+--------|
+        |        |      |      |      |      |      ||      |      |      |      |      |        |
+        |--------+------+------+------+------+------||------+------+------+------+------+--------|
+        |        |      |      |      |      |      ||      |      |      |      |      |        |
+        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
+                 |      |      |      |      |              |      |      |      |      |
+                 `---------------------------'              `---------------------------'
+                                      ,-------------.,-------------.
+                                      |      |      ||      |      |
+                               ,------|------|------||------+------+------.
+                               |      |      |      ||      |      |      |
+                               |      |      |------||------|      |      |
+                               |      |      |      ||      |      |      |
+                               `--------------------'`--------------------'
+*/
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_QWERTY] = LAYOUT (
+           // Left Hand
+           KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,        KC_F8,
+           KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
+           KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,
+           KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
+           KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,
+                    KC_GRV,  KC_NUBS, KC_LEFT, KC_RGHT,
+           // Left Thumb
+                    KC_LCTL, KC_LALT,
+                             KC_HOME,
+           KC_BSPC, KC_DEL,  KC_END,
+           // Right Hand
+           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD),  MO(_PROGRAM),
+           KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+           KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+           KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+           KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+                    KC_UP,   KC_DOWN, KC_LBRC, KC_RBRC,
+           // Right Thumb
+           KC_LGUI, KC_RCTL,
+           KC_PGUP,
+           KC_PGDN, KC_ENT, KC_SPC
+    ),
+[_DVORAK] = LAYOUT (
+           // Left Hand
+           _______, _______, _______, _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______, _______, _______,
+           _______, KC_QUOT, KC_COMM,  KC_DOT,    KC_P,    KC_Y,
+           _______,    KC_A,    KC_O,    KC_E,    KC_U,    KC_I,
+           _______, KC_SCLN,    KC_Q,    KC_J,    KC_K,    KC_X,
+                    _______, _______, _______, _______,
+           // Left Thumb
+                    _______, _______,
+                             _______,
+           _______, _______, _______,
+           // Right Hand
+           _______, _______, _______, _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______, _______, _______,
+           KC_F,       KC_G,    KC_C,    KC_R,    KC_L, KC_SLSH,
+           KC_D,       KC_H,    KC_T,    KC_N,    KC_S, KC_BSLS,
+           KC_B,       KC_M,    KC_W,    KC_V,    KC_Z, _______,
+                    _______, _______, _______, _______,
+           // Right Thumb
+           _______, _______,
+           _______,
+           _______, _______, _______
+    ),
+[_MAC] = LAYOUT (
+           // Left Hand
+           _______, _______, _______, _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______, _______, _______,
+                    _______, _______, _______, _______,
+           // Left Thumb
+                    KC_LGUI, KC_LALT,
+                             _______,
+           _______, _______, _______,
+           // Right Hand
+           _______, _______, _______, _______, _______, KC_POWER, _______, _______, _______,
+           _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______, _______, _______,
+                    _______, _______, _______, _______,
+           // Right Thumb
+           KC_RCTL, KC_RGUI,
+           _______,
+           _______, _______, _______
+    ),
+[_PC] = LAYOUT (
+           // Left Hand
+           _______, _______, _______, _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______, _______, _______,
+                    _______, _______, _______, _______,
+           // Left Thumb
+                    _______, _______,
+                             _______,
+           _______, _______, _______,
+           // Right Hand
+           _______, _______, _______, _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______, _______, _______,
+                    _______, _______, _______, _______,
+           // Right Thumb
+           KC_RALT, _______,
+           _______,
+           _______, _______, _______
+    ),
+[_KEYPAD] = LAYOUT (
+           // Left Hand
+           _______, _______, _______, _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______, _______, _______,
+                    _______, KC_INS,  _______, _______,
+           // Left Thumb
+                    _______, _______,
+                             _______,
+           _______, _______, _______,
+           // Right Hand
+           _______,    _______, _______, _______, KC__MUTE, KC__VOLDOWN, KC__VOLUP, _______, _______,
+           _______, KC_NLCK, KC_PEQL, KC_PSLS, KC_PAST,  _______,
+           _______, KC_P7,   KC_P8,   KC_P9,   KC_PMNS,  _______,
+           _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS,  _______,
+           _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT,  _______,
+                    _______, _______, KC_PDOT, KC_PENT,
+           // Right Thumb
+           _______, _______,
+           _______,
+           _______, _______, KC_P0
+    ),
+[_PROGRAM] = LAYOUT (
+           // Left Hand
+           STATUS,  _______, _______, QWERTY,   DVORAK,  MAC,     PC,     WIN,     _______,
+           _______, _______, _______, _______ , _______, _______,
+           _______, _______, _______, _______ , _______, _______,
+           _______, _______, _______, _______ , _______, _______,
+           _______, _______, _______, _______ , _______, _______,
+                    _______, _______, _______ , _______,
+           // Left Thumb
+                    _______, _______,
+                             _______,
+           _______, _______, _______,
+           // Right Hand
+           RESET,   _______, _______, _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______, _______, _______,
+                    _______, _______, _______, _______,
+           // Right Thumb
+           _______, _______,
+           _______,
+           _______, _______, _______
+    )
+};
+layer_state_t layer_state_set_user(layer_state_t state) {
+    writePin(LED_KEYPAD, !layer_state_cmp(state, _KEYPAD));
+    return state;
+}
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (record->event.pressed) {
+        switch (keycode) {
+            case QWERTY:
+                set_single_persistent_default_layer(_QWERTY);
+                return false;
+            case DVORAK:
+                set_single_persistent_default_layer(_DVORAK);
+                return false;
+            case MAC:
+                layer_on(_MAC);
+                layer_off(_PC);
+                return false;
+            case PC:
+                layer_off(_MAC);
+                layer_on(_PC);
+                return false;
+            case WIN:
+                layer_off(_MAC);
+                layer_off(_PC);
+                return false;
+            case STATUS:
+                SEND_STRING("Firmware> QMK " QMK_VERSION ", " QMK_BUILDDATE "\n");
+                SEND_STRING("Keyboard> " QMK_KEYBOARD "\n");
+                SEND_STRING("Keymap> " QMK_KEYMAP "\n");
+                if (layer_state_is(_QWERTY))
+                    SEND_STRING("Layout> QWERTY\n");
+                else
+                    SEND_STRING("Layout> DVORAK\n");
+                if (layer_state_is(_MAC))
+                    SEND_STRING("Thumb keys mode> MAC\n");
+                else if (layer_state_is(_PC))
+                    SEND_STRING("Thumb keys mode> PC\n");
+                else
+                    SEND_STRING("Thumb keys mode> WIN\n");
+                if (keymap_config.nkro)
+                    SEND_STRING("NKRO> Enabled\n");
+                else
+                    SEND_STRING("NKRO> Disabled\n");
+                if (debug_enable)
+                    SEND_STRING("Debug> Enabled\n");
+                else
+                    SEND_STRING("Debug> Disabled\n");
+                return false;
+        }
+    }
+    return true;
+}
diff --git a/keyboards/kinesis/kint36/keymaps/kzar/readme.md b/keyboards/kinesis/kint36/keymaps/kzar/readme.md
new file mode 100644
index 000000000..b45808892
--- /dev/null
+++ b/keyboards/kinesis/kint36/keymaps/kzar/readme.md
@@ -0,0 +1,9 @@
+# Dave's Kinesis Advantage keymap
+Kinesis Advantage keymap aiming to emulate the stock controller. QWERTY, DVORAK,
+WIN, MAC, PC, program and keypad layers are all supported, along with the
+keypad LED and RESET + STATUS keys.
+Tested with a Kinesis Advantage2, kinT (stapelberg) keyboard controller built
+with a Teensy 3.6 microcontroller and a UK system layout. Originally based upon
+the xyvers keymap.
diff --git a/keyboards/kinesis/kint36/keymaps/kzar/rules.mk b/keyboards/kinesis/kint36/keymaps/kzar/rules.mk
new file mode 100644
index 000000000..753718884
--- /dev/null
+++ b/keyboards/kinesis/kint36/keymaps/kzar/rules.mk
@@ -0,0 +1,5 @@
+BOOTMAGIC_ENABLE = no
+COMMAND_ENABLE = yes
+MOUSEKEY_ENABLE = no
+NKRO_ENABLE = yes
+RGBLIGHT_ENABLE = no
diff --git a/keyboards/kinesis/kint36/kint36.c b/keyboards/kinesis/kint36/kint36.c
new file mode 100644
index 000000000..108c14c7b
--- /dev/null
+++ b/keyboards/kinesis/kint36/kint36.c
@@ -0,0 +1,26 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "kint36.h"
+void matrix_init_kb(void) {
+    matrix_init_user();
+// Turn on the Teensy 3.6 Power LED:
+#define LED_POWER C5
+    setPinOutput(LED_POWER);
+    writePinHigh(LED_POWER);
+}
diff --git a/keyboards/kinesis/kint36/kint36.h b/keyboards/kinesis/kint36/kint36.h
new file mode 100644
index 000000000..d427a1c2d
--- /dev/null
+++ b/keyboards/kinesis/kint36/kint36.h
@@ -0,0 +1,92 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include "quantum.h"
+#define ___ KC_NO
+// This a shortcut to help you visually see your layout.
+// The first section contains all of the arguments as on the physical keyboard
+// The second converts the arguments into the 2-D scanned array
+#define LAYOUT(                                   \
+    kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2,  \
+    k00, k10, k20, k30, k40, k50,                 \
+    k01, k11, k21, k31, k41, k51,                 \
+    k02, k12, k22, k32, k42, k52,                 \
+    k03, k13, k23, k33, k43, k53,                 \
+         k14, k24, k34, k54,                      \
+                             k56, k55,            \
+                                  k35,            \
+                        k36, k46, k25,            \
+                                                  \
+    kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5,  \
+                   k60, k70, k80, k90, kA0, kB0,  \
+                   k61, k71, k81, k91, kA1, kB1,  \
+                   k62, k72, k82, k92, kA2, kB2,  \
+                   k63, k73, k83, k93, kA3, kB3,  \
+                        k64, k84, k94, kA4,       \
+              k96, k85,                           \
+              k86,                                \
+              k66, k75, k65                       \
+) {                                              \
+    { k00,  k01,  k02,  k03,  ___,  ___,  ___ }, \
+    { k10,  k11,  k12,  k13,  k14,  ___,  ___ }, \
+    { k20,  k21,  k22,  k23,  k24,  k25,  ___ }, \
+    { k30,  k31,  k32,  k33,  k34,  k35,  k36 }, \
+    { k40,  k41,  k42,  k43,  ___,  ___,  k46 }, \
+    { k50,  k51,  k52,  k53,  k54,  k55,  k56 }, \
+    { k60,  k61,  k62,  k63,  k64,  k65,  k66 }, \
+    { k70,  k71,  k72,  k73,  ___,  k75,  ___ }, \
+    { k80,  k81,  k82,  k83,  k84,  k85,  k86 }, \
+    { k90,  k91,  k92,  k93,  k94,  ___,  k96 }, \
+    { kA0,  kA1,  kA2,  kA3,  kA4,  ___,  ___ }, \
+    { kB0,  kB1,  kB2,  kB3,  ___,  ___,  ___ }, \
+    { kC0,  kC1,  kC2,  kC3,  kC4,  kC5,  ___ }, \
+    { kD0,  kD1,  kD2,  kD3,  kD4,  kD5,  ___ }, \
+    { kE0,  kE1,  kE2,  kE3,  kE4,  kE5,  ___ }, \
+}
+/*  ---------------- LEFT HAND -----------------   ---------------- RIGHT HAND ---------------- */
+#define LAYOUT_pretty(                                                                           \
+    kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2,   kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5,  \
+    k00, k10, k20, k30, k40, k50,                            k60, k70, k80, k90, kA0, kB0,       \
+    k01, k11, k21, k31, k41, k51,                            k61, k71, k81, k91, kA1, kB1,       \
+    k02, k12, k22, k32, k42, k52,                            k62, k72, k82, k92, kA2, kB2,       \
+    k03, k13, k23, k33, k43, k53,                            k63, k73, k83, k93, kA3, kB3,       \
+         k14, k24, k34, k54,                                      k64, k84, k94, kA4,            \
+                             k56, k55,                  k96, k85,                                \
+                                  k35,                  k86,                                     \
+                        k36, k46, k25,                  k66, k75, k65                            \
+) {                                              \
+    { k00,  k01,  k02,  k03,  ___,  ___,  ___ }, \
+    { k10,  k11,  k12,  k13,  k14,  ___,  ___ }, \
+    { k20,  k21,  k22,  k23,  k24,  k25,  ___ }, \
+    { k30,  k31,  k32,  k33,  k34,  k35,  k36 }, \
+    { k40,  k41,  k42,  k43,  ___,  ___,  k46 }, \
+    { k50,  k51,  k52,  k53,  k54,  k55,  k56 }, \
+    { k60,  k61,  k62,  k63,  k64,  k65,  k66 }, \
+    { k70,  k71,  k72,  k73,  ___,  k75,  ___ }, \
+    { k80,  k81,  k82,  k83,  k84,  k85,  k86 }, \
+    { k90,  k91,  k92,  k93,  k94,  ___,  k96 }, \
+    { kA0,  kA1,  kA2,  kA3,  kA4,  ___,  ___ }, \
+    { kB0,  kB1,  kB2,  kB3,  ___,  ___,  ___ }, \
+    { kC0,  kC1,  kC2,  kC3,  kC4,  kC5,  ___ }, \
+    { kD0,  kD1,  kD2,  kD3,  kD4,  kD5,  ___ }, \
+    { kE0,  kE1,  kE2,  kE3,  kE4,  kE5,  ___ }  \
+}
diff --git a/keyboards/kinesis/kint36/mcuconf.h b/keyboards/kinesis/kint36/mcuconf.h
new file mode 100644
index 000000000..b0ea44567
--- /dev/null
+++ b/keyboards/kinesis/kint36/mcuconf.h
@@ -0,0 +1,65 @@
+// based on lib/chibios-contrib/demos/KINETIS/RT-TEENSY3_6/mcuconf.h:
+/*
+    ChibiOS - Copyright (C) 2006..2015 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.
+    You may obtain a copy of the License at
+        http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+#define MK66FX1M0_MCUCONF
+/*
+ * HAL driver system settings.
+ */
+/* Select the MCU clocking mode below by enabling the appropriate block. */
+/* PEE mode - 180 MHz system clock driving by 16 MHz xtal */
+#define KINETIS_MCG_MODE KINETIS_MCG_MODE_PEE
+//#define KINETIS_PLLCLK_FREQUENCY 180000000UL  // 180 MHz (HSRUN)
+#define KINETIS_PLLCLK_FREQUENCY 120000000UL  // 120 MHz (RUN)
+#define KINETIS_SYSCLK_FREQUENCY KINETIS_PLLCLK_FREQUENCY
+#define KINETIS_BUSCLK_FREQUENCY 60000000UL
+//#define KINETIS_FLASHCLK_FREQUENCY 28000000UL  // 28 MHz (HSRUN)
+#define KINETIS_FLASHCLK_FREQUENCY 24000000UL  // 24 MHz (RUN)
+#if KINETIS_PLLCLK_FREQUENCY == 180000000UL
+#    define KINETIS_CLKDIV1_OUTDIV1 1  // -> 0
+#    define KINETIS_CLKDIV1_OUTDIV2 3  // -> 2
+#    define KINETIS_CLKDIV1_OUTDIV4 7  // -> 6
+#else
+#    define KINETIS_CLKDIV1_OUTDIV1 1  // -> 0
+#    define KINETIS_CLKDIV1_OUTDIV2 2  // -> 1
+#    define KINETIS_CLKDIV1_OUTDIV4 5  // -> 4
+#endif
+/*
+ * SERIAL driver system settings.
+ */
+#define KINETIS_SERIAL_USE_UART4 TRUE
+/*
+ * USB driver settings
+ */
+#define KINETIS_USB_USE_USB0 TRUE
+#define KINETIS_USB_USB0_IRQ_PRIORITY 5
+/*
+ * I2C driver settings
+ */
+#define KINETIS_I2C_USE_I2C0 TRUE
+#define KINETIS_I2C_I2C0_PRIORITY 4
+#endif /* _MCUCONF_H_ */
diff --git a/keyboards/kinesis/kint36/readme.md b/keyboards/kinesis/kint36/readme.md
new file mode 100644
index 000000000..a2bb0c1cf
--- /dev/null
+++ b/keyboards/kinesis/kint36/readme.md
@@ -0,0 +1,3 @@
+# kinesis_kint36 keyboard firmware
+Please see https://github.com/kinx-project/kint for details.
diff --git a/keyboards/kinesis/kint36/rules.mk b/keyboards/kinesis/kint36/rules.mk
new file mode 100644
index 000000000..cf58cb913
--- /dev/null
+++ b/keyboards/kinesis/kint36/rules.mk
@@ -0,0 +1,6 @@
+BOARD = PJRC_TEENSY_3_6
+MCU   = MK66F18
+# Debounce eagerly (report change immediately), keep per-key timers. We can use
+# this because the kinT does not have to deal with noise.
+DEBOUNCE_TYPE = sym_eager_pk
diff --git a/keyboards/kinesis/nguyenvietyen/rules.mk b/keyboards/kinesis/nguyenvietyen/rules.mk
index c2d5f729b..a401973aa 100644
--- a/keyboards/kinesis/nguyenvietyen/rules.mk
+++ b/keyboards/kinesis/nguyenvietyen/rules.mk
@@ -7,7 +7,7 @@ BOOTLOADER = caterina
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes
+BOOTMAGIC_ENABLE = full
 MOUSEKEY_ENABLE = yes
 EXTRAKEY_ENABLE = yes
 COMMAND_ENABLE = yes
diff --git a/keyboards/kinesis/rules.mk b/keyboards/kinesis/rules.mk
index cc0691e98..651751fa6 100644
--- a/keyboards/kinesis/rules.mk
+++ b/keyboards/kinesis/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = halfkay
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no        # Console for debug
diff --git a/keyboards/kinesis/stapelberg/config.h b/keyboards/kinesis/stapelberg/config.h
index 5037baebd..8f920c19c 100644
--- a/keyboards/kinesis/stapelberg/config.h
+++ b/keyboards/kinesis/stapelberg/config.h
@@ -2,6 +2,7 @@
 #define STAPELBERG_CONFIG_H
 #include "../config.h"
+#include "config_common.h"
 /* USB Device descriptor parameter */
 #define PRODUCT_ID      0x6060
diff --git a/keyboards/kingly_keys/ropro/rules.mk b/keyboards/kingly_keys/ropro/rules.mk
index d3fad8265..a8cce7780 100644
--- a/keyboards/kingly_keys/ropro/rules.mk
+++ b/keyboards/kingly_keys/ropro/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no        # Console for debug
diff --git a/keyboards/kingly_keys/soap/rules.mk b/keyboards/kingly_keys/soap/rules.mk
index 56adb1e55..e6d997bfe 100644
--- a/keyboards/kingly_keys/soap/rules.mk
+++ b/keyboards/kingly_keys/soap/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no        # Console for debug
diff --git a/keyboards/kmac/rules.mk b/keyboards/kmac/rules.mk
index 33e423d3d..2a35f70cd 100644
--- a/keyboards/kmac/rules.mk
+++ b/keyboards/kmac/rules.mk
@@ -17,7 +17,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/kmini/rules.mk b/keyboards/kmini/rules.mk
index f40b013f7..1694b9ac6 100755
--- a/keyboards/kmini/rules.mk
+++ b/keyboards/kmini/rules.mk
@@ -17,7 +17,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/kona_classic/keymaps/ansi/rules.mk b/keyboards/kona_classic/keymaps/ansi/rules.mk
index e4865902c..fec19c9df 100644
--- a/keyboards/kona_classic/keymaps/ansi/rules.mk
+++ b/keyboards/kona_classic/keymaps/ansi/rules.mk
@@ -18,7 +18,7 @@
 #   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/kona_classic/keymaps/ansi_arrows/rules.mk b/keyboards/kona_classic/keymaps/ansi_arrows/rules.mk
index e4865902c..fec19c9df 100644
--- a/keyboards/kona_classic/keymaps/ansi_arrows/rules.mk
+++ b/keyboards/kona_classic/keymaps/ansi_arrows/rules.mk
@@ -18,7 +18,7 @@
 #   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/kona_classic/keymaps/ansi_arrows_lcap/rules.mk b/keyboards/kona_classic/keymaps/ansi_arrows_lcap/rules.mk
index e4865902c..fec19c9df 100644
--- a/keyboards/kona_classic/keymaps/ansi_arrows_lcap/rules.mk
+++ b/keyboards/kona_classic/keymaps/ansi_arrows_lcap/rules.mk
@@ -18,7 +18,7 @@
 #   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/kona_classic/keymaps/ansi_split/rules.mk b/keyboards/kona_classic/keymaps/ansi_split/rules.mk
index e4865902c..fec19c9df 100644
--- a/keyboards/kona_classic/keymaps/ansi_split/rules.mk
+++ b/keyboards/kona_classic/keymaps/ansi_split/rules.mk
@@ -18,7 +18,7 @@
 #   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/kona_classic/keymaps/ansi_split_arrows/rules.mk b/keyboards/kona_classic/keymaps/ansi_split_arrows/rules.mk
index e4865902c..fec19c9df 100644
--- a/keyboards/kona_classic/keymaps/ansi_split_arrows/rules.mk
+++ b/keyboards/kona_classic/keymaps/ansi_split_arrows/rules.mk
@@ -18,7 +18,7 @@
 #   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/kona_classic/keymaps/default/rules.mk b/keyboards/kona_classic/keymaps/default/rules.mk
index e4865902c..fec19c9df 100644
--- a/keyboards/kona_classic/keymaps/default/rules.mk
+++ b/keyboards/kona_classic/keymaps/default/rules.mk
@@ -18,7 +18,7 @@
 #   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/kona_classic/keymaps/iso/rules.mk b/keyboards/kona_classic/keymaps/iso/rules.mk
index e4865902c..fec19c9df 100644
--- a/keyboards/kona_classic/keymaps/iso/rules.mk
+++ b/keyboards/kona_classic/keymaps/iso/rules.mk
@@ -18,7 +18,7 @@
 #   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/kona_classic/keymaps/iso_arrows/rules.mk b/keyboards/kona_classic/keymaps/iso_arrows/rules.mk
index e4865902c..fec19c9df 100644
--- a/keyboards/kona_classic/keymaps/iso_arrows/rules.mk
+++ b/keyboards/kona_classic/keymaps/iso_arrows/rules.mk
@@ -18,7 +18,7 @@
 #   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/kona_classic/keymaps/iso_split/rules.mk b/keyboards/kona_classic/keymaps/iso_split/rules.mk
index e4865902c..fec19c9df 100644
--- a/keyboards/kona_classic/keymaps/iso_split/rules.mk
+++ b/keyboards/kona_classic/keymaps/iso_split/rules.mk
@@ -18,7 +18,7 @@
 #   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/kona_classic/keymaps/iso_split_arrows/rules.mk b/keyboards/kona_classic/keymaps/iso_split_arrows/rules.mk
index e4865902c..fec19c9df 100644
--- a/keyboards/kona_classic/keymaps/iso_split_arrows/rules.mk
+++ b/keyboards/kona_classic/keymaps/iso_split_arrows/rules.mk
@@ -18,7 +18,7 @@
 #   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/leeku/finger65/rules.mk b/keyboards/leeku/finger65/rules.mk
index 16ce59ecb..1ebd43b08 100644
--- a/keyboards/leeku/finger65/rules.mk
+++ b/keyboards/leeku/finger65/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = bootloadHID
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = no        # Mouse keys
 EXTRAKEY_ENABLE = no        # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/lets_split/keymaps/pyrol/rules.mk b/keyboards/lets_split/keymaps/pyrol/rules.mk
index 6e1be51be..8d49979f9 100644
--- a/keyboards/lets_split/keymaps/pyrol/rules.mk
+++ b/keyboards/lets_split/keymaps/pyrol/rules.mk
@@ -1 +1 @@
- BOOTMAGIC_ENABLE = yes
+ BOOTMAGIC_ENABLE = full
diff --git a/keyboards/masterworks/classy_tkl/rev_a/rules.mk b/keyboards/masterworks/classy_tkl/rev_a/rules.mk
index 34bcd87a4..68d6bc50c 100644
--- a/keyboards/masterworks/classy_tkl/rev_a/rules.mk
+++ b/keyboards/masterworks/classy_tkl/rev_a/rules.mk
@@ -8,7 +8,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
diff --git a/keyboards/matrix/m12og/rules.mk b/keyboards/matrix/m12og/rules.mk
index 74432d49c..58ec898a6 100644
--- a/keyboards/matrix/m12og/rules.mk
+++ b/keyboards/matrix/m12og/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes          # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full         # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = no            # Mouse keys
 EXTRAKEY_ENABLE = yes           # Audio control and System control
 CONSOLE_ENABLE = no                     # Console for debug
diff --git a/keyboards/matrix/m20add/rules.mk b/keyboards/matrix/m20add/rules.mk
index 93ddf05e9..d5516964d 100644
--- a/keyboards/matrix/m20add/rules.mk
+++ b/keyboards/matrix/m20add/rules.mk
@@ -13,7 +13,7 @@ BOARD = ST_NUCLEO64_F411RE
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/matrix/noah/rules.mk b/keyboards/matrix/noah/rules.mk
index 5566bd26a..25106a9b5 100644
--- a/keyboards/matrix/noah/rules.mk
+++ b/keyboards/matrix/noah/rules.mk
@@ -13,7 +13,7 @@ BOARD = ST_NUCLEO64_F411RE
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/mechmini/v1/rules.mk b/keyboards/mechmini/v1/rules.mk
index 93646c8e1..c1582d9c6 100644
--- a/keyboards/mechmini/v1/rules.mk
+++ b/keyboards/mechmini/v1/rules.mk
@@ -12,7 +12,7 @@ MCU = atmega32a
 BOOTLOADER = atmel-dfu
 # build options
-BOOTMAGIC_ENABLE = yes
+BOOTMAGIC_ENABLE = full
 MOUSEKEY_ENABLE = yes
 EXTRAKEY_ENABLE = yes
 CONSOLE_ENABLE = no
diff --git a/keyboards/mechmini/v2/keymaps/lbibass_625_space/rules.mk b/keyboards/mechmini/v2/keymaps/lbibass_625_space/rules.mk
index 7bc50168d..49a55db51 100755
--- a/keyboards/mechmini/v2/keymaps/lbibass_625_space/rules.mk
+++ b/keyboards/mechmini/v2/keymaps/lbibass_625_space/rules.mk
@@ -1,4 +1,4 @@
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = no    # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes   # Audio control and System control(+450)
 CONSOLE_ENABLE = yes    # Console for debug(+400)
diff --git a/keyboards/mechmini/v2/keymaps/lbibass_split_space/rules.mk b/keyboards/mechmini/v2/keymaps/lbibass_split_space/rules.mk
index fd3621e84..9ea2eeee8 100755
--- a/keyboards/mechmini/v2/keymaps/lbibass_split_space/rules.mk
+++ b/keyboards/mechmini/v2/keymaps/lbibass_split_space/rules.mk
@@ -1,4 +1,4 @@
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = no    # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes   # Audio control and System control(+450)
 CONSOLE_ENABLE = yes    # Console for debug(+400)
diff --git a/keyboards/mechmini/v2/keymaps/wsturgiss/rules.mk b/keyboards/mechmini/v2/keymaps/wsturgiss/rules.mk
index a2c78f8db..1484e2dd0 100755
--- a/keyboards/mechmini/v2/keymaps/wsturgiss/rules.mk
+++ b/keyboards/mechmini/v2/keymaps/wsturgiss/rules.mk
@@ -1,4 +1,4 @@
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration(+1000)
 CONSOLE_ENABLE = no     # Console for debug(+400)
 COMMAND_ENABLE = no    # Commands for debug and configuration
 SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
diff --git a/keyboards/mechmini/v2/rules.mk b/keyboards/mechmini/v2/rules.mk
index a82774319..d585958de 100755
--- a/keyboards/mechmini/v2/rules.mk
+++ b/keyboards/mechmini/v2/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = no    # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = no     # Console for debug
diff --git a/keyboards/mehkee96/rules.mk b/keyboards/mehkee96/rules.mk
index 488c63fce..91c9dc0df 100644
--- a/keyboards/mehkee96/rules.mk
+++ b/keyboards/mehkee96/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = bootloadHID
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = no     # Console for debug
diff --git a/keyboards/mitosis/rules.mk b/keyboards/mitosis/rules.mk
index 4cb6d8c9b..5ca62fc8b 100644
--- a/keyboards/mitosis/rules.mk
+++ b/keyboards/mitosis/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   comment out to disable the options.
 #
-#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+#BOOTMAGIC_ENABLE = full        # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug
diff --git a/keyboards/mt40/rules.mk b/keyboards/mt40/rules.mk
index 2b8e18a95..3f4847400 100644
--- a/keyboards/mt40/rules.mk
+++ b/keyboards/mt40/rules.mk
@@ -12,7 +12,7 @@ MCU = atmega32a
 BOOTLOADER = bootloadHID
 # build options
-BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = no   # Mouse keys
 EXTRAKEY_ENABLE = yes  # Audio control and System control
 CONSOLE_ENABLE = no    # Console for debug
diff --git a/keyboards/mt64rgb/rules.mk b/keyboards/mt64rgb/rules.mk
index 08450b37a..b77c0d52b 100644
--- a/keyboards/mt64rgb/rules.mk
+++ b/keyboards/mt64rgb/rules.mk
@@ -25,3 +25,5 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
 LAYOUTS = 64_ansi
+LTO_ENABLE = yes
diff --git a/keyboards/nemui/rules.mk b/keyboards/nemui/rules.mk
index 109141ebb..011a8a89b 100644
--- a/keyboards/nemui/rules.mk
+++ b/keyboards/nemui/rules.mk
@@ -4,7 +4,7 @@ MCU = STM32F072
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
diff --git a/keyboards/nightly_boards/ph_arisu/rules.mk b/keyboards/nightly_boards/ph_arisu/rules.mk
index e70a8a7d6..bde08efba 100644
--- a/keyboards/nightly_boards/ph_arisu/rules.mk
+++ b/keyboards/nightly_boards/ph_arisu/rules.mk
@@ -7,7 +7,7 @@ BOOTLOADER = caterina
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/nopunin10did/railroad/rev0/rules.mk b/keyboards/nopunin10did/railroad/rev0/rules.mk
index a7facc532..54bb17ad2 100644
--- a/keyboards/nopunin10did/railroad/rev0/rules.mk
+++ b/keyboards/nopunin10did/railroad/rev0/rules.mk
@@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/ok60/rules.mk b/keyboards/ok60/rules.mk
index 064683816..f2801c945 100644
--- a/keyboards/ok60/rules.mk
+++ b/keyboards/ok60/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes          # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full         # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes           # Mouse keys
 EXTRAKEY_ENABLE = yes           # Audio control and System control
 # CONSOLE_ENABLE = yes          # Console for debug
diff --git a/keyboards/omnikey_bh/rules.mk b/keyboards/omnikey_bh/rules.mk
index 739bea393..1843f1ba6 100644
--- a/keyboards/omnikey_bh/rules.mk
+++ b/keyboards/omnikey_bh/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = halfkay
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = no     # Console for debug
diff --git a/keyboards/orange75/rules.mk b/keyboards/orange75/rules.mk
index ce242bb2a..08a8fc02e 100644
--- a/keyboards/orange75/rules.mk
+++ b/keyboards/orange75/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = no     # Console for debug
diff --git a/keyboards/org60/rules.mk b/keyboards/org60/rules.mk
index a57d68acc..f115d70ba 100644
--- a/keyboards/org60/rules.mk
+++ b/keyboards/org60/rules.mk
@@ -15,7 +15,7 @@ BOOTLOADER = atmel-dfu
 AUDIO_ENABLE = no           # Audio output on port C6
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 COMMAND_ENABLE = no         # Commands for debug and configuration
 CONSOLE_ENABLE = no         # Console for debug
 EXTRAKEY_ENABLE = yes       # Audio control and System control
diff --git a/keyboards/paladin64/rules.mk b/keyboards/paladin64/rules.mk
index 739e00613..a4fb2cf3a 100755
--- a/keyboards/paladin64/rules.mk
+++ b/keyboards/paladin64/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug
diff --git a/keyboards/pearl/keymaps/cijanzen/rules.mk b/keyboards/pearl/keymaps/cijanzen/rules.mk
index 863b9419a..90be4603a 100644
--- a/keyboards/pearl/keymaps/cijanzen/rules.mk
+++ b/keyboards/pearl/keymaps/cijanzen/rules.mk
@@ -1,5 +1,5 @@
 # build options
-BOOTMAGIC_ENABLE = yes
+BOOTMAGIC_ENABLE = full
 MOUSEKEY_ENABLE = no
 EXTRAKEY_ENABLE = yes
 CONSOLE_ENABLE = no
diff --git a/keyboards/peiorisboards/ixora/rules.mk b/keyboards/peiorisboards/ixora/rules.mk
index 1d93c6a30..5451bf95e 100644
--- a/keyboards/peiorisboards/ixora/rules.mk
+++ b/keyboards/peiorisboards/ixora/rules.mk
@@ -5,7 +5,7 @@ MCU = STM32F042
 #   comment out to disable the options.
 #
 BACKLIGHT_ENABLE = no
-BOOTMAGIC_ENABLE = yes                          # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full                         # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes                           # Mouse keys
 EXTRAKEY_ENABLE = yes                           # Audio control and System control
 CONSOLE_ENABLE = no                                     # Console for debug
diff --git a/keyboards/planck/ez/rules.mk b/keyboards/planck/ez/rules.mk
index 71f0a5fd1..acf3455c9 100644
--- a/keyboards/planck/ez/rules.mk
+++ b/keyboards/planck/ez/rules.mk
@@ -6,7 +6,7 @@ BOARD = QMK_PROTON_C
 #   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes      # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes         # Console for debug
diff --git a/keyboards/planck/keymaps/danielhklein/rules.mk b/keyboards/planck/keymaps/danielhklein/rules.mk
index 72386fae7..4660d443d 100644
--- a/keyboards/planck/keymaps/danielhklein/rules.mk
+++ b/keyboards/planck/keymaps/danielhklein/rules.mk
@@ -1,4 +1,4 @@
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = no         # Console for debug(+400)
diff --git a/keyboards/planck/keymaps/vifon/rules.mk b/keyboards/planck/keymaps/vifon/rules.mk
index 527e63d38..3f9b4544e 100644
--- a/keyboards/planck/keymaps/vifon/rules.mk
+++ b/keyboards/planck/keymaps/vifon/rules.mk
@@ -4,7 +4,7 @@
 #   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = no         # Console for debug(+400)
diff --git a/keyboards/planck/rev6/rules.mk b/keyboards/planck/rev6/rules.mk
index c3fcf3dbd..e0f9ff0d0 100644
--- a/keyboards/planck/rev6/rules.mk
+++ b/keyboards/planck/rev6/rules.mk
@@ -6,7 +6,7 @@ BOARD = QMK_PROTON_C
 #   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes      # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes         # Console for debug
diff --git a/keyboards/playkbtw/pk60/rules.mk b/keyboards/playkbtw/pk60/rules.mk
index 23b186842..948e212e6 100644
--- a/keyboards/playkbtw/pk60/rules.mk
+++ b/keyboards/playkbtw/pk60/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = no     # Console for debug
diff --git a/keyboards/preonic/keymaps/dlaroe/rules.mk b/keyboards/preonic/keymaps/dlaroe/rules.mk
index 68f78de6e..2b7cff4db 100644
--- a/keyboards/preonic/keymaps/dlaroe/rules.mk
+++ b/keyboards/preonic/keymaps/dlaroe/rules.mk
@@ -4,7 +4,7 @@
 #   change to "no" to disable the options, or define them in the Makefile in 
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = yes       # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full       # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = no         # Console for debug(+400)
diff --git a/keyboards/preonic/rev3/rules.mk b/keyboards/preonic/rev3/rules.mk
index 249d13705..d600be4a4 100644
--- a/keyboards/preonic/rev3/rules.mk
+++ b/keyboards/preonic/rev3/rules.mk
@@ -6,7 +6,7 @@ BOARD = QMK_PROTON_C
 #   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes      # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes         # Console for debug
diff --git a/keyboards/primekb/prime_e/rules.mk b/keyboards/primekb/prime_e/rules.mk
index e9045dba9..f5ea0075c 100644
--- a/keyboards/primekb/prime_e/rules.mk
+++ b/keyboards/primekb/prime_e/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = no       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no        # Console for debug
diff --git a/keyboards/primekb/prime_r/rules.mk b/keyboards/primekb/prime_r/rules.mk
index 6f7dd4705..101e16752 100644
--- a/keyboards/primekb/prime_r/rules.mk
+++ b/keyboards/primekb/prime_r/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = no     # Console for debug
diff --git a/keyboards/projectkb/alice/config.h b/keyboards/projectkb/alice/config.h
new file mode 100644
index 000000000..95fb682e1
--- /dev/null
+++ b/keyboards/projectkb/alice/config.h
@@ -0,0 +1,3 @@
+#pragma once
+#define SLEEP_LED_GPT_DRIVER GPTD1
diff --git a/keyboards/projectkb/alice/halconf.h b/keyboards/projectkb/alice/halconf.h
index b17808ffe..0016e53ba 100644
--- a/keyboards/projectkb/alice/halconf.h
+++ b/keyboards/projectkb/alice/halconf.h
@@ -27,5 +27,7 @@
 #define HAL_USE_SPI TRUE
+#define HAL_USE_GPT TRUE
 #include_next <halconf.h>
diff --git a/keyboards/projectkb/alice/mcuconf.h b/keyboards/projectkb/alice/mcuconf.h
index 4bfc7f946..6e0f1a50d 100644
--- a/keyboards/projectkb/alice/mcuconf.h
+++ b/keyboards/projectkb/alice/mcuconf.h
@@ -32,3 +32,5 @@
 #undef STM32_SPI_USE_SPI2
 #define STM32_SPI_USE_SPI2 TRUE
+#undef STM32_GPT_USE_TIM1
+#define STM32_GPT_USE_TIM1 TRUE
diff --git a/keyboards/projectkb/signature87/rules.mk b/keyboards/projectkb/signature87/rules.mk
index fe0d976d1..a307166cd 100644
--- a/keyboards/projectkb/signature87/rules.mk
+++ b/keyboards/projectkb/signature87/rules.mk
@@ -4,12 +4,12 @@ MCU = STM32F072
 # Build Options
 #   comment out to disable the options.
 #
-#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+#BOOTMAGIC_ENABLE = full        # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug
 COMMAND_ENABLE = yes    # Commands for debug and configuration
-SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
+SLEEP_LED_ENABLE = no   # Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes           # USB Nkey Rollover
 BACKLIGHT_ENABLE = no
diff --git a/keyboards/rainkeeb/rules.mk b/keyboards/rainkeeb/rules.mk
index aa9aab9b7..0c7dd09c2 100644
--- a/keyboards/rainkeeb/rules.mk
+++ b/keyboards/rainkeeb/rules.mk
@@ -7,7 +7,7 @@ BOOTLOADER = caterina
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/ramonimbao/wete/config.h b/keyboards/ramonimbao/wete/config.h
index 5d68a7efd..3d8955009 100644
--- a/keyboards/ramonimbao/wete/config.h
+++ b/keyboards/ramonimbao/wete/config.h
@@ -46,6 +46,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLED_NUM 24
 #define RGBLIGHT_ANIMATIONS
+#define SLEEP_LED_GPT_DRIVER GPTD1
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
diff --git a/keyboards/ramonimbao/wete/halconf.h b/keyboards/ramonimbao/wete/halconf.h
index c43440a45..b3de873be 100644
--- a/keyboards/ramonimbao/wete/halconf.h
+++ b/keyboards/ramonimbao/wete/halconf.h
@@ -23,5 +23,7 @@
 #define HAL_USE_PWM TRUE
+#define HAL_USE_GPT TRUE
 #include_next <halconf.h>
diff --git a/keyboards/ramonimbao/wete/mcuconf.h b/keyboards/ramonimbao/wete/mcuconf.h
index b7f2c481c..7a2e87776 100644
--- a/keyboards/ramonimbao/wete/mcuconf.h
+++ b/keyboards/ramonimbao/wete/mcuconf.h
@@ -35,3 +35,5 @@
 #undef STM32_SPI_USE_SPI2
 #define STM32_SPI_USE_SPI2 TRUE
+#undef STM32_GPT_USE_TIM1
+#define STM32_GPT_USE_TIM1 TRUE
diff --git a/keyboards/ramonimbao/wete/rules.mk b/keyboards/ramonimbao/wete/rules.mk
index 81c717c57..039cc87a2 100644
--- a/keyboards/ramonimbao/wete/rules.mk
+++ b/keyboards/ramonimbao/wete/rules.mk
@@ -5,7 +5,7 @@ MCU = STM32F072
 #   comment out to disable the options.
 #
-#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+#BOOTMAGIC_ENABLE = full        # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug
diff --git a/keyboards/readme.md b/keyboards/readme.md
index 6b7b92e0c..a23d0845b 100644
--- a/keyboards/readme.md
+++ b/keyboards/readme.md
@@ -63,4 +63,4 @@ These keyboards are part of the QMK repository, but their manufacturers are not
 * [Vision Division](/keyboards/vision_division) &mdash; Full Size / Split Linear Keyboard by IBNobody.
 * [XD004](/keyboards/xd004) &mdash; 1x4 macro keyboard sold by KPrepublic.
 * [XD75](/keyboards/xd75) &mdash; 15x5 ortholinear keyboard by XIUDI.
-* [YMDK NP21](/keyboards/ymdk_np21) &mdash; ps2avrGB based number pad (numpad) sold by YMDK on Aliexpress. 
+* [YMDK NP21](/keyboards/ymdk_np21) &mdash; ps2avrGB based number pad (numpad) sold by YMDK on Aliexpress.
diff --git a/keyboards/redox_w/rules.mk b/keyboards/redox_w/rules.mk
index 01d5c3c70..b7084b4a1 100644
--- a/keyboards/redox_w/rules.mk
+++ b/keyboards/redox_w/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   comment out to disable the options.
 #
-#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+#BOOTMAGIC_ENABLE = full        # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug
diff --git a/keyboards/reversestudio/decadepad/rules.mk b/keyboards/reversestudio/decadepad/rules.mk
index 65dbf4901..6011be9e8 100644
--- a/keyboards/reversestudio/decadepad/rules.mk
+++ b/keyboards/reversestudio/decadepad/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = no        # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
diff --git a/keyboards/rgbkb/zygomorph/keymaps/xulkal/rules.mk b/keyboards/rgbkb/zygomorph/keymaps/xulkal/rules.mk
index 78969ad7a..d7d50e137 100644
--- a/keyboards/rgbkb/zygomorph/keymaps/xulkal/rules.mk
+++ b/keyboards/rgbkb/zygomorph/keymaps/xulkal/rules.mk
@@ -8,11 +8,13 @@ EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-RGBLIGHT_ENABLE = yes       # Enable global lighting effects. Do not enable with RGB Matrix
+RGBLIGHT_ENABLE = no        # Enable global lighting effects. Do not enable with RGB Matrix
-RGBLIGHT_ANIMATIONS = yes   # LED animations
+RGBLIGHT_ANIMATIONS = no    # LED animations
-RGBLIGHT_SPLIT_ENABLE = yes # Split RGBLight Support
+RGBLIGHT_SPLIT_ENABLE = no  # Split RGBLight Support
-RGB_MATRIX_ENABLE = no      # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
+RGB_MATRIX_ENABLE = yes         # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
+RGB_MATRIX_DRIVER = WS2812
 RGB_MATRIX_KEYPRESSES = no  # Enable reactive per-key effects.
+SPLIT_RGB_MATRIX_ENABLE = yes # For split RGB Matrix support
 RGBLIGHT_FULL_POWER = yes   # Allow maximum RGB brightness. Otherwise, limited to a safe level for a normal USB-A port
 UNICODE_ENABLE = no         # Unicode
 SWAP_HANDS_ENABLE = no      # Enable one-hand typing
@@ -40,3 +42,7 @@ endif
 ifeq ($(strip $(RGBLIGHT_SPLIT_ENABLE)), yes)
    OPT_DEFS += -DRGBLIGHT_SPLIT_ENABLE
 endif
+ifeq ($(strip $(SPLIT_RGB_MATRIX_ENABLE)), yes)
+    OPT_DEFS += -DSPLIT_TRANSPORT_MIRROR
+endif
diff --git a/keyboards/rgbkb/zygomorph/rev1/config.h b/keyboards/rgbkb/zygomorph/rev1/config.h
index 667b68f73..190a8bbe3 100644
--- a/keyboards/rgbkb/zygomorph/rev1/config.h
+++ b/keyboards/rgbkb/zygomorph/rev1/config.h
@@ -55,7 +55,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLED_NUM 60
    #define RGBLED_SPLIT { 30, 30 }
 #endif
-#define DRIVER_LED_TOTAL 30
+#define DRIVER_LED_TOTAL 60
+#define RGB_MATRIX_SPLIT { 30, 30 }
 #ifdef IOS_DEVICE_ENABLE
  #define RGBLIGHT_LIMIT_VAL 40
diff --git a/keyboards/rgbkb/zygomorph/rev1/rev1.c b/keyboards/rgbkb/zygomorph/rev1/rev1.c
index 3edf48c5d..1fb1716a0 100644
--- a/keyboards/rgbkb/zygomorph/rev1/rev1.c
+++ b/keyboards/rgbkb/zygomorph/rev1/rev1.c
@@ -2,72 +2,42 @@
 #ifdef RGB_MATRIX_ENABLE
-#define RGB_LEFT_HAND    { { 0 | ( 5 << 4) }, { 102,  0 }, 4}, \
+led_config_t g_led_config = { {
-    { { 0 | ( 4 << 4) }, {  81,  0 }, 4}, \
+    {      5,      4,      3,      2,      1,      0 },
-    { { 0 | ( 3 << 4) }, {  61,  0 }, 4}, \
+    {     11,     10,      9,      8,      7,      6 },
-    { { 0 | ( 2 << 4) }, {  41,  0 }, 4}, \
+    {     17,     16,     15,     14,     13,     12 },
-    { { 0 | ( 1 << 4) }, {  20,  0 }, 4}, \
+    {     23,     22,     21,     20,     19,     18 },
-    { { 0 | ( 0 << 4) }, {   0,  0 }, 1}, \
+    {     29,     28,     27,     26,     25,     24 },
-    { { 1 | ( 5 << 4) }, { 102, 16 }, 4}, \
+    {     35,     34,     33,     32,     31,     30 },
-    { { 1 | ( 4 << 4) }, {  81, 16 }, 4}, \
+    {     41,     40,     39,     38,     37,     36 },
-    { { 1 | ( 3 << 4) }, {  61, 16 }, 4}, \
+    {     47,     46,     45,     44,     43,     42 },
-    { { 1 | ( 2 << 4) }, {  41, 16 }, 4}, \
+    {     53,     52,     51,     50,     49,     48 },
-    { { 1 | ( 1 << 4) }, {  20, 16 }, 4}, \
+    {     59,     58,     57,     56,     55,     54 }
-    { { 1 | ( 0 << 4) }, {   0, 16 }, 1}, \
+}, {
-    { { 2 | ( 5 << 4) }, { 102, 32 }, 4}, \
+// Left Hand
-    { { 2 | ( 4 << 4) }, {  81, 32 }, 4}, \
+    { 102,   0 }, {  81,   0 }, {  61,   0 }, {  41,   0 }, {  20,   0 }, {   0,   0 },
-    { { 2 | ( 3 << 4) }, {  61, 32 }, 4}, \
+    { 102,  16 }, {  81,  16 }, {  61,  16 }, {  41,  16 }, {  20,  16 }, {   0,  16 },
-    { { 2 | ( 2 << 4) }, {  41, 32 }, 4}, \
+    { 102,  32 }, {  81,  32 }, {  61,  32 }, {  41,  32 }, {  20,  32 }, {   0,  32 },
-    { { 2 | ( 1 << 4) }, {  20, 32 }, 4}, \
+    { 102,  48 }, {  81,  48 }, {  61,  48 }, {  41,  48 }, {  20,  48 }, {   0,  48 },
-    { { 2 | ( 0 << 4) }, {   0, 32 }, 1}, \
+    { 102,  64 }, {  81,  64 }, {  61,  64 }, {  41,  64 }, {  20,  64 }, {   0,  64 },
-    { { 3 | ( 5 << 4) }, { 102, 48 }, 4}, \
+// Right Hand
-    { { 3 | ( 4 << 4) }, {  81, 48 }, 4}, \
+    { 224,   0 }, { 204,   0 }, { 183,   0 }, { 163,   0 }, { 143,   0 }, { 122,   0 },
-    { { 3 | ( 3 << 4) }, {  61, 48 }, 4}, \
+    { 224,  16 }, { 204,  16 }, { 183,  16 }, { 163,  16 }, { 143,  16 }, { 122,  16 },
-    { { 3 | ( 2 << 4) }, {  41, 48 }, 4}, \
+    { 224,  32 }, { 204,  32 }, { 183,  32 }, { 163,  32 }, { 143,  32 }, { 122,  32 },
-    { { 3 | ( 1 << 4) }, {  20, 48 }, 4}, \
+    { 224,  48 }, { 204,  48 }, { 183,  48 }, { 163,  48 }, { 143,  48 }, { 122,  48 },
-    { { 3 | ( 0 << 4) }, {   0, 48 }, 1}, \
+    { 224,  64 }, { 204,  64 }, { 183,  64 }, { 163,  64 }, { 143,  64 }, { 122,  64 }
-    { { 4 | ( 5 << 4) }, { 102, 64 }, 1}, \
+}, {
-    { { 4 | ( 4 << 4) }, {  81, 64 }, 1}, \
-    { { 4 | ( 3 << 4) }, {  61, 64 }, 1}, \
-    { { 4 | ( 2 << 4) }, {  41, 64 }, 1}, \
-    { { 4 | ( 1 << 4) }, {  20, 64 }, 1}, \
-    { { 4 | ( 0 << 4) }, {   0, 64 }, 1}
-#define RGB_RIGHT_HAND    { { 0 | (11 << 4) }, { 224,  0 }, 1}, \
-    { { 0 | (10 << 4) }, { 204,  0 }, 4}, \
-    { { 0 | ( 9 << 4) }, { 183,  0 }, 4}, \
-    { { 0 | ( 8 << 4) }, { 163,  0 }, 4}, \
-    { { 0 | ( 7 << 4) }, { 143,  0 }, 4}, \
-    { { 0 | ( 6 << 4) }, { 122,  0 }, 4}, \
-    { { 1 | (11 << 4) }, { 224, 16 }, 1}, \
-    { { 1 | (10 << 4) }, { 204, 16 }, 4}, \
-    { { 1 | ( 9 << 4) }, { 183, 16 }, 4}, \
-    { { 1 | ( 8 << 4) }, { 163, 16 }, 4}, \
-    { { 1 | ( 7 << 4) }, { 143, 16 }, 4}, \
-    { { 1 | ( 6 << 4) }, { 122, 16 }, 4}, \
-    { { 2 | (11 << 4) }, { 224, 32 }, 1}, \
-    { { 2 | (10 << 4) }, { 204, 32 }, 4}, \
-    { { 2 | ( 9 << 4) }, { 183, 32 }, 4}, \
-    { { 2 | ( 8 << 4) }, { 163, 32 }, 4}, \
-    { { 2 | ( 7 << 4) }, { 143, 32 }, 4}, \
-    { { 2 | ( 6 << 4) }, { 122, 32 }, 4}, \
-    { { 3 | (11 << 4) }, { 224, 48 }, 1}, \
-    { { 3 | (10 << 4) }, { 204, 48 }, 4}, \
-    { { 3 | ( 9 << 4) }, { 183, 48 }, 4}, \
-    { { 3 | ( 8 << 4) }, { 163, 48 }, 4}, \
-    { { 3 | ( 7 << 4) }, { 143, 48 }, 4}, \
-    { { 3 | ( 6 << 4) }, { 122, 48 }, 4}, \
-    { { 4 | (11 << 4) }, { 224, 64 }, 1}, \
-    { { 4 | (10 << 4) }, { 204, 64 }, 1}, \
-    { { 4 | ( 9 << 4) }, { 183, 64 }, 1}, \
-    { { 4 | ( 8 << 4) }, { 163, 64 }, 1}, \
-    { { 4 | ( 7 << 4) }, { 143, 64 }, 1}, \
-    { { 4 | ( 6 << 4) }, { 122, 64 }, 1}
-rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
 // Left Hand
-RGB_LEFT_HAND
+    4, 4, 4, 4, 4, 1,
+    4, 4, 4, 4, 4, 1,
+    4, 4, 4, 4, 4, 1,
+    4, 4, 4, 4, 4, 1,
+    1, 1, 1, 1, 1, 1,
 // Right Hand
-//RGB_RIGHT_HAND
+    4, 4, 4, 4, 4, 4,
-};
+    1, 4, 4, 4, 4, 4,
+    1, 4, 4, 4, 4, 4,
+    1, 4, 4, 4, 4, 4,
+    1, 1, 1, 1, 1, 1
+} };
 #endif
diff --git a/keyboards/rotr/rules.mk b/keyboards/rotr/rules.mk
index 38e08de7a..6f93f044e 100644
--- a/keyboards/rotr/rules.mk
+++ b/keyboards/rotr/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/sam/sg81m/rules.mk b/keyboards/sam/sg81m/rules.mk
index 9b9aa5d96..b7b60cb1f 100644
--- a/keyboards/sam/sg81m/rules.mk
+++ b/keyboards/sam/sg81m/rules.mk
@@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/sck/neiso/rules.mk b/keyboards/sck/neiso/rules.mk
index 6d27e3032..8b5cc72ff 100644
--- a/keyboards/sck/neiso/rules.mk
+++ b/keyboards/sck/neiso/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = no       # Mouse keys
 EXTRAKEY_ENABLE = no       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
diff --git a/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/rules.mk b/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/rules.mk
index 1bcd7ea7f..95d084dff 100644
--- a/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/rules.mk
+++ b/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/rules.mk
@@ -2,7 +2,7 @@
 #   change to "no" to disable the options, or define them in the Makefile in 
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = yes        # Console for debug(+400)
diff --git a/keyboards/sentraq/s65_plus/rules.mk b/keyboards/sentraq/s65_plus/rules.mk
index 8424d60e4..c1fb6cfd2 100644
--- a/keyboards/sentraq/s65_plus/rules.mk
+++ b/keyboards/sentraq/s65_plus/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = no        # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
diff --git a/keyboards/shambles/rules.mk b/keyboards/shambles/rules.mk
index 890de1ffe..e6af5d3ab 100644
--- a/keyboards/shambles/rules.mk
+++ b/keyboards/shambles/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/smk60/rules.mk b/keyboards/smk60/rules.mk
index ce0e621c3..eee57dbba 100644
--- a/keyboards/smk60/rules.mk
+++ b/keyboards/smk60/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = no        # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/southpole/rules.mk b/keyboards/southpole/rules.mk
index f1bf7c8fd..25a0059d9 100644
--- a/keyboards/southpole/rules.mk
+++ b/keyboards/southpole/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = halfkay
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = no     # Console for debug
diff --git a/keyboards/sowbug/68keys/rules.mk b/keyboards/sowbug/68keys/rules.mk
index 414140c5e..043949124 100644
--- a/keyboards/sowbug/68keys/rules.mk
+++ b/keyboards/sowbug/68keys/rules.mk
@@ -12,7 +12,7 @@ DFU_SUFFIX_ARGS = -v 1eaf -p 0003
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes     # Mouse keys
 EXTRAKEY_ENABLE = yes     # Audio control and System control
 CONSOLE_ENABLE = no
diff --git a/keyboards/sowbug/ansi_tkl/rules.mk b/keyboards/sowbug/ansi_tkl/rules.mk
index 414140c5e..043949124 100644
--- a/keyboards/sowbug/ansi_tkl/rules.mk
+++ b/keyboards/sowbug/ansi_tkl/rules.mk
@@ -12,7 +12,7 @@ DFU_SUFFIX_ARGS = -v 1eaf -p 0003
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes     # Mouse keys
 EXTRAKEY_ENABLE = yes     # Audio control and System control
 CONSOLE_ENABLE = no
diff --git a/keyboards/spaceman/pancake/feather/rules.mk b/keyboards/spaceman/pancake/feather/rules.mk
index f9f172695..fb77e328e 100644
--- a/keyboards/spaceman/pancake/feather/rules.mk
+++ b/keyboards/spaceman/pancake/feather/rules.mk
@@ -18,7 +18,7 @@ BOOTLOADER = caterina
 #   comment out to disable the options.
 #
 BLUETOOTH = AdafruitBLE
-BOOTMAGIC_ENABLE  = yes # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE  = full        # Virtual DIP switch configuration
 MOUSEKEY_ENABLE  = no   # Mouse keys
 EXTRAKEY_ENABLE  = yes  # Audio control and System control
 CONSOLE_ENABLE  = yes   # Console for debug
diff --git a/keyboards/spaceman/pancake/promicro/rules.mk b/keyboards/spaceman/pancake/promicro/rules.mk
index 407ae090f..7287f3a0d 100644
--- a/keyboards/spaceman/pancake/promicro/rules.mk
+++ b/keyboards/spaceman/pancake/promicro/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE  = yes # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE  = full        # Virtual DIP switch configuration
 MOUSEKEY_ENABLE  = no   # Mouse keys
 EXTRAKEY_ENABLE  = yes  # Audio control and System control
 CONSOLE_ENABLE  = yes   # Console for debug
diff --git a/keyboards/splitish/rules.mk b/keyboards/splitish/rules.mk
index 4cba00bcc..7764619a6 100644
--- a/keyboards/splitish/rules.mk
+++ b/keyboards/splitish/rules.mk
@@ -11,7 +11,7 @@ MCU = atmega32u4
 #   ATmega328P   USBasp
 BOOTLOADER = caterina
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/splitreus62/rules.mk b/keyboards/splitreus62/rules.mk
index bc2b6a115..ce1ec3b87 100644
--- a/keyboards/splitreus62/rules.mk
+++ b/keyboards/splitreus62/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/sx60/rules.mk b/keyboards/sx60/rules.mk
index 3fa616a27..6443ca6a4 100755
--- a/keyboards/sx60/rules.mk
+++ b/keyboards/sx60/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = no     # Console for debug
diff --git a/keyboards/technika/rules.mk b/keyboards/technika/rules.mk
index 683d7f148..a548dbe9c 100644
--- a/keyboards/technika/rules.mk
+++ b/keyboards/technika/rules.mk
@@ -4,7 +4,7 @@ MCU = STM32F072
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
diff --git a/keyboards/telophase/rules.mk b/keyboards/telophase/rules.mk
index 65cac9364..614d90918 100644
--- a/keyboards/telophase/rules.mk
+++ b/keyboards/telophase/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   comment out to disable the options.
 #
-#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+#BOOTMAGIC_ENABLE = full        # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug
diff --git a/keyboards/tenki/rules.mk b/keyboards/tenki/rules.mk
index 4c47d369b..e96881cc0 100644
--- a/keyboards/tenki/rules.mk
+++ b/keyboards/tenki/rules.mk
@@ -13,7 +13,7 @@ BOOTLOADER = caterina
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full  # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = no     # Console for debug
diff --git a/keyboards/terrazzo/rules.mk b/keyboards/terrazzo/rules.mk
index 7a08fb769..843dbb88d 100644
--- a/keyboards/terrazzo/rules.mk
+++ b/keyboards/terrazzo/rules.mk
@@ -16,7 +16,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = no   # Mouse keys
 EXTRAKEY_ENABLE = yes  # Audio control and System control
 CONSOLE_ENABLE = no    # Console for debug
diff --git a/keyboards/terrazzo/terrazzo.c b/keyboards/terrazzo/terrazzo.c
index f079ded4d..1319b05e7 100644
--- a/keyboards/terrazzo/terrazzo.c
+++ b/keyboards/terrazzo/terrazzo.c
@@ -17,7 +17,6 @@
 #include "terrazzo.h"
 #ifdef LED_MATRIX_ENABLE
-    #include "is31fl3731-simple.h"
    #include <math.h>
    #include "print.h"
    #include "quantum.h"
@@ -59,7 +58,7 @@ uint8_t terrazzo_effect = 1;
 void terrazzo_set_pixel(uint8_t x, uint8_t y, uint8_t value) {
    uint8_t target = y * LED_MATRIX_COLS + x;
    if (target < DRIVER_LED_TOTAL && target >= 0) {
-      led_matrix_set_index_value(y * LED_MATRIX_COLS + x, value);
+      led_matrix_set_value(y * LED_MATRIX_COLS + x, value);
    }
 }
@@ -113,7 +112,7 @@ void terrazzo_mode_off(void) {
 void terrazzo_render(void) {
    switch(terrazzo_effect) {
        case TERRAZZO_NONE:
-            led_matrix_set_index_value_all(0);
+            led_matrix_set_value_all(0);
            break;
        #define TERRAZZO_EFFECT(name, ...)              \
            case TERRAZZO_EFFECT_##name:                \
diff --git a/keyboards/terrazzo/terrazzo_effects/dino.h b/keyboards/terrazzo/terrazzo_effects/dino.h
index 747ef6178..18c629f41 100644
--- a/keyboards/terrazzo/terrazzo_effects/dino.h
+++ b/keyboards/terrazzo/terrazzo_effects/dino.h
@@ -148,7 +148,7 @@ static uint8_t dino_bg[10][42] = {
 };
 void DINO(uint8_t i, bool dir) {
-    led_matrix_set_index_value_all(0);
+    led_matrix_set_value_all(0);
    if (dir) {
        terrazzo_draw_at(0, 7, 7, 8, dino_frames[i % 2]);
    } else {
diff --git a/keyboards/terrazzo/terrazzo_effects/dot.h b/keyboards/terrazzo/terrazzo_effects/dot.h
index e8eb8e0fc..07c4621c2 100644
--- a/keyboards/terrazzo/terrazzo_effects/dot.h
+++ b/keyboards/terrazzo/terrazzo_effects/dot.h
@@ -19,8 +19,8 @@ TERRAZZO_EFFECT(DOT)
 #   ifdef TERRAZZO_EFFECT_IMPLS
 // Animation for debugging. Lights one pixel according to animation index
 void DOT(uint8_t i, bool dir) {
-    led_matrix_set_index_value_all(0);
+    led_matrix_set_value_all(0);
-    led_matrix_set_index_value(i, 10);
+    led_matrix_set_value(i, 10);
 }
 #   endif
diff --git a/keyboards/terrazzo/terrazzo_effects/heart.h b/keyboards/terrazzo/terrazzo_effects/heart.h
index bdcd2d7b9..bfbd6acc3 100644
--- a/keyboards/terrazzo/terrazzo_effects/heart.h
+++ b/keyboards/terrazzo/terrazzo_effects/heart.h
@@ -91,7 +91,7 @@ static uint8_t heart_frames[4][105] = {
 void HEART(uint8_t i, bool dir) {
-    led_matrix_set_index_value_all(0);
+    led_matrix_set_value_all(0);
    terrazzo_draw_at(0, 0, 7, 15, heart_frames[i % 4]);
 }
diff --git a/keyboards/terrazzo/terrazzo_effects/outrun.h b/keyboards/terrazzo/terrazzo_effects/outrun.h
index b4455ef49..127e714b2 100644
--- a/keyboards/terrazzo/terrazzo_effects/outrun.h
+++ b/keyboards/terrazzo/terrazzo_effects/outrun.h
@@ -89,7 +89,7 @@ bool last_dir;
 uint8_t change_index = 0;
 void OUTRUN(uint8_t i, bool dir) {
-    led_matrix_set_index_value_all(0);
+    led_matrix_set_value_all(0);
    
    if(dir != last_dir) {
       change_index = i;
diff --git a/keyboards/terrazzo/terrazzo_effects/pac_dude.h b/keyboards/terrazzo/terrazzo_effects/pac_dude.h
index aa4fc9923..aaf0c5545 100644
--- a/keyboards/terrazzo/terrazzo_effects/pac_dude.h
+++ b/keyboards/terrazzo/terrazzo_effects/pac_dude.h
@@ -51,7 +51,7 @@ static uint8_t pac_ghost[20] = {
 void PAC_DUDE(uint8_t i, bool dir) {
-    led_matrix_set_index_value_all(0);
+    led_matrix_set_value_all(0);
    if (dir) {
        terrazzo_draw_at(1, 4, 5, 5, pac_frames[i % 2]);
        terrazzo_set_pixel(3, 0 + i % 3, 5);
diff --git a/keyboards/terrazzo/terrazzo_effects/wpm_chart.h b/keyboards/terrazzo/terrazzo_effects/wpm_chart.h
index 5c66bc39a..b80b604d2 100644
--- a/keyboards/terrazzo/terrazzo_effects/wpm_chart.h
+++ b/keyboards/terrazzo/terrazzo_effects/wpm_chart.h
@@ -85,14 +85,14 @@ static uint8_t number_3_4[10][12] = {
 uint8_t wpm_levels[10] = {20, 9, 8, 7, 6, 5, 4, 3, 2, 1};
 void WPM_CHART(uint8_t i, bool dir) {
-    led_matrix_set_index_value_all(0);
+    led_matrix_set_value_all(0);
    uint8_t c_wpm = get_current_wpm();
    uint8_t half_wpm = floor(c_wpm / 2);
    uint8_t max_rows = 10;
    /* Turn on LED for current WPM. Each pixel is 2 wpm. */
    for (int k = 0; k < half_wpm && k < 70; k++) {
        uint8_t current_row = (int)floor(k / 7);
-        led_matrix_set_index_value(k, wpm_levels[max_rows - current_row]);
+        led_matrix_set_value(k, wpm_levels[max_rows - current_row]);
    };
    uint8_t d1 = (int)floor(c_wpm / 10);
    /* There is only room to print 2 digits. If the WPM is greater than
diff --git a/keyboards/thevankeyboards/minivan/rules.mk b/keyboards/thevankeyboards/minivan/rules.mk
index d9a34f38b..4e1320815 100644
--- a/keyboards/thevankeyboards/minivan/rules.mk
+++ b/keyboards/thevankeyboards/minivan/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/thevankeyboards/roadkit/rules.mk b/keyboards/thevankeyboards/roadkit/rules.mk
index e8ab28cb5..760337e18 100644
--- a/keyboards/thevankeyboards/roadkit/rules.mk
+++ b/keyboards/thevankeyboards/roadkit/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/ua62/rules.mk b/keyboards/ua62/rules.mk
index 78fed4633..b28e458b7 100644
--- a/keyboards/ua62/rules.mk
+++ b/keyboards/ua62/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes       # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full       # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
diff --git a/keyboards/ut472/rules.mk b/keyboards/ut472/rules.mk
index caf4c1c87..a100637b4 100644
--- a/keyboards/ut472/rules.mk
+++ b/keyboards/ut472/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/vinta/rules.mk b/keyboards/vinta/rules.mk
index 736509689..d35a64197 100644
--- a/keyboards/vinta/rules.mk
+++ b/keyboards/vinta/rules.mk
@@ -5,7 +5,7 @@ MCU = STM32F042
 #   comment out to disable the options.
 #
 BACKLIGHT_ENABLE = no
-BOOTMAGIC_ENABLE = yes                          # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full                         # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes                           # Mouse keys
 EXTRAKEY_ENABLE = yes                           # Audio control and System control
 CONSOLE_ENABLE = no                                     # Console for debug
diff --git a/keyboards/vision_division/rules.mk b/keyboards/vision_division/rules.mk
index 789ff97c7..b92464285 100644
--- a/keyboards/vision_division/rules.mk
+++ b/keyboards/vision_division/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = halfkay
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
diff --git a/keyboards/walletburner/cajal/rules.mk b/keyboards/walletburner/cajal/rules.mk
index 0bb221f12..173b00fee 100644
--- a/keyboards/walletburner/cajal/rules.mk
+++ b/keyboards/walletburner/cajal/rules.mk
@@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full  # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = no     # Console for debug
diff --git a/keyboards/westfoxtrot/prophet/config.h b/keyboards/westfoxtrot/prophet/config.h
index 4f447e4ca..0f2ddc1dc 100644
--- a/keyboards/westfoxtrot/prophet/config.h
+++ b/keyboards/westfoxtrot/prophet/config.h
@@ -30,3 +30,5 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
+#define SLEEP_LED_GPT_DRIVER GPTD1
diff --git a/keyboards/westfoxtrot/prophet/halconf.h b/keyboards/westfoxtrot/prophet/halconf.h
new file mode 100644
index 000000000..cbfd1307f
--- /dev/null
+++ b/keyboards/westfoxtrot/prophet/halconf.h
@@ -0,0 +1,27 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/projectkb/alice/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+#pragma once
+#define HAL_USE_GPT TRUE
+#include_next <halconf.h>
diff --git a/keyboards/westfoxtrot/prophet/mcuconf.h b/keyboards/westfoxtrot/prophet/mcuconf.h
index 2665f9c9e..550141af6 100644
--- a/keyboards/westfoxtrot/prophet/mcuconf.h
+++ b/keyboards/westfoxtrot/prophet/mcuconf.h
@@ -23,6 +23,5 @@
 #include_next <mcuconf.h>
-#undef STM32_PWM_USE_TIM3
+#undef STM32_GPT_USE_TIM1
-#define STM32_PWM_USE_TIM3 TRUE
+#define STM32_GPT_USE_TIM1 TRUE
diff --git a/keyboards/whitefox/rules.mk b/keyboards/whitefox/rules.mk
index 429795c23..771804369 100644
--- a/keyboards/whitefox/rules.mk
+++ b/keyboards/whitefox/rules.mk
@@ -16,7 +16,7 @@ BOARD = IC_TEENSY_3_1
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/winkeyless/bminiex/rules.mk b/keyboards/winkeyless/bminiex/rules.mk
index f44b7fe85..fa7336cd8 100644
--- a/keyboards/winkeyless/bminiex/rules.mk
+++ b/keyboards/winkeyless/bminiex/rules.mk
@@ -12,7 +12,7 @@ MCU = atmega32a
 BOOTLOADER = bootloadHID
 # build options
-BOOTMAGIC_ENABLE = yes
+BOOTMAGIC_ENABLE = full
 MOUSEKEY_ENABLE = yes
 EXTRAKEY_ENABLE = yes
 CONSOLE_ENABLE = no
diff --git a/keyboards/wsk/houndstooth/rules.mk b/keyboards/wsk/houndstooth/rules.mk
index c93932238..b1bdf25e3 100644
--- a/keyboards/wsk/houndstooth/rules.mk
+++ b/keyboards/wsk/houndstooth/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes  # Mouse keys
 EXTRAKEY_ENABLE = yes  # Audio control and System control
 CONSOLE_ENABLE = no    # Console for debug
diff --git a/keyboards/wsk/kodachi50/rules.mk b/keyboards/wsk/kodachi50/rules.mk
index 0f9fe8d42..9de501227 100644
--- a/keyboards/wsk/kodachi50/rules.mk
+++ b/keyboards/wsk/kodachi50/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full  # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = no     # Console for debug
diff --git a/keyboards/wsk/pain27/rules.mk b/keyboards/wsk/pain27/rules.mk
index 8b5c7c51b..e939ba823 100644
--- a/keyboards/wsk/pain27/rules.mk
+++ b/keyboards/wsk/pain27/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes  # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes  # Audio control and System control(+450)
 CONSOLE_ENABLE = no    # Console for debug(+400)
diff --git a/keyboards/wsk/sl40/rules.mk b/keyboards/wsk/sl40/rules.mk
index 0f9fe8d42..9de501227 100644
--- a/keyboards/wsk/sl40/rules.mk
+++ b/keyboards/wsk/sl40/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full  # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = no     # Console for debug
diff --git a/keyboards/xd60/readme.md b/keyboards/xd60/readme.md
index 428041482..f4926d01a 100644
--- a/keyboards/xd60/readme.md
+++ b/keyboards/xd60/readme.md
@@ -7,6 +7,7 @@ Compact 60% with arrows.
 * Keyboard Maintainer: QMK Community
 * Hardware Supported: XD60 PCB rev2 & rev3
 * Hardware Availability: [Drop.com](https://www.drop.com/buy/xd60-xd64-custom-mechanical-keyboard-kit?mode=guest_open), [KPRepublic on AliExpress](https://www.aliexpress.com/item/32814945677.html)
+* Schematic Availability: Public Domain [on EasyEDA](https://easyeda.com/langzisanshao/xd60)
 Make example for this keyboard (after setting up your build environment):
diff --git a/keyboards/xd60/rev2/rules.mk b/keyboards/xd60/rev2/rules.mk
index 56a01b3c5..a06ac2e2c 100644
--- a/keyboards/xd60/rev2/rules.mk
+++ b/keyboards/xd60/rev2/rules.mk
@@ -12,7 +12,7 @@ MCU = atmega32u4
 BOOTLOADER = atmel-dfu
 # Build Options
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/xd60/rev3/rules.mk b/keyboards/xd60/rev3/rules.mk
index 56a01b3c5..a06ac2e2c 100644
--- a/keyboards/xd60/rev3/rules.mk
+++ b/keyboards/xd60/rev3/rules.mk
@@ -12,7 +12,7 @@ MCU = atmega32u4
 BOOTLOADER = atmel-dfu
 # Build Options
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/xd75/keymaps/4sstylz/rules.mk b/keyboards/xd75/keymaps/4sstylz/rules.mk
index ffb70f0a9..0a9e12512 100644
--- a/keyboards/xd75/keymaps/4sstylz/rules.mk
+++ b/keyboards/xd75/keymaps/4sstylz/rules.mk
@@ -17,7 +17,7 @@ COMBO_ENABLE     = yes # Enable combo for special function when using multiple k
 BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE  = yes # Enable WS2812 RGB underlight.
-BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE  = no  # Mouse keys
 EXTRAKEY_ENABLE  = yes # Audio control and System control
 CONSOLE_ENABLE   = no  # Console for debug
diff --git a/keyboards/xd75/keymaps/fabian/rules.mk b/keyboards/xd75/keymaps/fabian/rules.mk
index 8831f2d62..39b003dee 100644
--- a/keyboards/xd75/keymaps/fabian/rules.mk
+++ b/keyboards/xd75/keymaps/fabian/rules.mk
@@ -18,7 +18,7 @@
 #   change to "no" to disable the options, or define them in the Makefile in 
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = yes       # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = full       # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = no         # Console for debug(+400)
diff --git a/keyboards/xd75/keymaps/revok75/rules.mk b/keyboards/xd75/keymaps/revok75/rules.mk
index 7472e8c64..21ba8f74b 100644
--- a/keyboards/xd75/keymaps/revok75/rules.mk
+++ b/keyboards/xd75/keymaps/revok75/rules.mk
@@ -13,6 +13,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-BOOTMAGIC_ENABLE = yes
+BOOTMAGIC_ENABLE = full
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
diff --git a/keyboards/xd87/rules.mk b/keyboards/xd87/rules.mk
index abd7a41bb..6d5d8b6da 100644
--- a/keyboards/xd87/rules.mk
+++ b/keyboards/xd87/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = no        # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
diff --git a/keyboards/ymd75/rev1/rules.mk b/keyboards/ymd75/rev1/rules.mk
index b77457b5a..2499c1c5e 100644
--- a/keyboards/ymd75/rev1/rules.mk
+++ b/keyboards/ymd75/rev1/rules.mk
@@ -12,7 +12,7 @@ MCU = atmega32a
 BOOTLOADER = bootloadHID
 # build options
-BOOTMAGIC_ENABLE = yes
+BOOTMAGIC_ENABLE = full
 MOUSEKEY_ENABLE = no
 EXTRAKEY_ENABLE = yes
 CONSOLE_ENABLE = no
diff --git a/keyboards/ymd75/rev2/rules.mk b/keyboards/ymd75/rev2/rules.mk
index b77457b5a..2499c1c5e 100644
--- a/keyboards/ymd75/rev2/rules.mk
+++ b/keyboards/ymd75/rev2/rules.mk
@@ -12,7 +12,7 @@ MCU = atmega32a
 BOOTLOADER = bootloadHID
 # build options
-BOOTMAGIC_ENABLE = yes
+BOOTMAGIC_ENABLE = full
 MOUSEKEY_ENABLE = no
 EXTRAKEY_ENABLE = yes
 CONSOLE_ENABLE = no
diff --git a/keyboards/ymdk/sp64/rules.mk b/keyboards/ymdk/sp64/rules.mk
index 91dc8ab74..8db57de3b 100644
--- a/keyboards/ymdk/sp64/rules.mk
+++ b/keyboards/ymdk/sp64/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = bootloadHID
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = no        # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no        # Console for debug
diff --git a/keyboards/ymdk/ymd67/rules.mk b/keyboards/ymdk/ymd67/rules.mk
index 891c7739a..2ffe8fcab 100644
--- a/keyboards/ymdk/ymd67/rules.mk
+++ b/keyboards/ymdk/ymd67/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = no   # Mouse keys
 EXTRAKEY_ENABLE = yes  # Audio control and System control
 CONSOLE_ENABLE = no    # Console for debug
diff --git a/keyboards/z150_bh/rules.mk b/keyboards/z150_bh/rules.mk
index 739bea393..1843f1ba6 100644
--- a/keyboards/z150_bh/rules.mk
+++ b/keyboards/z150_bh/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = halfkay
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = no     # Console for debug
diff --git a/keyboards/zlant/rules.mk b/keyboards/zlant/rules.mk
index 5daad3db2..03d57e23f 100755
--- a/keyboards/zlant/rules.mk
+++ b/keyboards/zlant/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = no     # Console for debug
diff --git a/layouts/community/ergodox/bocaj/rules.mk b/layouts/community/ergodox/bocaj/rules.mk
index 88eaf39f8..c6a306fda 100644
--- a/layouts/community/ergodox/bocaj/rules.mk
+++ b/layouts/community/ergodox/bocaj/rules.mk
@@ -1,4 +1,4 @@
-BOOTMAGIC_ENABLE   = yes
+BOOTMAGIC_ENABLE   = full
 TAP_DANCE_ENABLE   = no
 COMMAND_ENABLE     = no  # Commands for debug and configuration
 CONSOLE_ENABLE     = yes
diff --git a/lib/python/qmk/commands.py b/lib/python/qmk/commands.py
index d742f6756..510abffdc 100644
--- a/lib/python/qmk/commands.py
+++ b/lib/python/qmk/commands.py
@@ -181,6 +181,7 @@ def compile_configurator_json(user_keymap, bootloader=None, parallel=1, **env_va
        f'VERBOSE={verbose}',
        f'COLOR={color}',
        'SILENT=false',
+        f'QMK_BIN={"bin/qmk" if "DEPRECATED_BIN_QMK" in os.environ else "qmk"}',
    ])
    return make_command
diff --git a/lib/python/qmk/constants.py b/lib/python/qmk/constants.py
index 3ed69f3bf..33adb0a13 100644
--- a/lib/python/qmk/constants.py
+++ b/lib/python/qmk/constants.py
@@ -10,7 +10,7 @@ QMK_FIRMWARE = Path.cwd()
 MAX_KEYBOARD_SUBFOLDERS = 5
 # Supported processor types
-CHIBIOS_PROCESSORS = 'cortex-m0', 'cortex-m0plus', 'cortex-m3', 'cortex-m4', 'MKL26Z64', 'MK20DX128', 'MK20DX256', 'STM32F042', 'STM32F072', 'STM32F103', 'STM32F303', 'STM32F401', 'STM32F411', 'STM32G431', 'STM32G474'
+CHIBIOS_PROCESSORS = 'cortex-m0', 'cortex-m0plus', 'cortex-m3', 'cortex-m4', 'MKL26Z64', 'MK20DX128', 'MK20DX256', 'MK66F18', 'STM32F042', 'STM32F072', 'STM32F103', 'STM32F303', 'STM32F401', 'STM32F411', 'STM32F446', 'STM32G431', 'STM32G474'
 LUFA_PROCESSORS = 'at90usb162', 'atmega16u2', 'atmega32u2', 'atmega16u4', 'atmega32u4', 'at90usb646', 'at90usb647', 'at90usb1286', 'at90usb1287', None
 VUSB_PROCESSORS = 'atmega32a', 'atmega328p', 'atmega328', 'attiny85'
diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py
index c57d2b7fc..0a87f60e0 100644
--- a/lib/python/qmk/tests/test_cli_commands.py
+++ b/lib/python/qmk/tests/test_cli_commands.py
@@ -8,7 +8,7 @@ is_windows = 'windows' in platform.platform().lower()
 def check_subcommand(command, *args):
-    cmd = ['bin/qmk', command, *args]
+    cmd = ['qmk', command, *args]
    result = run(cmd, stdout=PIPE, stderr=STDOUT, universal_newlines=True)
    return result
@@ -17,7 +17,7 @@ def check_subcommand_stdin(file_to_read, command, *args):
    """Pipe content of a file to a command and return output.
    """
    with open(file_to_read, encoding='utf-8') as my_file:
-        cmd = ['bin/qmk', command, *args]
+        cmd = ['qmk', command, *args]
        result = run(cmd, stdin=my_file, stdout=PIPE, stderr=STDOUT, universal_newlines=True)
    return result
diff --git a/message.mk b/message.mk
index 3240c041b..c3f391919 100644
--- a/message.mk
+++ b/message.mk
@@ -47,10 +47,12 @@ MSG_SIZE_AFTER = Size after:
 MSG_COFF = Converting to AVR COFF:
 MSG_EXTENDED_COFF = Converting to AVR Extended COFF:
 MSG_FLASH = Creating load file for flashing:
+MSG_UF2 = Creating UF2 file for deployment:
 MSG_EEPROM = Creating load file for EEPROM:
 MSG_BIN = Creating binary load file for flashing:
 MSG_EXTENDED_LISTING = Creating Extended Listing:
 MSG_SYMBOL_TABLE = Creating Symbol Table:
+MSG_EXECUTING = Executing:
 MSG_LINKING = Linking:
 MSG_COMPILING = Compiling:
 MSG_COMPILING_CXX = Compiling:
diff --git a/platforms/chibios/BLACKPILL_STM32_F411/ld/STM32F411xC_tinyuf2.ld b/platforms/chibios/BLACKPILL_STM32_F411/ld/STM32F411xC_tinyuf2.ld
new file mode 100644
index 000000000..82253d3de
--- /dev/null
+++ b/platforms/chibios/BLACKPILL_STM32_F411/ld/STM32F411xC_tinyuf2.ld
@@ -0,0 +1,89 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 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.
+    You may obtain a copy of the License at
+        http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+/*
+ * STM32F411xC memory setup.
+ */
+MEMORY
+{
+    flash0 (rx) : org = 0x08000000 + 64k, len = 256k - 64k /* tinyuf2 bootloader requires app to be located at 64k offset for this MCU */
+    flash1 (rx) : org = 0x00000000, len = 0
+    flash2 (rx) : org = 0x00000000, len = 0
+    flash3 (rx) : org = 0x00000000, len = 0
+    flash4 (rx) : org = 0x00000000, len = 0
+    flash5 (rx) : org = 0x00000000, len = 0
+    flash6 (rx) : org = 0x00000000, len = 0
+    flash7 (rx) : org = 0x00000000, len = 0
+    ram0   (wx) : org = 0x20000000, len = 128k
+    ram1   (wx) : org = 0x00000000, len = 0
+    ram2   (wx) : org = 0x00000000, len = 0
+    ram3   (wx) : org = 0x00000000, len = 0
+    ram4   (wx) : org = 0x00000000, len = 0
+    ram5   (wx) : org = 0x00000000, len = 0
+    ram6   (wx) : org = 0x00000000, len = 0
+    ram7   (wx) : org = 0x00000000, len = 0
+}
+/* For each data/text section two region are defined, a virtual region
+   and a load region (_LMA suffix).*/
+/* Flash region to be used for exception vectors.*/
+REGION_ALIAS("VECTORS_FLASH", flash0);
+REGION_ALIAS("VECTORS_FLASH_LMA", flash0);
+/* Flash region to be used for constructors and destructors.*/
+REGION_ALIAS("XTORS_FLASH", flash0);
+REGION_ALIAS("XTORS_FLASH_LMA", flash0);
+/* Flash region to be used for code text.*/
+REGION_ALIAS("TEXT_FLASH", flash0);
+REGION_ALIAS("TEXT_FLASH_LMA", flash0);
+/* Flash region to be used for read only data.*/
+REGION_ALIAS("RODATA_FLASH", flash0);
+REGION_ALIAS("RODATA_FLASH_LMA", flash0);
+/* Flash region to be used for various.*/
+REGION_ALIAS("VARIOUS_FLASH", flash0);
+REGION_ALIAS("VARIOUS_FLASH_LMA", flash0);
+/* Flash region to be used for RAM(n) initialization data.*/
+REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0);
+/* RAM region to be used for Main stack. This stack accommodates the processing
+   of all exceptions and interrupts.*/
+REGION_ALIAS("MAIN_STACK_RAM", ram0);
+/* RAM region to be used for the process stack. This is the stack used by
+   the main() function.*/
+REGION_ALIAS("PROCESS_STACK_RAM", ram0);
+/* RAM region to be used for data segment.*/
+REGION_ALIAS("DATA_RAM", ram0);
+REGION_ALIAS("DATA_RAM_LMA", flash0);
+/* RAM region to be used for BSS segment.*/
+REGION_ALIAS("BSS_RAM", ram0);
+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+/* Generic rules inclusion.*/
+INCLUDE rules.ld
+/* TinyUF2 bootloader reset support */
+_board_dfu_dbl_tap = ORIGIN(ram0) + 64k - 4; /* this is based off the linker file for tinyuf2 */
diff --git a/platforms/chibios/BLACKPILL_STM32_F411/ld/STM32F411xE_tinyuf2.ld b/platforms/chibios/BLACKPILL_STM32_F411/ld/STM32F411xE_tinyuf2.ld
new file mode 100644
index 000000000..1656c67bf
--- /dev/null
+++ b/platforms/chibios/BLACKPILL_STM32_F411/ld/STM32F411xE_tinyuf2.ld
@@ -0,0 +1,89 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 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.
+    You may obtain a copy of the License at
+        http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+/*
+ * STM32F411xE memory setup.
+ */
+MEMORY
+{
+    flash0 (rx) : org = 0x08000000 + 64k, len = 512k - 64k /* tinyuf2 bootloader requires app to be located at 64k offset for this MCU */
+    flash1 (rx) : org = 0x00000000, len = 0
+    flash2 (rx) : org = 0x00000000, len = 0
+    flash3 (rx) : org = 0x00000000, len = 0
+    flash4 (rx) : org = 0x00000000, len = 0
+    flash5 (rx) : org = 0x00000000, len = 0
+    flash6 (rx) : org = 0x00000000, len = 0
+    flash7 (rx) : org = 0x00000000, len = 0
+    ram0   (wx) : org = 0x20000000, len = 128k
+    ram1   (wx) : org = 0x00000000, len = 0
+    ram2   (wx) : org = 0x00000000, len = 0
+    ram3   (wx) : org = 0x00000000, len = 0
+    ram4   (wx) : org = 0x00000000, len = 0
+    ram5   (wx) : org = 0x00000000, len = 0
+    ram6   (wx) : org = 0x00000000, len = 0
+    ram7   (wx) : org = 0x00000000, len = 0
+}
+/* For each data/text section two region are defined, a virtual region
+   and a load region (_LMA suffix).*/
+/* Flash region to be used for exception vectors.*/
+REGION_ALIAS("VECTORS_FLASH", flash0);
+REGION_ALIAS("VECTORS_FLASH_LMA", flash0);
+/* Flash region to be used for constructors and destructors.*/
+REGION_ALIAS("XTORS_FLASH", flash0);
+REGION_ALIAS("XTORS_FLASH_LMA", flash0);
+/* Flash region to be used for code text.*/
+REGION_ALIAS("TEXT_FLASH", flash0);
+REGION_ALIAS("TEXT_FLASH_LMA", flash0);
+/* Flash region to be used for read only data.*/
+REGION_ALIAS("RODATA_FLASH", flash0);
+REGION_ALIAS("RODATA_FLASH_LMA", flash0);
+/* Flash region to be used for various.*/
+REGION_ALIAS("VARIOUS_FLASH", flash0);
+REGION_ALIAS("VARIOUS_FLASH_LMA", flash0);
+/* Flash region to be used for RAM(n) initialization data.*/
+REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0);
+/* RAM region to be used for Main stack. This stack accommodates the processing
+   of all exceptions and interrupts.*/
+REGION_ALIAS("MAIN_STACK_RAM", ram0);
+/* RAM region to be used for the process stack. This is the stack used by
+   the main() function.*/
+REGION_ALIAS("PROCESS_STACK_RAM", ram0);
+/* RAM region to be used for data segment.*/
+REGION_ALIAS("DATA_RAM", ram0);
+REGION_ALIAS("DATA_RAM_LMA", flash0);
+/* RAM region to be used for BSS segment.*/
+REGION_ALIAS("BSS_RAM", ram0);
+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+/* Generic rules inclusion.*/
+INCLUDE rules.ld
+/* TinyUF2 bootloader reset support */
+_board_dfu_dbl_tap = ORIGIN(ram0) + 64k - 4; /* this is based off the linker file for tinyuf2 */
diff --git a/platforms/chibios/GENERIC_STM32_F446XE/board/board.mk b/platforms/chibios/GENERIC_STM32_F446XE/board/board.mk
new file mode 100644
index 000000000..57897941c
--- /dev/null
+++ b/platforms/chibios/GENERIC_STM32_F446XE/board/board.mk
@@ -0,0 +1,9 @@
+# List of all the board related files.
+BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_F446RE/board.c
+# Required include directories
+BOARDINC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_F446RE
+# Shared variables
+ALLCSRC += $(BOARDSRC)
+ALLINC  += $(BOARDINC)
diff --git a/platforms/chibios/GENERIC_STM32_F446XE/configs/board.h b/platforms/chibios/GENERIC_STM32_F446XE/configs/board.h
new file mode 100644
index 000000000..80dfcffa9
--- /dev/null
+++ b/platforms/chibios/GENERIC_STM32_F446XE/configs/board.h
@@ -0,0 +1,24 @@
+/* Copyright 2020 Nick Brassel (tzarc)
+ *
+ *  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 3 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 <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+#define STM32_HSECLK 16000000
+// The following is required to disable the pull-down on PA9, when PA9 is used for the keyboard matrix:
+#define BOARD_OTG_NOVBUSSENS
+#include_next "board.h"
+#undef STM32_HSE_BYPASS
diff --git a/platforms/chibios/GENERIC_STM32_F446XE/configs/config.h b/platforms/chibios/GENERIC_STM32_F446XE/configs/config.h
new file mode 100644
index 000000000..cc52a953e
--- /dev/null
+++ b/platforms/chibios/GENERIC_STM32_F446XE/configs/config.h
@@ -0,0 +1,23 @@
+/* Copyright 2021 Andrei Purdea
+ *
+ * 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/>.
+ */
+/* Address for jumping to bootloader on STM32 chips. */
+/* It is chip dependent, the correct number can be looked up by checking against ST's application note AN2606.
+ */
+#define STM32_BOOTLOADER_ADDRESS 0x1FFF0000
+#ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
+#    define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
+#endif
diff --git a/platforms/chibios/GENERIC_STM32_F446XE/configs/mcuconf.h b/platforms/chibios/GENERIC_STM32_F446XE/configs/mcuconf.h
new file mode 100644
index 000000000..d2de75590
--- /dev/null
+++ b/platforms/chibios/GENERIC_STM32_F446XE/configs/mcuconf.h
@@ -0,0 +1,361 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 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.
+    You may obtain a copy of the License at
+        http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+#ifndef MCUCONF_H
+#define MCUCONF_H
+/*
+ * STM32F4xx drivers configuration.
+ * The following settings override the default settings present in
+ * the various device driver implementation headers.
+ * Note that the settings for each driver only have effect if the whole
+ * driver is enabled in halconf.h.
+ *
+ * IRQ priorities:
+ * 15...0       Lowest...Highest.
+ *
+ * DMA priorities:
+ * 0...3        Lowest...Highest.
+ */
+#define STM32F4xx_MCUCONF
+/*
+ * HAL driver system settings.
+ */
+#define STM32_NO_INIT                       FALSE
+#define STM32_HSI_ENABLED                   FALSE
+#define STM32_LSI_ENABLED                   TRUE
+#define STM32_HSE_ENABLED                   TRUE
+#define STM32_LSE_ENABLED                   FALSE
+#define STM32_CLOCK48_REQUIRED              TRUE
+#define STM32_SW                            STM32_SW_PLL
+#define STM32_PLLSRC                        STM32_PLLSRC_HSE
+#define STM32_PLLM_VALUE                    8
+#define STM32_PLLN_VALUE                    180
+#define STM32_PLLP_VALUE                    2
+#define STM32_PLLQ_VALUE                    7
+#define STM32_PLLI2SN_VALUE                 192
+#define STM32_PLLI2SM_VALUE                 8
+#define STM32_PLLI2SR_VALUE                 4
+#define STM32_PLLI2SP_VALUE                 4
+#define STM32_PLLI2SQ_VALUE                 4
+#define STM32_PLLSAIN_VALUE                 192
+#define STM32_PLLSAIM_VALUE                 8
+#define STM32_PLLSAIP_VALUE                 8
+#define STM32_PLLSAIQ_VALUE                 4
+#define STM32_HPRE                          STM32_HPRE_DIV1
+#define STM32_PPRE1                         STM32_PPRE1_DIV4
+#define STM32_PPRE2                         STM32_PPRE2_DIV2
+#define STM32_RTCSEL                        STM32_RTCSEL_LSI
+#define STM32_RTCPRE_VALUE                  8
+#define STM32_MCO1SEL                       STM32_MCO1SEL_HSE
+#define STM32_MCO1PRE                       STM32_MCO1PRE_DIV1
+#define STM32_MCO2SEL                       STM32_MCO2SEL_PLLI2S
+#define STM32_MCO2PRE                       STM32_MCO2PRE_DIV1
+#define STM32_I2SSRC                        STM32_I2SSRC_PLLI2S
+#define STM32_SAI1SEL                       STM32_SAI2SEL_PLLR
+#define STM32_SAI2SEL                       STM32_SAI2SEL_PLLR
+#define STM32_CK48MSEL                      STM32_CK48MSEL_PLLALT
+#define STM32_PVD_ENABLE                    FALSE
+#define STM32_PLS                           STM32_PLS_LEV0
+#define STM32_BKPRAM_ENABLE                 FALSE
+/*
+ * IRQ system settings.
+ */
+#define STM32_IRQ_EXTI0_PRIORITY            6
+#define STM32_IRQ_EXTI1_PRIORITY            6
+#define STM32_IRQ_EXTI2_PRIORITY            6
+#define STM32_IRQ_EXTI3_PRIORITY            6
+#define STM32_IRQ_EXTI4_PRIORITY            6
+#define STM32_IRQ_EXTI5_9_PRIORITY          6
+#define STM32_IRQ_EXTI10_15_PRIORITY        6
+#define STM32_IRQ_EXTI16_PRIORITY           6
+#define STM32_IRQ_EXTI17_PRIORITY           15
+#define STM32_IRQ_EXTI18_PRIORITY           6
+#define STM32_IRQ_EXTI19_PRIORITY           6
+#define STM32_IRQ_EXTI20_PRIORITY           6
+#define STM32_IRQ_EXTI21_PRIORITY           15
+#define STM32_IRQ_EXTI22_PRIORITY           15
+/*
+ * ADC driver system settings.
+ */
+#define STM32_ADC_ADCPRE                    ADC_CCR_ADCPRE_DIV4
+#define STM32_ADC_USE_ADC1                  FALSE
+#define STM32_ADC_USE_ADC2                  FALSE
+#define STM32_ADC_USE_ADC3                  FALSE
+#define STM32_ADC_ADC1_DMA_STREAM           STM32_DMA_STREAM_ID(2, 4)
+#define STM32_ADC_ADC2_DMA_STREAM           STM32_DMA_STREAM_ID(2, 2)
+#define STM32_ADC_ADC3_DMA_STREAM           STM32_DMA_STREAM_ID(2, 1)
+#define STM32_ADC_ADC1_DMA_PRIORITY         2
+#define STM32_ADC_ADC2_DMA_PRIORITY         2
+#define STM32_ADC_ADC3_DMA_PRIORITY         2
+#define STM32_ADC_IRQ_PRIORITY              6
+#define STM32_ADC_ADC1_DMA_IRQ_PRIORITY     6
+#define STM32_ADC_ADC2_DMA_IRQ_PRIORITY     6
+#define STM32_ADC_ADC3_DMA_IRQ_PRIORITY     6
+/*
+ * CAN driver system settings.
+ */
+#define STM32_CAN_USE_CAN1                  FALSE
+#define STM32_CAN_USE_CAN2                  FALSE
+#define STM32_CAN_CAN1_IRQ_PRIORITY         11
+#define STM32_CAN_CAN2_IRQ_PRIORITY         11
+/*
+ * DAC driver system settings.
+ */
+#define STM32_DAC_DUAL_MODE                 FALSE
+#define STM32_DAC_USE_DAC1_CH1              FALSE
+#define STM32_DAC_USE_DAC1_CH2              FALSE
+#define STM32_DAC_DAC1_CH1_IRQ_PRIORITY     10
+#define STM32_DAC_DAC1_CH2_IRQ_PRIORITY     10
+#define STM32_DAC_DAC1_CH1_DMA_PRIORITY     2
+#define STM32_DAC_DAC1_CH2_DMA_PRIORITY     2
+#define STM32_DAC_DAC1_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(1, 5)
+#define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(1, 6)
+/*
+ * GPT driver system settings.
+ */
+#define STM32_GPT_USE_TIM1                  FALSE
+#define STM32_GPT_USE_TIM2                  FALSE
+#define STM32_GPT_USE_TIM3                  FALSE
+#define STM32_GPT_USE_TIM4                  FALSE
+#define STM32_GPT_USE_TIM5                  FALSE
+#define STM32_GPT_USE_TIM6                  FALSE
+#define STM32_GPT_USE_TIM7                  FALSE
+#define STM32_GPT_USE_TIM8                  FALSE
+#define STM32_GPT_USE_TIM9                  FALSE
+#define STM32_GPT_USE_TIM11                 FALSE
+#define STM32_GPT_USE_TIM12                 FALSE
+#define STM32_GPT_USE_TIM14                 FALSE
+#define STM32_GPT_TIM1_IRQ_PRIORITY         7
+#define STM32_GPT_TIM2_IRQ_PRIORITY         7
+#define STM32_GPT_TIM3_IRQ_PRIORITY         7
+#define STM32_GPT_TIM4_IRQ_PRIORITY         7
+#define STM32_GPT_TIM5_IRQ_PRIORITY         7
+#define STM32_GPT_TIM6_IRQ_PRIORITY         7
+#define STM32_GPT_TIM7_IRQ_PRIORITY         7
+#define STM32_GPT_TIM8_IRQ_PRIORITY         7
+#define STM32_GPT_TIM9_IRQ_PRIORITY         7
+#define STM32_GPT_TIM11_IRQ_PRIORITY        7
+#define STM32_GPT_TIM12_IRQ_PRIORITY        7
+#define STM32_GPT_TIM14_IRQ_PRIORITY        7
+/*
+ * I2C driver system settings.
+ */
+#define STM32_I2C_USE_I2C1                  FALSE
+#define STM32_I2C_USE_I2C2                  FALSE
+#define STM32_I2C_USE_I2C3                  FALSE
+#define STM32_I2C_BUSY_TIMEOUT              50
+#define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 0)
+#define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 6)
+#define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)
+#define STM32_I2C_I2C2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 7)
+#define STM32_I2C_I2C3_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)
+#define STM32_I2C_I2C3_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)
+#define STM32_I2C_I2C1_IRQ_PRIORITY         5
+#define STM32_I2C_I2C2_IRQ_PRIORITY         5
+#define STM32_I2C_I2C3_IRQ_PRIORITY         5
+#define STM32_I2C_I2C1_DMA_PRIORITY         3
+#define STM32_I2C_I2C2_DMA_PRIORITY         3
+#define STM32_I2C_I2C3_DMA_PRIORITY         3
+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")
+/*
+ * I2S driver system settings.
+ */
+#define STM32_I2S_USE_SPI2                  FALSE
+#define STM32_I2S_USE_SPI3                  FALSE
+#define STM32_I2S_SPI2_IRQ_PRIORITY         10
+#define STM32_I2S_SPI3_IRQ_PRIORITY         10
+#define STM32_I2S_SPI2_DMA_PRIORITY         1
+#define STM32_I2S_SPI3_DMA_PRIORITY         1
+#define STM32_I2S_SPI2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)
+#define STM32_I2S_SPI2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)
+#define STM32_I2S_SPI3_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 0)
+#define STM32_I2S_SPI3_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 7)
+#define STM32_I2S_DMA_ERROR_HOOK(i2sp)      osalSysHalt("DMA failure")
+/*
+ * ICU driver system settings.
+ */
+#define STM32_ICU_USE_TIM1                  FALSE
+#define STM32_ICU_USE_TIM2                  FALSE
+#define STM32_ICU_USE_TIM3                  FALSE
+#define STM32_ICU_USE_TIM4                  FALSE
+#define STM32_ICU_USE_TIM5                  FALSE
+#define STM32_ICU_USE_TIM8                  FALSE
+#define STM32_ICU_USE_TIM9                  FALSE
+#define STM32_ICU_TIM1_IRQ_PRIORITY         7
+#define STM32_ICU_TIM2_IRQ_PRIORITY         7
+#define STM32_ICU_TIM3_IRQ_PRIORITY         7
+#define STM32_ICU_TIM4_IRQ_PRIORITY         7
+#define STM32_ICU_TIM5_IRQ_PRIORITY         7
+#define STM32_ICU_TIM8_IRQ_PRIORITY         7
+#define STM32_ICU_TIM9_IRQ_PRIORITY         7
+/*
+ * MAC driver system settings.
+ */
+#define STM32_MAC_TRANSMIT_BUFFERS          2
+#define STM32_MAC_RECEIVE_BUFFERS           4
+#define STM32_MAC_BUFFERS_SIZE              1522
+#define STM32_MAC_PHY_TIMEOUT               100
+#define STM32_MAC_ETH1_CHANGE_PHY_STATE     TRUE
+#define STM32_MAC_ETH1_IRQ_PRIORITY         13
+#define STM32_MAC_IP_CHECKSUM_OFFLOAD       0
+/*
+ * 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
+#define STM32_PWM_USE_TIM4                  FALSE
+#define STM32_PWM_USE_TIM5                  FALSE
+#define STM32_PWM_USE_TIM8                  FALSE
+#define STM32_PWM_USE_TIM9                  FALSE
+#define STM32_PWM_TIM1_IRQ_PRIORITY         7
+#define STM32_PWM_TIM2_IRQ_PRIORITY         7
+#define STM32_PWM_TIM3_IRQ_PRIORITY         7
+#define STM32_PWM_TIM4_IRQ_PRIORITY         7
+#define STM32_PWM_TIM5_IRQ_PRIORITY         7
+#define STM32_PWM_TIM8_IRQ_PRIORITY         7
+#define STM32_PWM_TIM9_IRQ_PRIORITY         7
+/*
+ * SDC driver system settings.
+ */
+#define STM32_SDC_SDIO_DMA_PRIORITY         3
+#define STM32_SDC_SDIO_IRQ_PRIORITY         9
+#define STM32_SDC_WRITE_TIMEOUT_MS          1000
+#define STM32_SDC_READ_TIMEOUT_MS           1000
+#define STM32_SDC_CLOCK_ACTIVATION_DELAY    10
+#define STM32_SDC_SDIO_UNALIGNED_SUPPORT    TRUE
+#define STM32_SDC_SDIO_DMA_STREAM           STM32_DMA_STREAM_ID(2, 3)
+/*
+ * SERIAL driver system settings.
+ */
+#define STM32_SERIAL_USE_USART1             FALSE
+#define STM32_SERIAL_USE_USART2             FALSE
+#define STM32_SERIAL_USE_USART3             FALSE
+#define STM32_SERIAL_USE_UART4              FALSE
+#define STM32_SERIAL_USE_UART5              FALSE
+#define STM32_SERIAL_USE_USART6             FALSE
+#define STM32_SERIAL_USE_UART7              FALSE
+#define STM32_SERIAL_USE_UART8              FALSE
+#define STM32_SERIAL_USART1_PRIORITY        12
+#define STM32_SERIAL_USART2_PRIORITY        12
+#define STM32_SERIAL_USART3_PRIORITY        12
+#define STM32_SERIAL_UART4_PRIORITY         12
+#define STM32_SERIAL_UART5_PRIORITY         12
+#define STM32_SERIAL_USART6_PRIORITY        12
+#define STM32_SERIAL_UART7_PRIORITY         12
+#define STM32_SERIAL_UART8_PRIORITY         12
+/*
+ * SPI driver system settings.
+ */
+#define STM32_SPI_USE_SPI1                  FALSE
+#define STM32_SPI_USE_SPI2                  FALSE
+#define STM32_SPI_USE_SPI3                  FALSE
+#define STM32_SPI_USE_SPI4                  FALSE
+#define STM32_SPI_SPI1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(2, 0)
+#define STM32_SPI_SPI1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(2, 3)
+#define STM32_SPI_SPI2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)
+#define STM32_SPI_SPI2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)
+#define STM32_SPI_SPI3_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 0)
+#define STM32_SPI_SPI3_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 7)
+#define STM32_SPI_SPI4_RX_DMA_STREAM        STM32_DMA_STREAM_ID(2, 0)
+#define STM32_SPI_SPI4_TX_DMA_STREAM        STM32_DMA_STREAM_ID(2, 1)
+#define STM32_SPI_SPI1_DMA_PRIORITY         1
+#define STM32_SPI_SPI2_DMA_PRIORITY         1
+#define STM32_SPI_SPI3_DMA_PRIORITY         1
+#define STM32_SPI_SPI4_DMA_PRIORITY         1
+#define STM32_SPI_SPI1_IRQ_PRIORITY         10
+#define STM32_SPI_SPI2_IRQ_PRIORITY         10
+#define STM32_SPI_SPI3_IRQ_PRIORITY         10
+#define STM32_SPI_SPI4_IRQ_PRIORITY         10
+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")
+/*
+ * ST driver system settings.
+ */
+#define STM32_ST_IRQ_PRIORITY               8
+#define STM32_ST_USE_TIMER                  2
+/*
+ * UART driver system settings.
+ */
+#define STM32_UART_USE_USART1               FALSE
+#define STM32_UART_USE_USART2               FALSE
+#define STM32_UART_USE_USART3               FALSE
+#define STM32_UART_USE_UART4                FALSE
+#define STM32_UART_USE_UART5                FALSE
+#define STM32_UART_USE_USART6               FALSE
+#define STM32_UART_USART1_RX_DMA_STREAM     STM32_DMA_STREAM_ID(2, 5)
+#define STM32_UART_USART1_TX_DMA_STREAM     STM32_DMA_STREAM_ID(2, 7)
+#define STM32_UART_USART2_RX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 5)
+#define STM32_UART_USART2_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 6)
+#define STM32_UART_USART3_RX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 1)
+#define STM32_UART_USART3_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 3)
+#define STM32_UART_UART4_RX_DMA_STREAM      STM32_DMA_STREAM_ID(1, 2)
+#define STM32_UART_UART4_TX_DMA_STREAM      STM32_DMA_STREAM_ID(1, 4)
+#define STM32_UART_UART5_RX_DMA_STREAM      STM32_DMA_STREAM_ID(1, 0)
+#define STM32_UART_UART5_TX_DMA_STREAM      STM32_DMA_STREAM_ID(1, 7)
+#define STM32_UART_USART6_RX_DMA_STREAM     STM32_DMA_STREAM_ID(2, 2)
+#define STM32_UART_USART6_TX_DMA_STREAM     STM32_DMA_STREAM_ID(2, 7)
+#define STM32_UART_USART1_IRQ_PRIORITY      12
+#define STM32_UART_USART2_IRQ_PRIORITY      12
+#define STM32_UART_USART3_IRQ_PRIORITY      12
+#define STM32_UART_UART4_IRQ_PRIORITY       12
+#define STM32_UART_UART5_IRQ_PRIORITY       12
+#define STM32_UART_USART6_IRQ_PRIORITY      12
+#define STM32_UART_USART1_DMA_PRIORITY      0
+#define STM32_UART_USART2_DMA_PRIORITY      0
+#define STM32_UART_USART3_DMA_PRIORITY      0
+#define STM32_UART_UART4_DMA_PRIORITY       0
+#define STM32_UART_UART5_DMA_PRIORITY       0
+#define STM32_UART_USART6_DMA_PRIORITY      0
+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+/*
+ * USB driver system settings.
+ */
+#define STM32_USB_USE_OTG1                  TRUE
+#define STM32_USB_USE_OTG2                  FALSE
+#define STM32_USB_OTG1_IRQ_PRIORITY         14
+#define STM32_USB_OTG2_IRQ_PRIORITY         14
+#define STM32_USB_OTG1_RX_FIFO_SIZE         512
+#define STM32_USB_OTG2_RX_FIFO_SIZE         1024
+#define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
+#define STM32_USB_OTG_THREAD_STACK_SIZE     128
+#define STM32_USB_OTGFIFO_FILL_BASEPRI      0
+/*
+ * WDG driver system settings.
+ */
+#define STM32_WDG_USE_IWDG                  FALSE
+#endif /* MCUCONF_H */
diff --git a/quantum/bootmagic/bootmagic.h b/quantum/bootmagic/bootmagic.h
new file mode 100644
index 000000000..959750178
--- /dev/null
+++ b/quantum/bootmagic/bootmagic.h
@@ -0,0 +1,24 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 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
+#if defined(BOOTMAGIC_ENABLE)
+#    include "bootmagic_full.h"
+#elif defined(BOOTMAGIC_LITE)
+#    include "bootmagic_lite.h"
+#endif
+void bootmagic(void);
diff --git a/tmk_core/common/bootmagic.c b/quantum/bootmagic/bootmagic_full.c
index c1b3adf94..a7a0dcfcb 100644
--- a/tmk_core/common/bootmagic.c
+++ b/quantum/bootmagic/bootmagic_full.c
@@ -1,3 +1,18 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 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 <stdint.h>
 #include <stdbool.h>
 #include "wait.h"
@@ -10,18 +25,35 @@
 #include "eeconfig.h"
 #include "bootmagic.h"
-keymap_config_t keymap_config;
+/** \brief Scan Keycode
-/** \brief Bootmagic
 *
 * FIXME: needs doc
 */
-void bootmagic(void) {
+static bool scan_keycode(uint8_t keycode) {
-    /* check signature */
+    for (uint8_t r = 0; r < MATRIX_ROWS; r++) {
-    if (!eeconfig_is_enabled()) {
+        matrix_row_t matrix_row = matrix_get_row(r);
-        eeconfig_init();
+        for (uint8_t c = 0; c < MATRIX_COLS; c++) {
+            if (matrix_row & ((matrix_row_t)1 << c)) {
+                if (keycode == keymap_key_to_keycode(0, (keypos_t){.row = r, .col = c})) {
+                    return true;
+                }
+            }
+        }
    }
+    return false;
+}
+/** \brief Bootmagic Scan Keycode
+ *
+ * FIXME: needs doc
+ */
+static bool bootmagic_scan_keycode(uint8_t keycode) {
+    if (!scan_keycode(BOOTMAGIC_KEY_SALT)) return false;
+    return scan_keycode(keycode);
+}
+void bootmagic(void) {
    /* do scans in case of bounce */
    print("bootmagic scan: ... ");
    uint8_t scan = 100;
@@ -46,8 +78,6 @@ void bootmagic(void) {
        bootloader_jump();
    }
-    /* debug enable */
-    debug_config.raw = eeconfig_read_debug();
    if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEBUG_ENABLE)) {
        if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEBUG_MATRIX)) {
            debug_config.matrix = !debug_config.matrix;
@@ -61,8 +91,6 @@ void bootmagic(void) {
    }
    eeconfig_update_debug(debug_config.raw);
-    /* keymap config */
-    keymap_config.raw = eeconfig_read_keymap();
    if (bootmagic_scan_keycode(BOOTMAGIC_KEY_SWAP_CONTROL_CAPSLOCK)) {
        keymap_config.swap_control_capslock = !keymap_config.swap_control_capslock;
    }
@@ -93,71 +121,27 @@ void bootmagic(void) {
    uint8_t default_layer = 0;
    if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_0)) {
        default_layer |= (1 << 0);
-    }
+    } else if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_1)) {
-    if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_1)) {
        default_layer |= (1 << 1);
-    }
+    } else if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_2)) {
-    if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_2)) {
        default_layer |= (1 << 2);
-    }
+    } else if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_3)) {
-    if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_3)) {
        default_layer |= (1 << 3);
-    }
+    } else if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_4)) {
-    if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_4)) {
        default_layer |= (1 << 4);
-    }
+    } else if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_5)) {
-    if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_5)) {
        default_layer |= (1 << 5);
-    }
+    } else if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_6)) {
-    if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_6)) {
        default_layer |= (1 << 6);
-    }
+    } else if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_7)) {
-    if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_7)) {
        default_layer |= (1 << 7);
    }
-    if (default_layer) {
+    eeconfig_update_default_layer(default_layer);
-        eeconfig_update_default_layer(default_layer);
-        default_layer_set((layer_state_t)default_layer);
-    } else {
-        default_layer = eeconfig_read_default_layer();
-        default_layer_set((layer_state_t)default_layer);
-    }
-    /* Also initialize layer state to trigger callback functions for layer_state */
-    layer_state_set_kb((layer_state_t)layer_state);
    /* EE_HANDS handedness */
    if (bootmagic_scan_keycode(BOOTMAGIC_KEY_EE_HANDS_LEFT)) {
        eeconfig_update_handedness(true);
-    }
+    } else if (bootmagic_scan_keycode(BOOTMAGIC_KEY_EE_HANDS_RIGHT)) {
-    if (bootmagic_scan_keycode(BOOTMAGIC_KEY_EE_HANDS_RIGHT)) {
        eeconfig_update_handedness(false);
    }
 }
-/** \brief Scan Keycode
- *
- * FIXME: needs doc
- */
-static bool scan_keycode(uint8_t keycode) {
-    for (uint8_t r = 0; r < MATRIX_ROWS; r++) {
-        matrix_row_t matrix_row = matrix_get_row(r);
-        for (uint8_t c = 0; c < MATRIX_COLS; c++) {
-            if (matrix_row & ((matrix_row_t)1 << c)) {
-                if (keycode == keymap_key_to_keycode(0, (keypos_t){.row = r, .col = c})) {
-                    return true;
-                }
-            }
-        }
-    }
-    return false;
-}
-/** \brief Bootmagic Scan Keycode
- *
- * FIXME: needs doc
- */
-bool bootmagic_scan_keycode(uint8_t keycode) {
-    if (!scan_keycode(BOOTMAGIC_KEY_SALT)) return false;
-    return scan_keycode(keycode);
-}
diff --git a/tmk_core/common/bootmagic.h b/quantum/bootmagic/bootmagic_full.h
index 8209d0194..28f914c1b 100644
--- a/tmk_core/common/bootmagic.h
+++ b/quantum/bootmagic/bootmagic_full.h
@@ -1,3 +1,19 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 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
 /* FIXME: Add special doxygen comments for defines here. */
@@ -96,7 +112,4 @@
 #endif
 #ifndef BOOTMAGIC_KEY_DEFAULT_LAYER_7
 #    define BOOTMAGIC_KEY_DEFAULT_LAYER_7 KC_7
-#endif
+#endif
+\ No newline at end of file
-void bootmagic(void);
-bool bootmagic_scan_keycode(uint8_t keycode);
diff --git a/tmk_core/common/bootmagic_lite.c b/quantum/bootmagic/bootmagic_lite.c
index cbf756a17..9cbdcb0bb 100644
--- a/tmk_core/common/bootmagic_lite.c
+++ b/quantum/bootmagic/bootmagic_lite.c
@@ -1,3 +1,18 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 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 "quantum.h"
 /** \brief Reset eeprom
@@ -47,3 +62,5 @@ __attribute__((weak)) void bootmagic_lite(void) {
        bootloader_jump();
    }
 }
+void bootmagic(void) { bootmagic_lite(); }
diff --git a/quantum/bootmagic/bootmagic_lite.h b/quantum/bootmagic/bootmagic_lite.h
new file mode 100644
index 000000000..17777e6b4
--- /dev/null
+++ b/quantum/bootmagic/bootmagic_lite.h
@@ -0,0 +1,25 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 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
+#ifndef BOOTMAGIC_LITE_COLUMN
+#    define BOOTMAGIC_LITE_COLUMN 0
+#endif
+#ifndef BOOTMAGIC_LITE_ROW
+#    define BOOTMAGIC_LITE_ROW 0
+#endif
+void bootmagic_lite(void);
diff --git a/quantum/bootmagic/magic.c b/quantum/bootmagic/magic.c
new file mode 100644
index 000000000..f1cb11c39
--- /dev/null
+++ b/quantum/bootmagic/magic.c
@@ -0,0 +1,54 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 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 <stdint.h>
+#include <stdbool.h>
+#include "wait.h"
+#include "matrix.h"
+#include "bootloader.h"
+#include "debug.h"
+#include "keymap.h"
+#include "host.h"
+#include "action_layer.h"
+#include "eeconfig.h"
+#include "bootmagic.h"
+keymap_config_t keymap_config;
+__attribute__((weak)) void bootmagic(void) {}
+/** \brief Magic
+ *
+ * FIXME: Needs doc
+ */
+void magic(void) {
+    /* check signature */
+    if (!eeconfig_is_enabled()) {
+        eeconfig_init();
+    }
+    /* init globals */
+    debug_config.raw  = eeconfig_read_debug();
+    keymap_config.raw = eeconfig_read_keymap();
+    bootmagic();
+    /* read here just incase bootmagic process changed its value */
+    layer_state_t default_layer = (layer_state_t)eeconfig_read_default_layer();
+    default_layer_set(default_layer);
+    /* Also initialize layer state to trigger callback functions for layer_state */
+    layer_state_set_kb((layer_state_t)layer_state);
+}
diff --git a/quantum/bootmagic/magic.h b/quantum/bootmagic/magic.h
new file mode 100644
index 000000000..2c3969b85
--- /dev/null
+++ b/quantum/bootmagic/magic.h
@@ -0,0 +1,18 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 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
+void magic(void);
diff --git a/quantum/keycode_config.h b/quantum/keycode_config.h
index f878168c5..d7e334fdc 100644
--- a/quantum/keycode_config.h
+++ b/quantum/keycode_config.h
@@ -37,6 +37,7 @@ typedef union {
        bool nkro : 1;
        bool swap_lctl_lgui : 1;
        bool swap_rctl_rgui : 1;
+        bool oneshot_disable : 1;
    };
 } keymap_config_t;
diff --git a/quantum/led_matrix.c b/quantum/led_matrix.c
index 4f1f06c7a..72eb5190b 100644
--- a/quantum/led_matrix.c
+++ b/quantum/led_matrix.c
@@ -17,79 +17,111 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <stdint.h>
-#include <stdbool.h>
-#include "quantum.h"
 #include "led_matrix.h"
 #include "progmem.h"
 #include "config.h"
 #include "eeprom.h"
 #include <string.h>
 #include <math.h>
+#include "led_tables.h"
-led_eeconfig_t led_matrix_eeconfig;
+#include <lib/lib8tion/lib8tion.h>
-#ifndef MAX
+#if defined(LED_DISABLE_AFTER_TIMEOUT) && !defined(LED_DISABLE_TIMEOUT)
-#    define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
+#    define LED_DISABLE_TIMEOUT (LED_DISABLE_AFTER_TIMEOUT * 1200UL)
 #endif
-#ifndef MIN
+#ifndef LED_DISABLE_TIMEOUT
-#    define MIN(a, b) ((a) < (b) ? (a) : (b))
+#    define LED_DISABLE_TIMEOUT 0
-#endif
-#ifndef LED_DISABLE_AFTER_TIMEOUT
-#    define LED_DISABLE_AFTER_TIMEOUT 0
 #endif
 #ifndef LED_DISABLE_WHEN_USB_SUSPENDED
 #    define LED_DISABLE_WHEN_USB_SUSPENDED false
 #endif
-#ifndef EECONFIG_LED_MATRIX
+#if !defined(LED_MATRIX_MAXIMUM_BRIGHTNESS) || LED_MATRIX_MAXIMUM_BRIGHTNESS > UINT8_MAX
-#    define EECONFIG_LED_MATRIX EECONFIG_RGBLIGHT
+#    undef LED_MATRIX_MAXIMUM_BRIGHTNESS
+#    define LED_MATRIX_MAXIMUM_BRIGHTNESS UINT8_MAX
 #endif
-#if !defined(LED_MATRIX_MAXIMUM_BRIGHTNESS) || LED_MATRIX_MAXIMUM_BRIGHTNESS > 255
+#if !defined(LED_MATRIX_VAL_STEP)
-#    define LED_MATRIX_MAXIMUM_BRIGHTNESS 255
+#    define LED_MATRIX_VAL_STEP 8
 #endif
-bool g_suspend_state = false;
+#if !defined(LED_MATRIX_SPD_STEP)
+#    define LED_MATRIX_SPD_STEP 16
+#endif
-// Global tick at 20 Hz
+#if !defined(LED_MATRIX_STARTUP_MODE)
-uint32_t g_tick = 0;
+#    define LED_MATRIX_STARTUP_MODE LED_MATRIX_UNIFORM_BRIGHTNESS
+#endif
-// Ticks since this key was last hit.
+#if !defined(LED_MATRIX_STARTUP_VAL)
-uint8_t g_key_hit[DRIVER_LED_TOTAL];
+#    define LED_MATRIX_STARTUP_VAL LED_MATRIX_MAXIMUM_BRIGHTNESS
+#endif
-// Ticks since any key was last hit.
+#if !defined(LED_MATRIX_STARTUP_SPD)
-uint32_t g_any_key_hit = 0;
+#    define LED_MATRIX_STARTUP_SPD UINT8_MAX / 2
+#endif
-uint32_t eeconfig_read_led_matrix(void) { return eeprom_read_dword(EECONFIG_LED_MATRIX); }
+// globals
+bool           g_suspend_state = false;
+led_eeconfig_t led_matrix_eeconfig;  // TODO: would like to prefix this with g_ for global consistancy, do this in another pr
+uint32_t       g_led_timer;
+#ifdef LED_MATRIX_FRAMEBUFFER_EFFECTS
+uint8_t g_led_frame_buffer[MATRIX_ROWS][MATRIX_COLS] = {{0}};
+#endif  // LED_MATRIX_FRAMEBUFFER_EFFECTS
+#ifdef LED_MATRIX_KEYREACTIVE_ENABLED
+last_hit_t g_last_hit_tracker;
+#endif  // LED_MATRIX_KEYREACTIVE_ENABLED
+// internals
+static uint8_t         led_last_enable   = UINT8_MAX;
+static uint8_t         led_last_effect   = UINT8_MAX;
+static effect_params_t led_effect_params = {0, LED_FLAG_ALL, false};
+static led_task_states led_task_state    = SYNCING;
+#if LED_DISABLE_TIMEOUT > 0
+static uint32_t led_anykey_timer;
+#endif  // LED_DISABLE_TIMEOUT > 0
+// double buffers
+static uint32_t led_timer_buffer;
+#ifdef LED_MATRIX_KEYREACTIVE_ENABLED
+static last_hit_t last_hit_buffer;
+#endif  // LED_MATRIX_KEYREACTIVE_ENABLED
+// split led matrix
+#if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
+const uint8_t k_led_matrix_split[2] = LED_MATRIX_SPLIT;
+#endif
-void eeconfig_update_led_matrix(uint32_t config_value) { eeprom_update_dword(EECONFIG_LED_MATRIX, config_value); }
+void eeconfig_read_led_matrix(void) { eeprom_read_block(&led_matrix_eeconfig, EECONFIG_LED_MATRIX, sizeof(led_matrix_eeconfig)); }
+void eeconfig_update_led_matrix(void) { eeprom_update_block(&led_matrix_eeconfig, EECONFIG_LED_MATRIX, sizeof(led_matrix_eeconfig)); }
 void eeconfig_update_led_matrix_default(void) {
    dprintf("eeconfig_update_led_matrix_default\n");
    led_matrix_eeconfig.enable = 1;
-    led_matrix_eeconfig.mode   = LED_MATRIX_UNIFORM_BRIGHTNESS;
+    led_matrix_eeconfig.mode   = LED_MATRIX_STARTUP_MODE;
-    led_matrix_eeconfig.val    = 128;
+    led_matrix_eeconfig.val    = LED_MATRIX_STARTUP_VAL;
-    led_matrix_eeconfig.speed  = 0;
+    led_matrix_eeconfig.speed  = LED_MATRIX_STARTUP_SPD;
-    eeconfig_update_led_matrix(led_matrix_eeconfig.raw);
+    led_matrix_eeconfig.flags  = LED_FLAG_ALL;
+    eeconfig_update_led_matrix();
 }
 void eeconfig_debug_led_matrix(void) {
-    dprintf("led_matrix_eeconfig eeprom\n");
+    dprintf("led_matrix_eeconfig EEPROM\n");
    dprintf("led_matrix_eeconfig.enable = %d\n", led_matrix_eeconfig.enable);
    dprintf("led_matrix_eeconfig.mode = %d\n", led_matrix_eeconfig.mode);
    dprintf("led_matrix_eeconfig.val = %d\n", led_matrix_eeconfig.val);
    dprintf("led_matrix_eeconfig.speed = %d\n", led_matrix_eeconfig.speed);
+    dprintf("led_matrix_eeconfig.flags = %d\n", led_matrix_eeconfig.flags);
 }
-uint8_t g_last_led_hit[LED_HITS_TO_REMEMBER] = {255};
+__attribute__((weak)) uint8_t led_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t *led_i) { return 0; }
-uint8_t g_last_led_count                     = 0;
-uint8_t map_row_column_to_led(uint8_t row, uint8_t column, uint8_t *led_i) {
+uint8_t led_matrix_map_row_column_to_led(uint8_t row, uint8_t column, uint8_t *led_i) {
-    uint8_t led_count = 0;
+    uint8_t led_count = led_matrix_map_row_column_to_led_kb(row, column, led_i);
    uint8_t led_index = g_led_config.matrix_co[row][column];
    if (led_index != NO_LED) {
        led_i[led_count] = led_index;
@@ -100,88 +132,227 @@ uint8_t map_row_column_to_led(uint8_t row, uint8_t column, uint8_t *led_i) {
 void led_matrix_update_pwm_buffers(void) { led_matrix_driver.flush(); }
-void led_matrix_set_index_value(int index, uint8_t value) { led_matrix_driver.set_value(index, value); }
+void led_matrix_set_value(int index, uint8_t value) {
+#if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
-void led_matrix_set_index_value_all(uint8_t value) { led_matrix_driver.set_value_all(value); }
+    if (!is_keyboard_left() && index >= k_led_matrix_split[0])
+#    ifdef USE_CIE1931_CURVE
-bool process_led_matrix(uint16_t keycode, keyrecord_t *record) {
+        led_matrix_driver.set_value(index - k_led_matrix_split[0], pgm_read_byte(&CIE1931_CURVE[value]));
-    if (record->event.pressed) {
+#    else
-        uint8_t led[8];
+        led_matrix_driver.set_value(index - k_led_matrix_split[0], value);
-        uint8_t led_count = map_row_column_to_led(record->event.key.row, record->event.key.col, led);
+#    endif
-        if (led_count > 0) {
+    else if (is_keyboard_left() && index < k_led_matrix_split[0])
-            for (uint8_t i = LED_HITS_TO_REMEMBER; i > 1; i--) {
+#endif
-                g_last_led_hit[i - 1] = g_last_led_hit[i - 2];
+#ifdef USE_CIE1931_CURVE
-            }
+        led_matrix_driver.set_value(index, pgm_read_byte(&CIE1931_CURVE[value]));
-            g_last_led_hit[0] = led[0];
+#else
-            g_last_led_count  = MIN(LED_HITS_TO_REMEMBER, g_last_led_count + 1);
+    led_matrix_driver.set_value(index, value);
-        }
+#endif
-        for (uint8_t i = 0; i < led_count; i++) g_key_hit[led[i]] = 0;
+}
-        g_any_key_hit = 0;
-    } else {
-#ifdef LED_MATRIX_KEYRELEASES
-        uint8_t led[8];
-        uint8_t led_count = map_row_column_to_led(record->event.key.row, record->event.key.col, led);
-        for (uint8_t i = 0; i < led_count; i++) g_key_hit[led[i]] = 255;
-        g_any_key_hit = 255;
+void led_matrix_set_value_all(uint8_t value) {
+#if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
+    for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) led_matrix_set_value(i, value);
+#else
+#    ifdef USE_CIE1931_CURVE
+    led_matrix_driver.set_value_all(pgm_read_byte(&CIE1931_CURVE[value]));
+#    else
+    led_matrix_driver.set_value_all(value);
+#    endif
 #endif
-    }
-    return true;
 }
-void led_matrix_set_suspend_state(bool state) { g_suspend_state = state; }
+void process_led_matrix(uint8_t row, uint8_t col, bool pressed) {
+#ifndef LED_MATRIX_SPLIT
+    if (!is_keyboard_master()) return;
+#endif
+#if LED_DISABLE_TIMEOUT > 0
+    led_anykey_timer = 0;
+#endif  // LED_DISABLE_TIMEOUT > 0
-// All LEDs off
+#ifdef LED_MATRIX_KEYREACTIVE_ENABLED
-void led_matrix_all_off(void) { led_matrix_set_index_value_all(0); }
+    uint8_t led[LED_HITS_TO_REMEMBER];
+    uint8_t led_count = 0;
-// Uniform brightness
+#    if defined(LED_MATRIX_KEYRELEASES)
-void led_matrix_uniform_brightness(void) { led_matrix_set_index_value_all(LED_MATRIX_MAXIMUM_BRIGHTNESS / BACKLIGHT_LEVELS * led_matrix_eeconfig.val); }
+    if (!pressed)
+#    elif defined(LED_MATRIX_KEYPRESSES)
+    if (pressed)
+#    endif  // defined(LED_MATRIX_KEYRELEASES)
+    {
+        led_count = led_matrix_map_row_column_to_led(row, col, led);
+    }
-void led_matrix_custom(void) {}
+    if (last_hit_buffer.count + led_count > LED_HITS_TO_REMEMBER) {
+        memcpy(&last_hit_buffer.x[0], &last_hit_buffer.x[led_count], LED_HITS_TO_REMEMBER - led_count);
+        memcpy(&last_hit_buffer.y[0], &last_hit_buffer.y[led_count], LED_HITS_TO_REMEMBER - led_count);
+        memcpy(&last_hit_buffer.tick[0], &last_hit_buffer.tick[led_count], (LED_HITS_TO_REMEMBER - led_count) * 2);  // 16 bit
+        memcpy(&last_hit_buffer.index[0], &last_hit_buffer.index[led_count], LED_HITS_TO_REMEMBER - led_count);
+        last_hit_buffer.count--;
+    }
-void led_matrix_task(void) {
+    for (uint8_t i = 0; i < led_count; i++) {
-    if (!led_matrix_eeconfig.enable) {
+        uint8_t index                = last_hit_buffer.count;
-        led_matrix_all_off();
+        last_hit_buffer.x[index]     = g_led_config.point[led[i]].x;
-        led_matrix_indicators();
+        last_hit_buffer.y[index]     = g_led_config.point[led[i]].y;
-        return;
+        last_hit_buffer.index[index] = led[i];
+        last_hit_buffer.tick[index]  = 0;
+        last_hit_buffer.count++;
    }
+#endif  // LED_MATRIX_KEYREACTIVE_ENABLED
-    g_tick++;
+#if defined(LED_MATRIX_FRAMEBUFFER_EFFECTS) && !defined(DISABLE_LED_MATRIX_TYPING_HEATMAP)
+    if (led_matrix_eeconfig.mode == LED_MATRIX_TYPING_HEATMAP) {
+        process_led_matrix_typing_heatmap(row, col);
+    }
+#endif  // defined(LED_MATRIX_FRAMEBUFFER_EFFECTS) && !defined(DISABLE_LED_MATRIX_TYPING_HEATMAP)
+}
-    if (g_any_key_hit < 0xFFFFFFFF) {
+static bool led_matrix_none(effect_params_t *params) {
-        g_any_key_hit++;
+    if (!params->init) {
+        return false;
    }
-    for (int led = 0; led < DRIVER_LED_TOTAL; led++) {
+    led_matrix_set_value_all(0);
-        if (g_key_hit[led] < 255) {
+    return false;
-            if (g_key_hit[led] == 254) g_last_led_count = MAX(g_last_led_count - 1, 0);
+}
-            g_key_hit[led]++;
+static bool led_matrix_uniform_brightness(effect_params_t *params) {
+    LED_MATRIX_USE_LIMITS(led_min, led_max);
+    uint8_t val = led_matrix_eeconfig.val;
+    for (uint8_t i = led_min; i < led_max; i++) {
+        LED_MATRIX_TEST_LED_FLAGS();
+        led_matrix_set_value(i, val);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+static void led_task_timers(void) {
+#if defined(LED_MATRIX_KEYREACTIVE_ENABLED) || LED_DISABLE_TIMEOUT > 0
+    uint32_t deltaTime = sync_timer_elapsed32(led_timer_buffer);
+#endif  // defined(LED_MATRIX_KEYREACTIVE_ENABLED) || LED_DISABLE_TIMEOUT > 0
+    led_timer_buffer = sync_timer_read32();
+    // Update double buffer timers
+#if LED_DISABLE_TIMEOUT > 0
+    if (led_anykey_timer < UINT32_MAX) {
+        if (UINT32_MAX - deltaTime < led_anykey_timer) {
+            led_anykey_timer = UINT32_MAX;
+        } else {
+            led_anykey_timer += deltaTime;
+        }
+    }
+#endif  // LED_DISABLE_TIMEOUT > 0
+    // Update double buffer last hit timers
+#ifdef LED_MATRIX_KEYREACTIVE_ENABLED
+    uint8_t count = last_hit_buffer.count;
+    for (uint8_t i = 0; i < count; ++i) {
+        if (UINT16_MAX - deltaTime < last_hit_buffer.tick[i]) {
+            last_hit_buffer.count--;
+            continue;
        }
+        last_hit_buffer.tick[i] += deltaTime;
    }
+#endif  // LED_MATRIX_KEYREACTIVE_ENABLED
+}
-    // Ideally we would also stop sending zeros to the LED driver PWM buffers
+static void led_task_sync(void) {
-    // while suspended and just do a software shutdown. This is a cheap hack for now.
+    // next task
-    bool    suspend_backlight = ((g_suspend_state && LED_DISABLE_WHEN_USB_SUSPENDED) || (LED_DISABLE_AFTER_TIMEOUT > 0 && g_any_key_hit > LED_DISABLE_AFTER_TIMEOUT * 60 * 20));
+    if (sync_timer_elapsed32(g_led_timer) >= LED_MATRIX_LED_FLUSH_LIMIT) led_task_state = STARTING;
-    uint8_t effect            = suspend_backlight ? 0 : led_matrix_eeconfig.mode;
+}
+static void led_task_start(void) {
+    // reset iter
+    led_effect_params.iter = 0;
+    // update double buffers
+    g_led_timer = led_timer_buffer;
+#ifdef LED_MATRIX_KEYREACTIVE_ENABLED
+    g_last_hit_tracker = last_hit_buffer;
+#endif  // LED_MATRIX_KEYREACTIVE_ENABLED
+    // next task
+    led_task_state = RENDERING;
+}
+static void led_task_render(uint8_t effect) {
+    bool rendering         = false;
+    led_effect_params.init = (effect != led_last_effect) || (led_matrix_eeconfig.enable != led_last_enable);
+    if (led_effect_params.flags != led_matrix_eeconfig.flags) {
+        led_effect_params.flags = led_matrix_eeconfig.flags;
+        led_matrix_set_value_all(0);
+    }
-    // this gets ticked at 20 Hz.
    // each effect can opt to do calculations
    // and/or request PWM buffer updates.
    switch (effect) {
-        case LED_MATRIX_UNIFORM_BRIGHTNESS:
+        case LED_MATRIX_NONE:
-            led_matrix_uniform_brightness();
+            rendering = led_matrix_none(&led_effect_params);
            break;
-        default:
+        case LED_MATRIX_UNIFORM_BRIGHTNESS:
-            led_matrix_custom();
+            rendering = led_matrix_uniform_brightness(&led_effect_params);
            break;
    }
-    if (!suspend_backlight) {
+    led_effect_params.iter++;
-        led_matrix_indicators();
+    // next task
+    if (!rendering) {
+        led_task_state = FLUSHING;
+        if (!led_effect_params.init && effect == LED_MATRIX_NONE) {
+            // We only need to flush once if we are LED_MATRIX_NONE
+            led_task_state = SYNCING;
+        }
    }
+}
-    // Tell the LED driver to update its state
+static void led_task_flush(uint8_t effect) {
-    led_matrix_driver.flush();
+    // update last trackers after the first full render so we can init over several frames
+    led_last_effect = effect;
+    led_last_enable = led_matrix_eeconfig.enable;
+    // update pwm buffers
+    led_matrix_update_pwm_buffers();
+    // next task
+    led_task_state = SYNCING;
+}
+void led_matrix_task(void) {
+    led_task_timers();
+    // Ideally we would also stop sending zeros to the LED driver PWM buffers
+    // while suspended and just do a software shutdown. This is a cheap hack for now.
+    bool suspend_backlight =
+#if LED_DISABLE_WHEN_USB_SUSPENDED == true
+        g_suspend_state ||
+#endif  // LED_DISABLE_WHEN_USB_SUSPENDED == true
+#if LED_DISABLE_TIMEOUT > 0
+        (led_anykey_timer > (uint32_t)LED_DISABLE_TIMEOUT) ||
+#endif  // LED_DISABLE_TIMEOUT > 0
+        false;
+    uint8_t effect = suspend_backlight || !led_matrix_eeconfig.enable ? 0 : led_matrix_eeconfig.mode;
+    switch (led_task_state) {
+        case STARTING:
+            led_task_start();
+            break;
+        case RENDERING:
+            led_task_render(effect);
+            if (effect) {
+                led_matrix_indicators();
+                led_matrix_indicators_advanced(&led_effect_params);
+            }
+            break;
+        case FLUSHING:
+            led_task_flush(effect);
+            break;
+        case SYNCING:
+            led_task_sync();
+            break;
+    }
 }
 void led_matrix_indicators(void) {
@@ -193,33 +364,42 @@ __attribute__((weak)) void led_matrix_indicators_kb(void) {}
 __attribute__((weak)) void led_matrix_indicators_user(void) {}
-// void led_matrix_set_indicator_index(uint8_t *index, uint8_t row, uint8_t column)
+void led_matrix_indicators_advanced(effect_params_t *params) {
-// {
+    /* special handling is needed for "params->iter", since it's already been incremented.
-//  if (row >= MATRIX_ROWS)
+     * Could move the invocations to led_task_render, but then it's missing a few checks
-//  {
+     * and not sure which would be better. Otherwise, this should be called from
-//      // Special value, 255=none, 254=all
+     * led_task_render, right before the iter++ line.
-//      *index = row;
+     */
-//  }
+#if defined(LED_MATRIX_LED_PROCESS_LIMIT) && LED_MATRIX_LED_PROCESS_LIMIT > 0 && LED_MATRIX_LED_PROCESS_LIMIT < DRIVER_LED_TOTAL
-//  else
+    uint8_t min = LED_MATRIX_LED_PROCESS_LIMIT * (params->iter - 1);
-//  {
+    uint8_t max = min + LED_MATRIX_LED_PROCESS_LIMIT;
-//      // This needs updated to something like
+    if (max > DRIVER_LED_TOTAL) max = DRIVER_LED_TOTAL;
-//      // uint8_t led[8];
+#else
-//      // uint8_t led_count = map_row_column_to_led(row, column, led);
+    uint8_t min = 0;
-//      // for(uint8_t i = 0; i < led_count; i++)
+    uint8_t max = DRIVER_LED_TOTAL;
-//      map_row_column_to_led(row, column, index);
+#endif
-//  }
+    led_matrix_indicators_advanced_kb(min, max);
-// }
+    led_matrix_indicators_advanced_user(min, max);
+}
+__attribute__((weak)) void led_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {}
+__attribute__((weak)) void led_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {}
 void led_matrix_init(void) {
    led_matrix_driver.init();
-    // Wait half a second for the driver to finish initializing
+#ifdef LED_MATRIX_KEYREACTIVE_ENABLED
-    wait_ms(500);
+    g_last_hit_tracker.count = 0;
+    for (uint8_t i = 0; i < LED_HITS_TO_REMEMBER; ++i) {
+        g_last_hit_tracker.tick[i] = UINT16_MAX;
+    }
-    // clear the key hits
+    last_hit_buffer.count = 0;
-    for (int led = 0; led < DRIVER_LED_TOTAL; led++) {
+    for (uint8_t i = 0; i < LED_HITS_TO_REMEMBER; ++i) {
-        g_key_hit[led] = 255;
+        last_hit_buffer.tick[i] = UINT16_MAX;
    }
+#endif  // LED_MATRIX_KEYREACTIVE_ENABLED
    if (!eeconfig_is_enabled()) {
        dprintf("led_matrix_init_drivers eeconfig is not enabled.\n");
@@ -227,122 +407,135 @@ void led_matrix_init(void) {
        eeconfig_update_led_matrix_default();
    }
-    led_matrix_eeconfig.raw = eeconfig_read_led_matrix();
+    eeconfig_read_led_matrix();
    if (!led_matrix_eeconfig.mode) {
        dprintf("led_matrix_init_drivers led_matrix_eeconfig.mode = 0. Write default values to EEPROM.\n");
        eeconfig_update_led_matrix_default();
-        led_matrix_eeconfig.raw = eeconfig_read_led_matrix();
    }
    eeconfig_debug_led_matrix();  // display current eeprom values
 }
-// Deals with the messy details of incrementing an integer
+void led_matrix_set_suspend_state(bool state) {
-static uint8_t increment(uint8_t value, uint8_t step, uint8_t min, uint8_t max) {
+    if (LED_DISABLE_WHEN_USB_SUSPENDED && state) {
-    int16_t new_value = value;
+        led_matrix_set_value_all(0);  // turn off all LEDs when suspending
-    new_value += step;
+    }
-    return MIN(MAX(new_value, min), max);
+    g_suspend_state = state;
 }
-static uint8_t decrement(uint8_t value, uint8_t step, uint8_t min, uint8_t max) {
+bool led_matrix_get_suspend_state(void) { return g_suspend_state; }
-    int16_t new_value = value;
-    new_value -= step;
-    return MIN(MAX(new_value, min), max);
-}
-// void *backlight_get_custom_key_value_eeprom_address(uint8_t led) {
+void led_matrix_toggle_eeprom_helper(bool write_to_eeprom) {
-//     // 3 bytes per value
-//     return EECONFIG_LED_MATRIX + (led * 3);
-// }
-// void backlight_get_key_value(uint8_t led, uint8_t *value) {
-//     void *address = backlight_get_custom_key_value_eeprom_address(led);
-//     value = eeprom_read_byte(address);
-// }
-// void backlight_set_key_value(uint8_t row, uint8_t column, uint8_t value) {
-//     uint8_t led[8];
-//     uint8_t led_count = map_row_column_to_led(row, column, led);
-//     for(uint8_t i = 0; i < led_count; i++) {
-//         if (led[i] < DRIVER_LED_TOTAL) {
-//             void *address = backlight_get_custom_key_value_eeprom_address(led[i]);
-//             eeprom_update_byte(address, value);
-//         }
-//     }
-// }
-uint32_t led_matrix_get_tick(void) { return g_tick; }
-void led_matrix_toggle(void) {
    led_matrix_eeconfig.enable ^= 1;
-    eeconfig_update_led_matrix(led_matrix_eeconfig.raw);
+    led_task_state = STARTING;
+    if (write_to_eeprom) {
+        eeconfig_update_led_matrix();
+    }
+    dprintf("led matrix toggle [%s]: led_matrix_eeconfig.enable = %u\n", (write_to_eeprom) ? "EEPROM" : "NOEEPROM", led_matrix_eeconfig.enable);
 }
+void led_matrix_toggle_noeeprom(void) { led_matrix_toggle_eeprom_helper(false); }
+void led_matrix_toggle(void) { led_matrix_toggle_eeprom_helper(true); }
 void led_matrix_enable(void) {
-    led_matrix_eeconfig.enable = 1;
+    led_matrix_enable_noeeprom();
-    eeconfig_update_led_matrix(led_matrix_eeconfig.raw);
+    eeconfig_update_led_matrix();
 }
-void led_matrix_enable_noeeprom(void) { led_matrix_eeconfig.enable = 1; }
+void led_matrix_enable_noeeprom(void) {
+    if (!led_matrix_eeconfig.enable) led_task_state = STARTING;
+    led_matrix_eeconfig.enable = 1;
+}
 void led_matrix_disable(void) {
+    led_matrix_disable_noeeprom();
+    eeconfig_update_led_matrix();
+}
+void led_matrix_disable_noeeprom(void) {
+    if (led_matrix_eeconfig.enable) led_task_state = STARTING;
    led_matrix_eeconfig.enable = 0;
-    eeconfig_update_led_matrix(led_matrix_eeconfig.raw);
 }
-void led_matrix_disable_noeeprom(void) { led_matrix_eeconfig.enable = 0; }
+uint8_t led_matrix_is_enabled(void) { return led_matrix_eeconfig.enable; }
-void led_matrix_step(void) {
+void led_matrix_mode_eeprom_helper(uint8_t mode, bool write_to_eeprom) {
-    led_matrix_eeconfig.mode++;
+    if (!led_matrix_eeconfig.enable) {
-    if (led_matrix_eeconfig.mode >= LED_MATRIX_EFFECT_MAX) {
+        return;
-        led_matrix_eeconfig.mode = 1;
    }
-    eeconfig_update_led_matrix(led_matrix_eeconfig.raw);
+    if (mode < 1) {
-}
+        led_matrix_eeconfig.mode = 1;
+    } else if (mode >= LED_MATRIX_EFFECT_MAX) {
-void led_matrix_step_reverse(void) {
-    led_matrix_eeconfig.mode--;
-    if (led_matrix_eeconfig.mode < 1) {
        led_matrix_eeconfig.mode = LED_MATRIX_EFFECT_MAX - 1;
+    } else {
+        led_matrix_eeconfig.mode = mode;
+    }
+    led_task_state = STARTING;
+    if (write_to_eeprom) {
+        eeconfig_update_led_matrix();
    }
-    eeconfig_update_led_matrix(led_matrix_eeconfig.raw);
+    dprintf("led matrix mode [%s]: %u\n", (write_to_eeprom) ? "EEPROM" : "NOEEPROM", led_matrix_eeconfig.mode);
 }
+void led_matrix_mode_noeeprom(uint8_t mode) { led_matrix_mode_eeprom_helper(mode, false); }
+void led_matrix_mode(uint8_t mode) { led_matrix_mode_eeprom_helper(mode, true); }
-void led_matrix_increase_val(void) {
+uint8_t led_matrix_get_mode(void) { return led_matrix_eeconfig.mode; }
-    led_matrix_eeconfig.val = increment(led_matrix_eeconfig.val, 8, 0, LED_MATRIX_MAXIMUM_BRIGHTNESS);
-    eeconfig_update_led_matrix(led_matrix_eeconfig.raw);
-}
-void led_matrix_decrease_val(void) {
+void led_matrix_step_helper(bool write_to_eeprom) {
-    led_matrix_eeconfig.val = decrement(led_matrix_eeconfig.val, 8, 0, LED_MATRIX_MAXIMUM_BRIGHTNESS);
+    uint8_t mode = led_matrix_eeconfig.mode + 1;
-    eeconfig_update_led_matrix(led_matrix_eeconfig.raw);
+    led_matrix_mode_eeprom_helper((mode < LED_MATRIX_EFFECT_MAX) ? mode : 1, write_to_eeprom);
 }
+void led_matrix_step_noeeprom(void) { led_matrix_step_helper(false); }
+void led_matrix_step(void) { led_matrix_step_helper(true); }
-void led_matrix_increase_speed(void) {
+void led_matrix_step_reverse_helper(bool write_to_eeprom) {
-    led_matrix_eeconfig.speed = increment(led_matrix_eeconfig.speed, 1, 0, 3);
+    uint8_t mode = led_matrix_eeconfig.mode - 1;
-    eeconfig_update_led_matrix(led_matrix_eeconfig.raw);  // EECONFIG needs to be increased to support this
+    led_matrix_mode_eeprom_helper((mode < 1) ? LED_MATRIX_EFFECT_MAX - 1 : mode, write_to_eeprom);
 }
+void led_matrix_step_reverse_noeeprom(void) { led_matrix_step_reverse_helper(false); }
+void led_matrix_step_reverse(void) { led_matrix_step_reverse_helper(true); }
-void led_matrix_decrease_speed(void) {
+void led_matrix_set_val_eeprom_helper(uint8_t val, bool write_to_eeprom) {
-    led_matrix_eeconfig.speed = decrement(led_matrix_eeconfig.speed, 1, 0, 3);
+    if (!led_matrix_eeconfig.enable) {
-    eeconfig_update_led_matrix(led_matrix_eeconfig.raw);  // EECONFIG needs to be increased to support this
+        return;
+    }
+    led_matrix_eeconfig.val = (val > LED_MATRIX_MAXIMUM_BRIGHTNESS) ? LED_MATRIX_MAXIMUM_BRIGHTNESS : val;
+    if (write_to_eeprom) {
+        eeconfig_update_led_matrix();
+    }
+    dprintf("led matrix set val [%s]: %u\n", (write_to_eeprom) ? "EEPROM" : "NOEEPROM", led_matrix_eeconfig.val);
 }
+void led_matrix_set_val_noeeprom(uint8_t val) { led_matrix_set_val_eeprom_helper(val, false); }
+void led_matrix_set_val(uint8_t val) { led_matrix_set_val_eeprom_helper(val, true); }
-void led_matrix_mode(uint8_t mode, bool eeprom_write) {
+uint8_t led_matrix_get_val(void) { return led_matrix_eeconfig.val; }
-    led_matrix_eeconfig.mode = mode;
-    if (eeprom_write) {
+void led_matrix_increase_val_helper(bool write_to_eeprom) { led_matrix_set_val_eeprom_helper(qadd8(led_matrix_eeconfig.val, LED_MATRIX_VAL_STEP), write_to_eeprom); }
-        eeconfig_update_led_matrix(led_matrix_eeconfig.raw);
+void led_matrix_increase_val_noeeprom(void) { led_matrix_increase_val_helper(false); }
+void led_matrix_increase_val(void) { led_matrix_increase_val_helper(true); }
+void led_matrix_decrease_val_helper(bool write_to_eeprom) { led_matrix_set_val_eeprom_helper(qsub8(led_matrix_eeconfig.val, LED_MATRIX_VAL_STEP), write_to_eeprom); }
+void led_matrix_decrease_val_noeeprom(void) { led_matrix_decrease_val_helper(false); }
+void led_matrix_decrease_val(void) { led_matrix_decrease_val_helper(true); }
+void led_matrix_set_speed_eeprom_helper(uint8_t speed, bool write_to_eeprom) {
+    led_matrix_eeconfig.speed = speed;
+    if (write_to_eeprom) {
+        eeconfig_update_led_matrix();
    }
+    dprintf("led matrix set speed [%s]: %u\n", (write_to_eeprom) ? "EEPROM" : "NOEEPROM", led_matrix_eeconfig.speed);
 }
+void led_matrix_set_speed_noeeprom(uint8_t speed) { led_matrix_set_speed_eeprom_helper(speed, false); }
+void led_matrix_set_speed(uint8_t speed) { led_matrix_set_speed_eeprom_helper(speed, true); }
-uint8_t led_matrix_get_mode(void) { return led_matrix_eeconfig.mode; }
+uint8_t led_matrix_get_speed(void) { return led_matrix_eeconfig.speed; }
-void led_matrix_set_value_noeeprom(uint8_t val) { led_matrix_eeconfig.val = val; }
+void led_matrix_increase_speed_helper(bool write_to_eeprom) { led_matrix_set_speed_eeprom_helper(qadd8(led_matrix_eeconfig.speed, LED_MATRIX_SPD_STEP), write_to_eeprom); }
+void led_matrix_increase_speed_noeeprom(void) { led_matrix_increase_speed_helper(false); }
+void led_matrix_increase_speed(void) { led_matrix_increase_speed_helper(true); }
-void led_matrix_set_value(uint8_t val) {
+void led_matrix_decrease_speed_helper(bool write_to_eeprom) { led_matrix_set_speed_eeprom_helper(qsub8(led_matrix_eeconfig.speed, LED_MATRIX_SPD_STEP), write_to_eeprom); }
-    led_matrix_set_value_noeeprom(val);
+void led_matrix_decrease_speed_noeeprom(void) { led_matrix_decrease_speed_helper(false); }
-    eeconfig_update_led_matrix(led_matrix_eeconfig.raw);
+void led_matrix_decrease_speed(void) { led_matrix_decrease_speed_helper(true); }
-}
+led_flags_t led_matrix_get_flags(void) { return led_matrix_eeconfig.flags; }
-void backlight_set(uint8_t val) { led_matrix_set_value(val); }
+void led_matrix_set_flags(led_flags_t flags) { led_matrix_eeconfig.flags = flags; }
diff --git a/quantum/led_matrix.h b/quantum/led_matrix.h
index 85bae43c1..f35bbe209 100644
--- a/quantum/led_matrix.h
+++ b/quantum/led_matrix.h
@@ -19,61 +19,104 @@
 #pragma once
+#include <stdint.h>
+#include <stdbool.h>
 #include "led_matrix_types.h"
+#include "quantum.h"
-#ifndef BACKLIGHT_ENABLE
+#ifdef IS31FL3731
-#    error You must define BACKLIGHT_ENABLE with LED_MATRIX_ENABLE
+#    include "is31fl3731-simple.h"
 #endif
+#ifndef LED_MATRIX_LED_FLUSH_LIMIT
+#    define LED_MATRIX_LED_FLUSH_LIMIT 16
+#endif
+#ifndef LED_MATRIX_LED_PROCESS_LIMIT
+#    define LED_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5
+#endif
+#if defined(LED_MATRIX_LED_PROCESS_LIMIT) && LED_MATRIX_LED_PROCESS_LIMIT > 0 && LED_MATRIX_LED_PROCESS_LIMIT < DRIVER_LED_TOTAL
+#    define LED_MATRIX_USE_LIMITS(min, max)                        \
+        uint8_t min = LED_MATRIX_LED_PROCESS_LIMIT * params->iter; \
+        uint8_t max = min + LED_MATRIX_LED_PROCESS_LIMIT;          \
+        if (max > DRIVER_LED_TOTAL) max = DRIVER_LED_TOTAL;
+#else
+#    define LED_MATRIX_USE_LIMITS(min, max) \
+        uint8_t min = 0;                    \
+        uint8_t max = DRIVER_LED_TOTAL;
+#endif
+#define LED_MATRIX_TEST_LED_FLAGS() \
+    if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) continue
 enum led_matrix_effects {
-    LED_MATRIX_UNIFORM_BRIGHTNESS = 1,
+    LED_MATRIX_NONE = 0,
+    LED_MATRIX_UNIFORM_BRIGHTNESS,
    // All new effects go above this line
    LED_MATRIX_EFFECT_MAX
 };
-void led_matrix_set_index_value(int index, uint8_t value);
+void eeconfig_update_led_matrix_default(void);
-void led_matrix_set_index_value_all(uint8_t value);
+void eeconfig_update_led_matrix(void);
+void eeconfig_debug_led_matrix(void);
+uint8_t led_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t *led_i);
+uint8_t led_matrix_map_row_column_to_led(uint8_t row, uint8_t column, uint8_t *led_i);
+void led_matrix_set_value(int index, uint8_t value);
+void led_matrix_set_value_all(uint8_t value);
+void process_led_matrix(uint8_t row, uint8_t col, bool pressed);
+void led_matrix_task(void);
 // This runs after another backlight effect and replaces
-// colors already set
+// values already set
 void led_matrix_indicators(void);
 void led_matrix_indicators_kb(void);
 void led_matrix_indicators_user(void);
-void led_matrix_init(void);
+void led_matrix_indicators_advanced(effect_params_t *params);
-void led_matrix_setup_drivers(void);
+void led_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max);
+void led_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max);
-void led_matrix_set_suspend_state(bool state);
-void led_matrix_set_indicator_state(uint8_t state);
-void led_matrix_task(void);
+void led_matrix_init(void);
-// This should not be called from an interrupt
+void        led_matrix_set_suspend_state(bool state);
-// (eg. from a timer interrupt).
+bool        led_matrix_get_suspend_state(void);
-// Call this while idle (in between matrix scans).
+void        led_matrix_toggle(void);
-// If the buffer is dirty, it will update the driver with the buffer.
+void        led_matrix_toggle_noeeprom(void);
-void led_matrix_update_pwm_buffers(void);
+void        led_matrix_enable(void);
+void        led_matrix_enable_noeeprom(void);
-bool process_led_matrix(uint16_t keycode, keyrecord_t *record);
+void        led_matrix_disable(void);
+void        led_matrix_disable_noeeprom(void);
-uint32_t led_matrix_get_tick(void);
+uint8_t     led_matrix_is_enabled(void);
+void        led_matrix_mode(uint8_t mode);
-void    led_matrix_toggle(void);
+void        led_matrix_mode_noeeprom(uint8_t mode);
-void    led_matrix_enable(void);
+uint8_t     led_matrix_get_mode(void);
-void    led_matrix_enable_noeeprom(void);
+void        led_matrix_step(void);
-void    led_matrix_disable(void);
+void        led_matrix_step_noeeprom(void);
-void    led_matrix_disable_noeeprom(void);
+void        led_matrix_step_reverse(void);
-void    led_matrix_step(void);
+void        led_matrix_step_reverse_noeeprom(void);
-void    led_matrix_step_reverse(void);
+void        led_matrix_set_val(uint8_t val);
-void    led_matrix_increase_val(void);
+void        led_matrix_set_val_noeeprom(uint8_t val);
-void    led_matrix_decrease_val(void);
+uint8_t     led_matrix_get_val(void);
-void    led_matrix_increase_speed(void);
+void        led_matrix_increase_val(void);
-void    led_matrix_decrease_speed(void);
+void        led_matrix_increase_val_noeeprom(void);
-void    led_matrix_mode(uint8_t mode, bool eeprom_write);
+void        led_matrix_decrease_val(void);
-void    led_matrix_mode_noeeprom(uint8_t mode);
+void        led_matrix_decrease_val_noeeprom(void);
-uint8_t led_matrix_get_mode(void);
+void        led_matrix_set_speed(uint8_t speed);
-void    led_matrix_set_value(uint8_t mode);
+void        led_matrix_set_speed_noeeprom(uint8_t speed);
-void    led_matrix_set_value_noeeprom(uint8_t mode);
+uint8_t     led_matrix_get_speed(void);
+void        led_matrix_increase_speed(void);
+void        led_matrix_increase_speed_noeeprom(void);
+void        led_matrix_decrease_speed(void);
+void        led_matrix_decrease_speed_noeeprom(void);
+led_flags_t led_matrix_get_flags(void);
+void        led_matrix_set_flags(led_flags_t flags);
 typedef struct {
    /* Perform any initialisation required for the other driver functions to work. */
@@ -91,4 +134,12 @@ extern const led_matrix_driver_t led_matrix_driver;
 extern led_eeconfig_t led_matrix_eeconfig;
+extern bool         g_suspend_state;
+extern uint32_t     g_led_timer;
 extern led_config_t g_led_config;
+#ifdef LED_MATRIX_KEYREACTIVE_ENABLED
+extern last_hit_t g_last_hit_tracker;
+#endif
+#ifdef LED_MATRIX_FRAMEBUFFER_EFFECTS
+extern uint8_t g_led_frame_buffer[MATRIX_ROWS][MATRIX_COLS];
+#endif
diff --git a/quantum/led_matrix_drivers.c b/quantum/led_matrix_drivers.c
index eddf3f286..370c5e685 100644
--- a/quantum/led_matrix_drivers.c
+++ b/quantum/led_matrix_drivers.c
@@ -15,9 +15,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <stdint.h>
-#include <stdbool.h>
-#include "quantum.h"
 #include "led_matrix.h"
 /* Each driver needs to define a struct:
@@ -30,10 +27,6 @@
 #if defined(IS31FL3731) || defined(IS31FL3733)
-#    if defined(IS31FL3731)
-#        include "is31fl3731-simple.h"
-#    endif
 #    include "i2c_master.h"
 static void init(void) {
diff --git a/quantum/led_matrix_types.h b/quantum/led_matrix_types.h
index 669b67042..13f44b07e 100644
--- a/quantum/led_matrix_types.h
+++ b/quantum/led_matrix_types.h
@@ -29,16 +29,43 @@
 #    pragma pack(push, 1)
 #endif
+#if defined(LED_MATRIX_KEYPRESSES) || defined(LED_MATRIX_KEYRELEASES)
+#    define LED_MATRIX_KEYREACTIVE_ENABLED
+#endif
 // Last led hit
 #ifndef LED_HITS_TO_REMEMBER
 #    define LED_HITS_TO_REMEMBER 8
 #endif  // LED_HITS_TO_REMEMBER
+#ifdef LED_MATRIX_KEYREACTIVE_ENABLED
+typedef struct PACKED {
+    uint8_t  count;
+    uint8_t  x[LED_HITS_TO_REMEMBER];
+    uint8_t  y[LED_HITS_TO_REMEMBER];
+    uint8_t  index[LED_HITS_TO_REMEMBER];
+    uint16_t tick[LED_HITS_TO_REMEMBER];
+} last_hit_t;
+#endif  // LED_MATRIX_KEYREACTIVE_ENABLED
+typedef enum led_task_states { STARTING, RENDERING, FLUSHING, SYNCING } led_task_states;
+typedef uint8_t led_flags_t;
+typedef struct PACKED {
+    uint8_t     iter;
+    led_flags_t flags;
+    bool        init;
+} effect_params_t;
 typedef struct PACKED {
    uint8_t x;
    uint8_t y;
 } point_t;
+#define HAS_FLAGS(bits, flags) ((bits & flags) == flags)
+#define HAS_ANY_FLAGS(bits, flags) ((bits & flags) != 0x00)
 #define LED_FLAG_ALL 0xFF
 #define LED_FLAG_NONE 0x00
 #define LED_FLAG_MODIFIER 0x01
@@ -56,11 +83,12 @@ typedef struct PACKED {
 typedef union {
    uint32_t raw;
    struct PACKED {
-        uint8_t  enable : 2;
+        uint8_t     enable : 2;
-        uint8_t  mode : 6;
+        uint8_t     mode : 6;
-        uint16_t reserved;
+        uint16_t    reserved;
-        uint8_t  val;
+        uint8_t     val;
-        uint8_t  speed;  // EECONFIG needs to be increased to support this
+        uint8_t     speed;  // EECONFIG needs to be increased to support this
+        led_flags_t flags;
    };
 } led_eeconfig_t;
diff --git a/quantum/matrix.h b/quantum/matrix.h
index ce57010a4..3fe691aae 100644
--- a/quantum/matrix.h
+++ b/quantum/matrix.h
@@ -74,6 +74,11 @@ void matrix_scan_kb(void);
 void matrix_init_user(void);
 void matrix_scan_user(void);
+#ifdef SPLIT_KEYBOARD
+void matrix_slave_scan_kb(void);
+void matrix_slave_scan_user(void);
+#endif
 #ifdef __cplusplus
 }
 #endif
diff --git a/quantum/mcu_selection.mk b/quantum/mcu_selection.mk
index f7329fc4d..edf44f5dc 100644
--- a/quantum/mcu_selection.mk
+++ b/quantum/mcu_selection.mk
@@ -81,6 +81,33 @@ ifneq ($(findstring MK20DX256, $(MCU)),)
  BOARD ?= PJRC_TEENSY_3_1
 endif
+ifneq ($(findstring MK66F18, $(MCU)),)
+  # Cortex version
+  MCU = cortex-m4
+  # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
+  ARMV = 7
+  ## chip/board settings
+  # - the next two should match the directories in
+  #   <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
+  MCU_FAMILY = KINETIS
+  MCU_SERIES = MK66F18
+  # Linker script to use
+  # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
+  #   or <keyboard_dir>/ld/
+  MCU_LDSCRIPT ?= MK66FX1M0
+  # Startup code to use
+  #  - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
+  MCU_STARTUP ?= MK66F18
+  # Board: it should exist either in <chibios>/os/hal/boards/,
+  # <keyboard_dir>/boards/, or drivers/boards/
+  BOARD ?= PJRC_TEENSY_3_6
+endif
 ifneq ($(findstring STM32F042, $(MCU)),)
  # Cortex version
  MCU = cortex-m0
@@ -112,6 +139,9 @@ ifneq ($(findstring STM32F042, $(MCU)),)
  # Options to pass to dfu-util when flashing
  DFU_ARGS ?= -d 0483:DF11 -a 0 -s 0x08000000:leave
  DFU_SUFFIX_ARGS ?= -v 0483 -p DF11
+  # UF2 settings
+  UF2_FAMILY ?= STM32F0
 endif
 ifneq ($(findstring STM32F072, $(MCU)),)
@@ -145,6 +175,9 @@ ifneq ($(findstring STM32F072, $(MCU)),)
  # Options to pass to dfu-util when flashing
  DFU_ARGS ?= -d 0483:DF11 -a 0 -s 0x08000000:leave
  DFU_SUFFIX_ARGS ?= -v 0483 -p DF11
+  # UF2 settings
+  UF2_FAMILY ?= STM32F0
 endif
 ifneq ($(findstring STM32F103, $(MCU)),)
@@ -178,6 +211,9 @@ ifneq ($(findstring STM32F103, $(MCU)),)
  # Options to pass to dfu-util when flashing
  DFU_ARGS ?= -d 0483:DF11 -a 0 -s 0x08000000:leave
  DFU_SUFFIX_ARGS ?= -v 0483 -p DF11
+  # UF2 settings
+  UF2_FAMILY ?= STM32F1
 endif
 ifneq ($(findstring STM32F303, $(MCU)),)
@@ -211,6 +247,9 @@ ifneq ($(findstring STM32F303, $(MCU)),)
  # Options to pass to dfu-util when flashing
  DFU_ARGS ?= -d 0483:DF11 -a 0 -s 0x08000000:leave
  DFU_SUFFIX_ARGS ?= -v 0483 -p DF11
+  # UF2 settings
+  UF2_FAMILY ?= STM32F3
 endif
 ifneq ($(findstring STM32F401, $(MCU)),)
@@ -244,6 +283,9 @@ ifneq ($(findstring STM32F401, $(MCU)),)
  # Options to pass to dfu-util when flashing
  DFU_ARGS ?= -d 0483:DF11 -a 0 -s 0x08000000:leave
  DFU_SUFFIX_ARGS ?= -v 0483 -p DF11
+  # UF2 settings
+  UF2_FAMILY ?= STM32F4
 endif
 ifneq ($(findstring STM32F411, $(MCU)),)
@@ -262,7 +304,12 @@ ifneq ($(findstring STM32F411, $(MCU)),)
  # Linker script to use
  # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
  #   or <keyboard_dir>/ld/
-  MCU_LDSCRIPT ?= STM32F411xE
+  ifeq ($(strip $(BOOTLOADER)), tinyuf2)
+    MCU_LDSCRIPT ?= STM32F411xE_tinyuf2
+    FIRMWARE_FORMAT ?= uf2
+  else
+    MCU_LDSCRIPT ?= STM32F411xE
+  endif
  # Startup code to use
  #  - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
@@ -277,6 +324,43 @@ ifneq ($(findstring STM32F411, $(MCU)),)
  # Options to pass to dfu-util when flashing
  DFU_ARGS ?= -d 0483:DF11 -a 0 -s 0x08000000:leave
  DFU_SUFFIX_ARGS ?= -v 0483 -p DF11
+  # UF2 settings
+  UF2_FAMILY ?= STM32F4
+endif
+ifneq ($(findstring STM32F446, $(MCU)),)
+  # Cortex version
+  MCU = cortex-m4
+  # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
+  ARMV = 7
+  ## chip/board settings
+  # - the next two should match the directories in
+  #   <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
+  MCU_FAMILY = STM32
+  MCU_SERIES = STM32F4xx
+  # Linker script to use
+  # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
+  #   or <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
+  #   or <keyboard_dir>/ld/
+  MCU_LDSCRIPT ?= STM32F446xE
+  # Startup code to use
+  #  - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
+  MCU_STARTUP ?= stm32f4xx
+  # Board: it should exist either in <chibios>/os/hal/boards/,
+  # <keyboard_dir>/boards/, or drivers/boards/
+  BOARD ?= GENERIC_STM32_F446XE
+  USE_FPU ?= yes
+  # Options to pass to dfu-util when flashing
+  DFU_ARGS ?= -d 0483:DF11 -a 0 -s 0x08000000:leave
+  DFU_SUFFIX_ARGS ?= -v 0483 -p DF11
 endif
 ifneq ($(findstring STM32G431, $(MCU)),)
@@ -310,6 +394,9 @@ ifneq ($(findstring STM32G431, $(MCU)),)
  # Options to pass to dfu-util when flashing
  DFU_ARGS ?= -d 0483:DF11 -a 0 -s 0x08000000:leave
  DFU_SUFFIX_ARGS ?= -v 0483 -p DF11
+  # UF2 settings
+  UF2_FAMILY ?= STM32G4
 endif
 ifneq ($(findstring STM32G474, $(MCU)),)
@@ -343,6 +430,9 @@ ifneq ($(findstring STM32G474, $(MCU)),)
  # Options to pass to dfu-util when flashing
  DFU_ARGS ?= -d 0483:DF11 -a 0 -s 0x08000000:leave
  DFU_SUFFIX_ARGS ?= -v 0483 -p DF11
+  # UF2 settings
+  UF2_FAMILY ?= STM32G4
 endif
 ifneq (,$(filter $(MCU),at90usb162 atmega16u2 atmega32u2 atmega16u4 atmega32u4 at90usb646 at90usb647 at90usb1286 at90usb1287))
diff --git a/quantum/process_keycode/process_auto_shift.c b/quantum/process_keycode/process_auto_shift.c
index bf359e994..51b0efdb4 100644
--- a/quantum/process_keycode/process_auto_shift.c
+++ b/quantum/process_keycode/process_auto_shift.c
@@ -216,7 +216,18 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
 #    endif
        }
    }
+    if (get_auto_shifted_key(keycode, record)) {
+        if (record->event.pressed) {
+            return autoshift_press(keycode, now, record);
+        } else {
+            autoshift_end(keycode, now, false);
+            return false;
+        }
+    }
+    return true;
+}
+__attribute__((weak)) bool get_auto_shifted_key(uint16_t keycode, keyrecord_t *record) {
    switch (keycode) {
 #    ifndef NO_AUTO_SHIFT_ALPHA
        case KC_A ... KC_Z:
@@ -229,14 +240,9 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
        case KC_MINUS ... KC_SLASH:
        case KC_NONUS_BSLASH:
 #    endif
-            if (record->event.pressed) {
+            return true;
-                return autoshift_press(keycode, now, record);
-            } else {
-                autoshift_end(keycode, now, false);
-                return false;
-            }
    }
-    return true;
+    return false;
 }
 #endif
diff --git a/quantum/process_keycode/process_auto_shift.h b/quantum/process_keycode/process_auto_shift.h
index 5b2718f11..00a9ab036 100644
--- a/quantum/process_keycode/process_auto_shift.h
+++ b/quantum/process_keycode/process_auto_shift.h
@@ -31,3 +31,4 @@ bool     get_autoshift_state(void);
 uint16_t get_autoshift_timeout(void);
 void     set_autoshift_timeout(uint16_t timeout);
 void     autoshift_matrix_scan(void);
+bool     get_auto_shifted_key(uint16_t keycode, keyrecord_t *record);
diff --git a/quantum/process_keycode/process_backlight.c b/quantum/process_keycode/process_backlight.c
index 4d12f6813..8b70339a5 100644
--- a/quantum/process_keycode/process_backlight.c
+++ b/quantum/process_keycode/process_backlight.c
@@ -16,11 +16,35 @@
 #include "process_backlight.h"
-#include "backlight.h"
+#ifdef LED_MATRIX_ENABLE
+#    include "led_matrix.h"
+#else
+#    include "backlight.h"
+#endif
 bool process_backlight(uint16_t keycode, keyrecord_t *record) {
    if (record->event.pressed) {
        switch (keycode) {
+#ifdef LED_MATRIX_ENABLE
+            case BL_ON:
+                led_matrix_enable();
+                return false;
+            case BL_OFF:
+                led_matrix_disable();
+                return false;
+            case BL_DEC:
+                led_matrix_decrease_val();
+                return false;
+            case BL_INC:
+                led_matrix_increase_val();
+                return false;
+            case BL_TOGG:
+                led_matrix_toggle();
+                return false;
+            case BL_STEP:
+                led_matrix_step();
+                return false;
+#else
            case BL_ON:
                backlight_level(BACKLIGHT_LEVELS);
                return false;
@@ -39,10 +63,11 @@ bool process_backlight(uint16_t keycode, keyrecord_t *record) {
            case BL_STEP:
                backlight_step();
                return false;
-#ifdef BACKLIGHT_BREATHING
+#    ifdef BACKLIGHT_BREATHING
            case BL_BRTG:
                backlight_toggle_breathing();
                return false;
+#    endif
 #endif
        }
    }
diff --git a/quantum/process_keycode/process_leader.c b/quantum/process_keycode/process_leader.c
index 58a615d85..cf63f2514 100644
--- a/quantum/process_keycode/process_leader.c
+++ b/quantum/process_keycode/process_leader.c
@@ -49,7 +49,10 @@ bool process_leader(uint16_t keycode, keyrecord_t *record) {
    // Leader key set-up
    if (record->event.pressed) {
        if (leading) {
-            if (timer_elapsed(leader_time) < LEADER_TIMEOUT) {
+#    ifndef LEADER_NO_TIMEOUT
+            if (timer_elapsed(leader_time) < LEADER_TIMEOUT)
+#    endif  // LEADER_NO_TIMEOUT
+            {
 #    ifndef LEADER_KEY_STRICT_KEY_PROCESSING
                if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) {
                    keycode = keycode & 0xFF;
diff --git a/quantum/process_keycode/process_leader.h b/quantum/process_keycode/process_leader.h
index 9844f27a1..32ccd42f7 100644
--- a/quantum/process_keycode/process_leader.h
+++ b/quantum/process_keycode/process_leader.h
@@ -35,4 +35,11 @@ void qk_leader_start(void);
    extern uint16_t leader_time;        \
    extern uint16_t leader_sequence[5]; \
    extern uint8_t  leader_sequence_size
-#define LEADER_DICTIONARY() if (leading && timer_elapsed(leader_time) > LEADER_TIMEOUT)
+#ifdef LEADER_NO_TIMEOUT
+#    define LEADER_DICTIONARY() if (leading && leader_sequence_size > 0 && timer_elapsed(leader_time) > LEADER_TIMEOUT)
+#else
+#    define LEADER_DICTIONARY() if (leading && timer_elapsed(leader_time) > LEADER_TIMEOUT)
+#endif
+#endif
diff --git a/quantum/process_keycode/process_rgb.c b/quantum/process_keycode/process_rgb.c
index 5dd8e7809..167c0c03c 100644
--- a/quantum/process_keycode/process_rgb.c
+++ b/quantum/process_keycode/process_rgb.c
@@ -207,6 +207,11 @@ bool process_rgb(const uint16_t keycode, const keyrecord_t *record) {
                rgblight_mode(RGBLIGHT_MODE_RGB_TEST);
 #endif
                return false;
+            case RGB_MODE_TWINKLE:
+#if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) && defined(RGBLIGHT_EFFECT_TWINKLE)
+                handleKeycodeRGBMode(RGBLIGHT_MODE_TWINKLE, RGBLIGHT_MODE_TWINKLE_end);
+#endif
+                return false;
        }
    }
diff --git a/quantum/quantum.c b/quantum/quantum.c
index b40b40544..8ccdb774b 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -15,6 +15,7 @@
 */
 #include "quantum.h"
+#include "magic.h"
 #ifdef BLUETOOTH_ENABLE
 #    include "outputselect.h"
@@ -233,7 +234,7 @@ bool process_record_quantum(keyrecord_t *record) {
 #ifdef AUDIO_ENABLE
            process_audio(keycode, record) &&
 #endif
-#ifdef BACKLIGHT_ENABLE
+#if defined(BACKLIGHT_ENABLE) || defined(LED_MATRIX_ENABLE)
            process_backlight(keycode, record) &&
 #endif
 #ifdef STENO_ENABLE
@@ -318,6 +319,17 @@ bool process_record_quantum(keyrecord_t *record) {
                set_output(OUTPUT_BLUETOOTH);
                return false;
 #endif
+#ifndef NO_ACTION_ONESHOT
+            case ONESHOT_TOGGLE:
+                oneshot_toggle();
+                break;
+            case ONESHOT_ENABLE:
+                oneshot_enable();
+                break;
+            case ONESHOT_DISABLE:
+                oneshot_disable();
+                break;
+#endif
        }
    }
@@ -341,26 +353,20 @@ layer_state_t update_tri_layer_state(layer_state_t state, uint8_t layer1, uint8_
 void update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3) { layer_state_set(update_tri_layer_state(layer_state, layer1, layer2, layer3)); }
 void matrix_init_quantum() {
-#ifdef BOOTMAGIC_LITE
+    magic();
-    bootmagic_lite();
-#endif
-    if (!eeconfig_is_enabled()) {
-        eeconfig_init();
-    }
 #if defined(LED_NUM_LOCK_PIN) || defined(LED_CAPS_LOCK_PIN) || defined(LED_SCROLL_LOCK_PIN) || defined(LED_COMPOSE_PIN) || defined(LED_KANA_PIN)
    // TODO: remove calls to led_init_ports from keyboards and remove ifdef
    led_init_ports();
 #endif
 #ifdef BACKLIGHT_ENABLE
-#    ifdef LED_MATRIX_ENABLE
-    led_matrix_init();
-#    else
    backlight_init_ports();
-#    endif
 #endif
 #ifdef AUDIO_ENABLE
    audio_init();
 #endif
+#ifdef LED_MATRIX_ENABLE
+    led_matrix_init();
+#endif
 #ifdef RGB_MATRIX_ENABLE
    rgb_matrix_init();
 #endif
diff --git a/quantum/quantum.h b/quantum/quantum.h
index e24a4c43a..fe6bf310a 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -30,11 +30,11 @@
 #include "keymap.h"
 #ifdef BACKLIGHT_ENABLE
-#    ifdef LED_MATRIX_ENABLE
+#    include "backlight.h"
-#        include "led_matrix.h"
+#endif
-#    else
-#        include "backlight.h"
+#ifdef LED_MATRIX_ENABLE
-#    endif
+#    include "led_matrix.h"
 #endif
 #if defined(RGBLIGHT_ENABLE)
@@ -52,6 +52,7 @@
 #include "action_layer.h"
 #include "eeconfig.h"
 #include "bootloader.h"
+#include "bootmagic.h"
 #include "timer.h"
 #include "sync_timer.h"
 #include "config_common.h"
@@ -97,7 +98,7 @@ extern layer_state_t layer_state;
 #    include "process_music.h"
 #endif
-#ifdef BACKLIGHT_ENABLE
+#if defined(BACKLIGHT_ENABLE) || defined(LED_MATRIX_ENABLE)
 #    include "process_backlight.h"
 #endif
@@ -199,39 +200,6 @@ extern layer_state_t layer_state;
 #    include "usbpd.h"
 #endif
-// Function substitutions to ease GPIO manipulation
-#if defined(__AVR__)
-/*   The AVR series GPIOs have a one clock read delay for changes in the digital input signal.
- *   But here's more margin to make it two clocks. */
-#    if !defined(GPIO_INPUT_PIN_DELAY)
-#        define GPIO_INPUT_PIN_DELAY 2
-#    endif
-#    define waitInputPinDelay() wait_cpuclock(GPIO_INPUT_PIN_DELAY)
-#elif defined(__ARMEL__) || defined(__ARMEB__)
-/* For GPIOs on ARM-based MCUs, the input pins are sampled by the clock of the bus
- * to which the GPIO is connected.
- * The connected buses differ depending on the various series of MCUs.
- * And since the instruction execution clock of the CPU and the bus clock of GPIO are different,
- * there is a delay of several clocks to read the change of the input signal.
- *
- * Define this delay with the GPIO_INPUT_PIN_DELAY macro.
- * If the GPIO_INPUT_PIN_DELAY macro is not defined, the following default values will be used.
- * (A fairly large value of 0.25 microseconds is set.)
- */
-#    if !defined(GPIO_INPUT_PIN_DELAY)
-#        if defined(STM32_SYSCLK)
-#            define GPIO_INPUT_PIN_DELAY (STM32_SYSCLK / 1000000L / 4)
-#        elif defined(KINETIS_SYSCLK_FREQUENCY)
-#            define GPIO_INPUT_PIN_DELAY (KINETIS_SYSCLK_FREQUENCY / 1000000L / 4)
-#        endif
-#    endif
-#    define waitInputPinDelay() wait_cpuclock(GPIO_INPUT_PIN_DELAY)
-#endif
 // For tri-layer
 void          update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3);
 layer_state_t update_tri_layer_state(layer_state_t state, uint8_t layer1, uint8_t layer2, uint8_t layer3);
@@ -256,15 +224,6 @@ bool     process_record_user(uint16_t keycode, keyrecord_t *record);
 void     post_process_record_kb(uint16_t keycode, keyrecord_t *record);
 void     post_process_record_user(uint16_t keycode, keyrecord_t *record);
-#ifndef BOOTMAGIC_LITE_COLUMN
-#    define BOOTMAGIC_LITE_COLUMN 0
-#endif
-#ifndef BOOTMAGIC_LITE_ROW
-#    define BOOTMAGIC_LITE_ROW 0
-#endif
-void bootmagic_lite(void);
 void reset_keyboard(void);
 void startup_user(void);
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index e49f8dcda..26021598a 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -16,19 +16,7 @@
 #pragma once
-#if defined(SEQUENCER_ENABLE)
+#include "sequencer.h"
-#    include "sequencer.h"
-#endif
-#ifndef MIDI_ENABLE_STRICT
-#    define MIDI_ENABLE_STRICT 0
-#endif
-#if !MIDI_ENABLE_STRICT || (defined(MIDI_ENABLE) && defined(MIDI_ADVANCED))
-#    ifndef MIDI_TONE_KEYCODE_OCTAVES
-#        define MIDI_TONE_KEYCODE_OCTAVES 3
-#    endif
-#endif
 // Fillers to make layering more clear
 #define _______ KC_TRNS
@@ -67,6 +55,8 @@ enum quantum_keycodes {
    QK_ONE_SHOT_LAYER_MAX   = 0x54FF,
    QK_ONE_SHOT_MOD         = 0x5500,
    QK_ONE_SHOT_MOD_MAX     = 0x55FF,
+    QK_SWAP_HANDS           = 0x5600,
+    QK_SWAP_HANDS_MAX       = 0x56FF,
    QK_TAP_DANCE            = 0x5700,
    QK_TAP_DANCE_MAX        = 0x57FF,
    QK_LAYER_TAP_TOGGLE     = 0x5800,
@@ -77,507 +67,458 @@ enum quantum_keycodes {
    QK_STENO_BOLT           = 0x5A30,
    QK_STENO_GEMINI         = 0x5A31,
    QK_STENO_MAX            = 0x5A3F,
-    QK_SWAP_HANDS           = 0x5B00,
+    // 0x5C00 - 0x5FFF are reserved, see below
-    QK_SWAP_HANDS_MAX       = 0x5BFF,
+    QK_MOD_TAP             = 0x6000,
-    QK_MOD_TAP              = 0x6000,
+    QK_MOD_TAP_MAX         = 0x7FFF,
-    QK_MOD_TAP_MAX          = 0x7FFF,
+    QK_UNICODE             = 0x8000,
-    QK_UNICODE              = 0x8000,
+    QK_UNICODE_MAX         = 0xFFFF,
-    QK_UNICODE_MAX          = 0xFFFF,
+    QK_UNICODEMAP          = 0x8000,
-    QK_UNICODEMAP           = 0x8000,
+    QK_UNICODEMAP_MAX      = 0xBFFF,
-    QK_UNICODEMAP_MAX       = 0xBFFF,
+    QK_UNICODEMAP_PAIR     = 0xC000,
-    QK_UNICODEMAP_PAIR      = 0xC000,
+    QK_UNICODEMAP_PAIR_MAX = 0xFFFF,
-    QK_UNICODEMAP_PAIR_MAX  = 0xFFFF,
    // Loose keycodes - to be used directly
    RESET = 0x5C00,
-    DEBUG,
+    DEBUG,  // 5C01
-    MAGIC_SWAP_CONTROL_CAPSLOCK,
-    MAGIC_CAPSLOCK_TO_CONTROL,
+    // Magic
-    MAGIC_SWAP_LALT_LGUI,
+    MAGIC_SWAP_CONTROL_CAPSLOCK,       // 5C02
-    MAGIC_SWAP_RALT_RGUI,
+    MAGIC_CAPSLOCK_TO_CONTROL,         // 5C03
-    MAGIC_NO_GUI,
+    MAGIC_SWAP_LALT_LGUI,              // 5C04
-    MAGIC_SWAP_GRAVE_ESC,
+    MAGIC_SWAP_RALT_RGUI,              // 5C05
-    MAGIC_SWAP_BACKSLASH_BACKSPACE,
+    MAGIC_NO_GUI,                      // 5C06
-    MAGIC_HOST_NKRO,
+    MAGIC_SWAP_GRAVE_ESC,              // 5C07
-    MAGIC_SWAP_ALT_GUI,
+    MAGIC_SWAP_BACKSLASH_BACKSPACE,    // 5C08
-    MAGIC_UNSWAP_CONTROL_CAPSLOCK,
+    MAGIC_HOST_NKRO,                   // 5C09
-    MAGIC_UNCAPSLOCK_TO_CONTROL,
+    MAGIC_SWAP_ALT_GUI,                // 5C0A
-    MAGIC_UNSWAP_LALT_LGUI,
+    MAGIC_UNSWAP_CONTROL_CAPSLOCK,     // 5C0B
-    MAGIC_UNSWAP_RALT_RGUI,
+    MAGIC_UNCAPSLOCK_TO_CONTROL,       // 5C0C
-    MAGIC_UNNO_GUI,
+    MAGIC_UNSWAP_LALT_LGUI,            // 5C0D
-    MAGIC_UNSWAP_GRAVE_ESC,
+    MAGIC_UNSWAP_RALT_RGUI,            // 5C0E
-    MAGIC_UNSWAP_BACKSLASH_BACKSPACE,
+    MAGIC_UNNO_GUI,                    // 5C0F
-    MAGIC_UNHOST_NKRO,
+    MAGIC_UNSWAP_GRAVE_ESC,            // 5C10
-    MAGIC_UNSWAP_ALT_GUI,
+    MAGIC_UNSWAP_BACKSLASH_BACKSPACE,  // 5C11
-    MAGIC_TOGGLE_NKRO,
+    MAGIC_UNHOST_NKRO,                 // 5C12
-    MAGIC_TOGGLE_ALT_GUI,
+    MAGIC_UNSWAP_ALT_GUI,              // 5C13
-    GRAVE_ESC,
+    MAGIC_TOGGLE_NKRO,                 // 5C14
+    MAGIC_TOGGLE_ALT_GUI,              // 5C15
-// Leader key
-#ifdef LEADER_ENABLE
+    // Grave Escape
-    KC_LEAD,
+    GRAVE_ESC,  // 5C16
-#endif
+    // Auto Shift
-// Auto Shift setup
+    KC_ASUP,   // 5C17
-#ifndef AUTO_SHIFT_NO_SETUP
+    KC_ASDN,   // 5C18
-    KC_ASUP,
+    KC_ASRP,   // 5C19
-    KC_ASDN,
+    KC_ASTG,   // 5C1A
-    KC_ASRP,
+    KC_ASON,   // 5C1B
-#endif
+    KC_ASOFF,  // 5C1C
-    KC_ASTG,
-    KC_ASON,
+    // Audio
-    KC_ASOFF,
+    AU_ON,   // 5C1D
+    AU_OFF,  // 5C1E
-    // Audio on/off/toggle
+    AU_TOG,  // 5C1F
-    AU_ON,
-    AU_OFF,
+    // Audio Clicky
-    AU_TOG,
+    CLICKY_TOGGLE,   // 5C20
+    CLICKY_ENABLE,   // 5C21
-    // Faux clicky as part of main audio feature
+    CLICKY_DISABLE,  // 5C22
-    CLICKY_TOGGLE,
+    CLICKY_UP,       // 5C23
-    CLICKY_ENABLE,
+    CLICKY_DOWN,     // 5C24
-    CLICKY_DISABLE,
+    CLICKY_RESET,    // 5C25
-    CLICKY_UP,
-    CLICKY_DOWN,
+    // Music mode
-    CLICKY_RESET,
+    MU_ON,   // 5C26
+    MU_OFF,  // 5C27
-    // Music mode on/off/toggle
+    MU_TOG,  // 5C28
-    MU_ON,
+    MU_MOD,  // 5C29
-    MU_OFF,
+    MUV_IN,  // 5C2A
-    MU_TOG,
+    MUV_DE,  // 5C2B
-    // Music mode cycle
+    // MIDI
-    MU_MOD,
+    MI_ON,   // 5C2C
+    MI_OFF,  // 5C2D
-    // Music voice iterate
+    MI_TOG,  // 5C2E
-    MUV_IN,
-    MUV_DE,
+    MI_C,   // 5C2F
+    MI_Cs,  // 5C30
-// Midi
-#if !MIDI_ENABLE_STRICT || (defined(MIDI_ENABLE) && defined(MIDI_BASIC))
-    MI_ON,
-    MI_OFF,
-    MI_TOG,
-#endif
-#if !MIDI_ENABLE_STRICT || (defined(MIDI_ENABLE) && defined(MIDI_ADVANCED))
-    MIDI_TONE_MIN,
-#    if !MIDI_ENABLE_STRICT || MIDI_TONE_KEYCODE_OCTAVES > 0
-    MI_C = MIDI_TONE_MIN,
-    MI_Cs,
    MI_Db = MI_Cs,
-    MI_D,
+    MI_D,   // 5C31
-    MI_Ds,
+    MI_Ds,  // 5C32
    MI_Eb = MI_Ds,
-    MI_E,
+    MI_E,   // 5C33
-    MI_F,
+    MI_F,   // 5C34
-    MI_Fs,
+    MI_Fs,  // 5C35
    MI_Gb = MI_Fs,
-    MI_G,
+    MI_G,   // 5C36
-    MI_Gs,
+    MI_Gs,  // 5C37
    MI_Ab = MI_Gs,
-    MI_A,
+    MI_A,   // 5C38
-    MI_As,
+    MI_As,  // 5C39
    MI_Bb = MI_As,
-    MI_B,
+    MI_B,  // 5C3A
-#    endif
-#    if !MIDI_ENABLE_STRICT || MIDI_TONE_KEYCODE_OCTAVES > 1
+    MI_C_1,   // 5C3B
-    MI_C_1,
+    MI_Cs_1,  // 5C3C
-    MI_Cs_1,
    MI_Db_1 = MI_Cs_1,
-    MI_D_1,
+    MI_D_1,   // 5C3D
-    MI_Ds_1,
+    MI_Ds_1,  // 5C3E
    MI_Eb_1 = MI_Ds_1,
-    MI_E_1,
+    MI_E_1,   // 5C3F
-    MI_F_1,
+    MI_F_1,   // 5C40
-    MI_Fs_1,
+    MI_Fs_1,  // 5C41
    MI_Gb_1 = MI_Fs_1,
-    MI_G_1,
+    MI_G_1,   // 5C42
-    MI_Gs_1,
+    MI_Gs_1,  // 5C43
    MI_Ab_1 = MI_Gs_1,
-    MI_A_1,
+    MI_A_1,   // 5C44
-    MI_As_1,
+    MI_As_1,  // 5C45
    MI_Bb_1 = MI_As_1,
-    MI_B_1,
+    MI_B_1,  // 5C46
-#    endif
-#    if !MIDI_ENABLE_STRICT || MIDI_TONE_KEYCODE_OCTAVES > 2
+    MI_C_2,   // 5C47
-    MI_C_2,
+    MI_Cs_2,  // 5C48
-    MI_Cs_2,
    MI_Db_2 = MI_Cs_2,
-    MI_D_2,
+    MI_D_2,   // 5C49
-    MI_Ds_2,
+    MI_Ds_2,  // 5C4A
    MI_Eb_2 = MI_Ds_2,
-    MI_E_2,
+    MI_E_2,   // 5C4B
-    MI_F_2,
+    MI_F_2,   // 5C4C
-    MI_Fs_2,
+    MI_Fs_2,  // 5C4D
    MI_Gb_2 = MI_Fs_2,
-    MI_G_2,
+    MI_G_2,   // 5C4E
-    MI_Gs_2,
+    MI_Gs_2,  // 5C4F
    MI_Ab_2 = MI_Gs_2,
-    MI_A_2,
+    MI_A_2,   // 5C50
-    MI_As_2,
+    MI_As_2,  // 5C51
    MI_Bb_2 = MI_As_2,
-    MI_B_2,
+    MI_B_2,  // 5C52
-#    endif
-#    if !MIDI_ENABLE_STRICT || MIDI_TONE_KEYCODE_OCTAVES > 3
+    MI_C_3,   // 5C53
-    MI_C_3,
+    MI_Cs_3,  // 5C54
-    MI_Cs_3,
    MI_Db_3 = MI_Cs_3,
-    MI_D_3,
+    MI_D_3,   // 5C55
-    MI_Ds_3,
+    MI_Ds_3,  // 5C56
    MI_Eb_3 = MI_Ds_3,
-    MI_E_3,
+    MI_E_3,   // 5C57
-    MI_F_3,
+    MI_F_3,   // 5C58
-    MI_Fs_3,
+    MI_Fs_3,  // 5C59
    MI_Gb_3 = MI_Fs_3,
-    MI_G_3,
+    MI_G_3,   // 5C5A
-    MI_Gs_3,
+    MI_Gs_3,  // 5C5B
    MI_Ab_3 = MI_Gs_3,
-    MI_A_3,
+    MI_A_3,   // 5C5C
-    MI_As_3,
+    MI_As_3,  // 5C5D
    MI_Bb_3 = MI_As_3,
-    MI_B_3,
+    MI_B_3,  // 5C5E
-#    endif
-#    if !MIDI_ENABLE_STRICT || MIDI_TONE_KEYCODE_OCTAVES > 4
+    MI_C_4,   // 5C5F
-    MI_C_4,
+    MI_Cs_4,  // 5C60
-    MI_Cs_4,
    MI_Db_4 = MI_Cs_4,
-    MI_D_4,
+    MI_D_4,   // 5C61
-    MI_Ds_4,
+    MI_Ds_4,  // 5C62
    MI_Eb_4 = MI_Ds_4,
-    MI_E_4,
+    MI_E_4,   // 5C63
-    MI_F_4,
+    MI_F_4,   // 5C64
-    MI_Fs_4,
+    MI_Fs_4,  // 5C65
    MI_Gb_4 = MI_Fs_4,
-    MI_G_4,
+    MI_G_4,   // 5C66
-    MI_Gs_4,
+    MI_Gs_4,  // 5C67
    MI_Ab_4 = MI_Gs_4,
-    MI_A_4,
+    MI_A_4,   // 5C68
-    MI_As_4,
+    MI_As_4,  // 5C69
    MI_Bb_4 = MI_As_4,
-    MI_B_4,
+    MI_B_4,  // 5C6A
-#    endif
-#    if !MIDI_ENABLE_STRICT || MIDI_TONE_KEYCODE_OCTAVES > 5
+    MI_C_5,   // 5C6B
-    MI_C_5,
+    MI_Cs_5,  // 5C6C
-    MI_Cs_5,
    MI_Db_5 = MI_Cs_5,
-    MI_D_5,
+    MI_D_5,   // 5C6D
-    MI_Ds_5,
+    MI_Ds_5,  // 5C6E
    MI_Eb_5 = MI_Ds_5,
-    MI_E_5,
+    MI_E_5,   // 5C6F
-    MI_F_5,
+    MI_F_5,   // 5C70
-    MI_Fs_5,
+    MI_Fs_5,  // 5C71
    MI_Gb_5 = MI_Fs_5,
-    MI_G_5,
+    MI_G_5,   // 5C72
-    MI_Gs_5,
+    MI_Gs_5,  // 5C73
    MI_Ab_5 = MI_Gs_5,
-    MI_A_5,
+    MI_A_5,   // 5C74
-    MI_As_5,
+    MI_As_5,  // 5C75
    MI_Bb_5 = MI_As_5,
-    MI_B_5,
+    MI_B_5,  // 5C76
-#    endif
+    MI_OCT_N2,  // 5C77
-#    if !MIDI_ENABLE_STRICT || MIDI_TONE_KEYCODE_OCTAVES > 5
+    MI_OCT_N1,  // 5C78
-    MIDI_TONE_MAX = MI_B_5,
+    MI_OCT_0,   // 5C79
-#    elif MIDI_TONE_KEYCODE_OCTAVES > 4
+    MI_OCT_1,   // 5C7A
-    MIDI_TONE_MAX = MI_B_4,
+    MI_OCT_2,   // 5C7B
-#    elif MIDI_TONE_KEYCODE_OCTAVES > 3
+    MI_OCT_3,   // 5C7C
-    MIDI_TONE_MAX = MI_B_3,
+    MI_OCT_4,   // 5C7D
-#    elif MIDI_TONE_KEYCODE_OCTAVES > 2
+    MI_OCT_5,   // 5C7E
-    MIDI_TONE_MAX = MI_B_2,
+    MI_OCT_6,   // 5C7F
-#    elif MIDI_TONE_KEYCODE_OCTAVES > 1
+    MI_OCT_7,   // 5C80
-    MIDI_TONE_MAX = MI_B_1,
+    MI_OCTD,    // 5C81
-#    elif MIDI_TONE_KEYCODE_OCTAVES > 0
+    MI_OCTU,    // 5C82
-    MIDI_TONE_MAX = MI_B,
-#    endif
+    MI_TRNS_N6,  // 5C83
+    MI_TRNS_N5,  // 5C84
-    MIDI_OCTAVE_MIN,
+    MI_TRNS_N4,  // 5C85
-    MI_OCT_N2 = MIDI_OCTAVE_MIN,
+    MI_TRNS_N3,  // 5C86
-    MI_OCT_N1,
+    MI_TRNS_N2,  // 5C87
-    MI_OCT_0,
+    MI_TRNS_N1,  // 5C88
-    MI_OCT_1,
+    MI_TRNS_0,   // 5C89
-    MI_OCT_2,
+    MI_TRNS_1,   // 5C8A
-    MI_OCT_3,
+    MI_TRNS_2,   // 5C8B
-    MI_OCT_4,
+    MI_TRNS_3,   // 5C8C
-    MI_OCT_5,
+    MI_TRNS_4,   // 5C8D
-    MI_OCT_6,
+    MI_TRNS_5,   // 5C8E
-    MI_OCT_7,
+    MI_TRNS_6,   // 5C8F
-    MIDI_OCTAVE_MAX = MI_OCT_7,
+    MI_TRNSD,    // 5C90
-    MI_OCTD,  // octave down
+    MI_TRNSU,    // 5C91
-    MI_OCTU,  // octave up
+    MI_VEL_0,  // 5C92
-    MIDI_TRANSPOSE_MIN,
+#ifdef VIA_ENABLE
-    MI_TRNS_N6 = MIDI_TRANSPOSE_MIN,
+    MI_VEL_1 = MI_VEL_0,
-    MI_TRNS_N5,
+#else
-    MI_TRNS_N4,
+    MI_VEL_1,  // 5C93
-    MI_TRNS_N3,
-    MI_TRNS_N2,
-    MI_TRNS_N1,
-    MI_TRNS_0,
-    MI_TRNS_1,
-    MI_TRNS_2,
-    MI_TRNS_3,
-    MI_TRNS_4,
-    MI_TRNS_5,
-    MI_TRNS_6,
-    MIDI_TRANSPOSE_MAX = MI_TRNS_6,
-    MI_TRNSD,  // transpose down
-    MI_TRNSU,  // transpose up
-    MIDI_VELOCITY_MIN,
-    MI_VEL_0 = MIDI_VELOCITY_MIN,
-#    ifdef VIA_ENABLE
-    MI_VEL_1 = MIDI_VELOCITY_MIN,
-#    else
-    MI_VEL_1,
-#    endif
-    MI_VEL_2,
-    MI_VEL_3,
-    MI_VEL_4,
-    MI_VEL_5,
-    MI_VEL_6,
-    MI_VEL_7,
-    MI_VEL_8,
-    MI_VEL_9,
-    MI_VEL_10,
-    MIDI_VELOCITY_MAX = MI_VEL_10,
-    MI_VELD,  // velocity down
-    MI_VELU,  // velocity up
-    MIDI_CHANNEL_MIN,
-    MI_CH1 = MIDI_CHANNEL_MIN,
-    MI_CH2,
-    MI_CH3,
-    MI_CH4,
-    MI_CH5,
-    MI_CH6,
-    MI_CH7,
-    MI_CH8,
-    MI_CH9,
-    MI_CH10,
-    MI_CH11,
-    MI_CH12,
-    MI_CH13,
-    MI_CH14,
-    MI_CH15,
-    MI_CH16,
-    MIDI_CHANNEL_MAX = MI_CH16,
-    MI_CHD,  // previous channel
-    MI_CHU,  // next channel
-    MI_ALLOFF,  // all notes off
-    MI_SUS,   // sustain
-    MI_PORT,  // portamento
-    MI_SOST,  // sostenuto
-    MI_SOFT,  // soft pedal
-    MI_LEG,   // legato
-    MI_MOD,    // modulation
-    MI_MODSD,  // decrease modulation speed
-    MI_MODSU,  // increase modulation speed
-    MI_BENDD,  // Bend down
-    MI_BENDU,  // Bend up
-#endif         // MIDI_ADVANCED
-    // Backlight functionality
-    BL_ON,
-    BL_OFF,
-    BL_DEC,
-    BL_INC,
-    BL_TOGG,
-    BL_STEP,
-    BL_BRTG,
-    // RGB functionality
-    RGB_TOG,
-    RGB_MODE_FORWARD,
-    RGB_MODE_REVERSE,
-    RGB_HUI,
-    RGB_HUD,
-    RGB_SAI,
-    RGB_SAD,
-    RGB_VAI,
-    RGB_VAD,
-    RGB_SPI,
-    RGB_SPD,
-    RGB_MODE_PLAIN,
-    RGB_MODE_BREATHE,
-    RGB_MODE_RAINBOW,
-    RGB_MODE_SWIRL,
-    RGB_MODE_SNAKE,
-    RGB_MODE_KNIGHT,
-    RGB_MODE_XMAS,
-    RGB_MODE_GRADIENT,
-    RGB_MODE_RGBTEST,
-    // Momentum matching toggle
-    VLK_TOG,
-    // Left shift, open paren
-    KC_LSPO,
-    // Right shift, close paren
-    KC_RSPC,
-    // Shift, Enter
-    KC_SFTENT,
-    // Printing
-    PRINT_ON,
-    PRINT_OFF,
-    // output selection
-    OUT_AUTO,
-    OUT_USB,
-#ifdef BLUETOOTH_ENABLE
-    OUT_BT,
-#endif
-#ifdef KEY_LOCK_ENABLE
-    KC_LOCK,
 #endif
+    MI_VEL_2,   // 5C94
-#ifdef TERMINAL_ENABLE
+    MI_VEL_3,   // 5C95
-    TERM_ON,
+    MI_VEL_4,   // 5C96
-    TERM_OFF,
+    MI_VEL_5,   // 5C97
-#endif
+    MI_VEL_6,   // 5C98
+    MI_VEL_7,   // 5C99
-    EEPROM_RESET,
+    MI_VEL_8,   // 5C9A
+    MI_VEL_9,   // 5C9B
-    UNICODE_MODE_FORWARD,
+    MI_VEL_10,  // 5C9C
-    UNICODE_MODE_REVERSE,
+    MI_VELD,    // 5C9D
-    UNICODE_MODE_MAC,
+    MI_VELU,    // 5C9E
-    UNICODE_MODE_LNX,
-    UNICODE_MODE_WIN,
+    MI_CH1,   // 5C9F
-    UNICODE_MODE_BSD,
+    MI_CH2,   // 5CA0
-    UNICODE_MODE_WINC,
+    MI_CH3,   // 5CA1
+    MI_CH4,   // 5CA2
-    HPT_ON,
+    MI_CH5,   // 5CA3
-    HPT_OFF,
+    MI_CH6,   // 5CA4
-    HPT_TOG,
+    MI_CH7,   // 5CA5
-    HPT_RST,
+    MI_CH8,   // 5CA6
-    HPT_FBK,
+    MI_CH9,   // 5CA7
-    HPT_BUZ,
+    MI_CH10,  // 5CA8
-    HPT_MODI,
+    MI_CH11,  // 5CA9
-    HPT_MODD,
+    MI_CH12,  // 5CAA
-    HPT_CONT,
+    MI_CH13,  // 5CAB
-    HPT_CONI,
+    MI_CH14,  // 5CAC
-    HPT_COND,
+    MI_CH15,  // 5CAD
-    HPT_DWLI,
+    MI_CH16,  // 5CAE
-    HPT_DWLD,
+    MI_CHD,   // 5CAF
+    MI_CHU,   // 5CB0
-    // Left control, open paren
-    KC_LCPO,
+    MI_ALLOFF,  // 5CB1
-    // Right control, close paren
+    MI_SUS,   // 5CB2
-    KC_RCPC,
+    MI_PORT,  // 5CB3
+    MI_SOST,  // 5CB4
-    // Left control, open paren
+    MI_SOFT,  // 5CB5
-    KC_LAPO,
+    MI_LEG,   // 5CB6
-    // Right control, close paren
+    MI_MOD,    // 5CB7
-    KC_RAPC,
+    MI_MODSD,  // 5CB8
+    MI_MODSU,  // 5CB9
-    CMB_ON,
-    CMB_OFF,
+    MI_BENDD,  // 5CBA
-    CMB_TOG,
+    MI_BENDU,  // 5CBB
-    MAGIC_SWAP_LCTL_LGUI,
+    // Backlight
-    MAGIC_SWAP_RCTL_RGUI,
+    BL_ON,    // 5CBC
-    MAGIC_UNSWAP_LCTL_LGUI,
+    BL_OFF,   // 5CBD
-    MAGIC_UNSWAP_RCTL_RGUI,
+    BL_DEC,   // 5CBE
-    MAGIC_SWAP_CTL_GUI,
+    BL_INC,   // 5CBF
-    MAGIC_UNSWAP_CTL_GUI,
+    BL_TOGG,  // 5CC0
-    MAGIC_TOGGLE_CTL_GUI,
+    BL_STEP,  // 5CC1
-    MAGIC_EE_HANDS_LEFT,
+    BL_BRTG,  // 5CC2
-    MAGIC_EE_HANDS_RIGHT,
+    // RGB underglow/matrix
+    RGB_TOG,            // 5CC3
+    RGB_MODE_FORWARD,   // 5CC4
+    RGB_MODE_REVERSE,   // 5CC5
+    RGB_HUI,            // 5CC6
+    RGB_HUD,            // 5CC7
+    RGB_SAI,            // 5CC8
+    RGB_SAD,            // 5CC9
+    RGB_VAI,            // 5CCA
+    RGB_VAD,            // 5CCB
+    RGB_SPI,            // 5CCC
+    RGB_SPD,            // 5CCD
+    RGB_MODE_PLAIN,     // 5CCE
+    RGB_MODE_BREATHE,   // 5CCF
+    RGB_MODE_RAINBOW,   // 5CD0
+    RGB_MODE_SWIRL,     // 5CD1
+    RGB_MODE_SNAKE,     // 5CD2
+    RGB_MODE_KNIGHT,    // 5CD3
+    RGB_MODE_XMAS,      // 5CD4
+    RGB_MODE_GRADIENT,  // 5CD5
+    RGB_MODE_RGBTEST,   // 5CD6
+    // Velocikey
+    VLK_TOG,  // 5CD7
+    // Space Cadet
+    KC_LSPO,    // 5CD8
+    KC_RSPC,    // 5CD9
+    KC_SFTENT,  // 5CDA
+    // Thermal Printer
+    PRINT_ON,   // 5CDB
+    PRINT_OFF,  // 5CDC
+    // Bluetooth: output selection
+    OUT_AUTO,  // 5CDD
+    OUT_USB,   // 5CDE
+    // Clear EEPROM
+    EEPROM_RESET,  // 5CDF
+    // Unicode
+    UNICODE_MODE_FORWARD,  // 5CE0
+    UNICODE_MODE_REVERSE,  // 5CE1
+    UNICODE_MODE_MAC,      // 5CE2
+    UNICODE_MODE_LNX,      // 5CE3
+    UNICODE_MODE_WIN,      // 5CE4
+    UNICODE_MODE_BSD,      // 5CE5
+    UNICODE_MODE_WINC,     // 5CE6
+    // Haptic
+    HPT_ON,    // 5CE7
+    HPT_OFF,   // 5CE8
+    HPT_TOG,   // 5CE9
+    HPT_RST,   // 5CEA
+    HPT_FBK,   // 5CEB
+    HPT_BUZ,   // 5CEC
+    HPT_MODI,  // 5CED
+    HPT_MODD,  // 5CEE
+    HPT_CONT,  // 5CEF
+    HPT_CONI,  // 5CF0
+    HPT_COND,  // 5CF1
+    HPT_DWLI,  // 5CF2
+    HPT_DWLD,  // 5CF3
+    // Space Cadet (continued)
+    KC_LCPO,  // 5CF4
+    KC_RCPC,  // 5CF5
+    KC_LAPO,  // 5CF6
+    KC_RAPC,  // 5CF7
+    // Combos
+    CMB_ON,   // 5CF8
+    CMB_OFF,  // 5CF9
+    CMB_TOG,  // 5CFA
+    // Magic (continued)
+    MAGIC_SWAP_LCTL_LGUI,    // 5CFB
+    MAGIC_SWAP_RCTL_RGUI,    // 5CFC
+    MAGIC_UNSWAP_LCTL_LGUI,  // 5CFD
+    MAGIC_UNSWAP_RCTL_RGUI,  // 5CFE
+    MAGIC_SWAP_CTL_GUI,      // 5CFF
+    MAGIC_UNSWAP_CTL_GUI,    // 5D00
+    MAGIC_TOGGLE_CTL_GUI,    // 5D01
+    MAGIC_EE_HANDS_LEFT,     // 5D02
+    MAGIC_EE_HANDS_RIGHT,    // 5D03
    // Dynamic Macros
-    DYN_REC_START1,
+    DYN_REC_START1,   // 5D04
-    DYN_REC_START2,
+    DYN_REC_START2,   // 5D05
-    DYN_REC_STOP,
+    DYN_REC_STOP,     // 5D06
-    DYN_MACRO_PLAY1,
+    DYN_MACRO_PLAY1,  // 5D07
-    DYN_MACRO_PLAY2,
+    DYN_MACRO_PLAY2,  // 5D08
-    JS_BUTTON0,
+    // Joystick
-    JS_BUTTON_MIN = JS_BUTTON0,
+    JS_BUTTON0,   // 5D09
-    JS_BUTTON1,
+    JS_BUTTON1,   // 5D0A
-    JS_BUTTON2,
+    JS_BUTTON2,   // 5D0B
-    JS_BUTTON3,
+    JS_BUTTON3,   // 5D0C
-    JS_BUTTON4,
+    JS_BUTTON4,   // 5D0D
-    JS_BUTTON5,
+    JS_BUTTON5,   // 5D0E
-    JS_BUTTON6,
+    JS_BUTTON6,   // 5D0F
-    JS_BUTTON7,
+    JS_BUTTON7,   // 5D10
-    JS_BUTTON8,
+    JS_BUTTON8,   // 5D11
-    JS_BUTTON9,
+    JS_BUTTON9,   // 5D12
-    JS_BUTTON10,
+    JS_BUTTON10,  // 5D13
-    JS_BUTTON11,
+    JS_BUTTON11,  // 5D14
-    JS_BUTTON12,
+    JS_BUTTON12,  // 5D15
-    JS_BUTTON13,
+    JS_BUTTON13,  // 5D16
-    JS_BUTTON14,
+    JS_BUTTON14,  // 5D17
-    JS_BUTTON15,
+    JS_BUTTON15,  // 5D18
-    JS_BUTTON16,
+    JS_BUTTON16,  // 5D19
-    JS_BUTTON17,
+    JS_BUTTON17,  // 5D1A
-    JS_BUTTON18,
+    JS_BUTTON18,  // 5D1B
-    JS_BUTTON19,
+    JS_BUTTON19,  // 5D1C
-    JS_BUTTON20,
+    JS_BUTTON20,  // 5D1D
-    JS_BUTTON21,
+    JS_BUTTON21,  // 5D1E
-    JS_BUTTON22,
+    JS_BUTTON22,  // 5D1F
-    JS_BUTTON23,
+    JS_BUTTON23,  // 5D20
-    JS_BUTTON24,
+    JS_BUTTON24,  // 5D21
-    JS_BUTTON25,
+    JS_BUTTON25,  // 5D22
-    JS_BUTTON26,
+    JS_BUTTON26,  // 5D23
-    JS_BUTTON27,
+    JS_BUTTON27,  // 5D24
-    JS_BUTTON28,
+    JS_BUTTON28,  // 5D25
-    JS_BUTTON29,
+    JS_BUTTON29,  // 5D26
-    JS_BUTTON30,
+    JS_BUTTON30,  // 5D27
-    JS_BUTTON31,
+    JS_BUTTON31,  // 5D28
-    JS_BUTTON_MAX = JS_BUTTON31,
+    // Leader Key
-#if defined(SEQUENCER_ENABLE)
+    KC_LEAD,  // 5D29
-    SQ_ON,
-    SQ_OFF,
+    // Bluetooth: output selection (continued)
-    SQ_TOG,
+    OUT_BT,  // 5D2A
-    SQ_TMPD,  // Decrease tempo
+    // Lock Key
-    SQ_TMPU,  // Increase tempo
+    KC_LOCK,  // 5D2B
+    // Terminal
+    TERM_ON,   // 5D2C
+    TERM_OFF,  // 5D2D
+    // Sequencer
+    SQ_ON,   // 5D2E
+    SQ_OFF,  // 5D2F
+    SQ_TOG,  // 5D30
+    SQ_TMPD,  // 5D31
+    SQ_TMPU,  // 5D32
+    SQ_RESD,  // 5D33
+    SQ_RESU,  // 5D34
+    SQ_SALL,  // 5D35
+    SQ_SCLR,  // 5D36
+    SEQUENCER_STEP_MIN,  // 5D37
+    SEQUENCER_STEP_MAX = SEQUENCER_STEP_MIN + SEQUENCER_STEPS,
    SEQUENCER_RESOLUTION_MIN,
    SEQUENCER_RESOLUTION_MAX = SEQUENCER_RESOLUTION_MIN + SEQUENCER_RESOLUTIONS,
-    SQ_RESD,  // Decrease resolution
-    SQ_RESU,  // Increase resolution
-    SQ_SALL,  // All steps on
-    SQ_SCLR,  // All steps off
-    SEQUENCER_STEP_MIN,
-    SEQUENCER_STEP_MAX = SEQUENCER_STEP_MIN + SEQUENCER_STEPS,
    SEQUENCER_TRACK_MIN,
    SEQUENCER_TRACK_MAX = SEQUENCER_TRACK_MIN + SEQUENCER_TRACKS,
-/**
+#define SQ_S(n) (n < SEQUENCER_STEPS ? SEQUENCER_STEP_MIN + n : KC_NO)
- * Helpers to assign a keycode to a step, a resolution, or a track.
+#define SQ_R(n) (n < SEQUENCER_RESOLUTIONS ? SEQUENCER_RESOLUTION_MIN + n : KC_NO)
- * Falls back to NOOP if n is out of range.
+#define SQ_T(n) (n < SEQUENCER_TRACKS ? SEQUENCER_TRACK_MIN + n : KC_NO)
- */
-#    define SQ_S(n) (n < SEQUENCER_STEPS ? SEQUENCER_STEP_MIN + n : XXXXXXX)
-#    define SQ_R(n) (n < SEQUENCER_RESOLUTIONS ? SEQUENCER_RESOLUTION_MIN + n : XXXXXXX)
-#    define SQ_T(n) (n < SEQUENCER_TRACKS ? SEQUENCER_TRACK_MIN + n : XXXXXXX)
-#endif
+    // One Shot
+    ONESHOT_ENABLE,
+    ONESHOT_DISABLE,
+    ONESHOT_TOGGLE,
+    // RGB underglow/matrix (continued)
+    RGB_MODE_TWINKLE,
-    // always leave at the end
+    // Start of custom keycode range for keyboards and keymaps - always leave at the end
    SAFE_RANGE
 };
-// Ability to use mods in layouts
+// Keycode modifiers & aliases
 #define LCTL(kc) (QK_LCTL | (kc))
 #define LSFT(kc) (QK_LSFT | (kc))
 #define LALT(kc) (QK_LALT | (kc))
@@ -609,11 +550,7 @@ enum quantum_keycodes {
 #define MOD_HYPR 0xF
 #define MOD_MEH 0x7
-// Aliases for shifted symbols
+// US ANSI shifted keycode aliases
-// Each key has a 4-letter code, and some have longer aliases too.
-// While the long aliases are descriptive, the 4-letter codes
-// make for nicer grid layouts (everything lines up), and are
-// the preferred style for Quantum.
 #define KC_TILD LSFT(KC_GRV)  // ~
 #define KC_TILDE KC_TILD
@@ -680,18 +617,15 @@ enum quantum_keycodes {
 #define KC_DELT KC_DELETE  // Del key (four letter code)
-// Alias for function layers than expand past FN31
+// Modified keycode aliases
-#define FUNC(kc) (QK_FUNCTION | (kc))
-// Aliases
 #define C(kc) LCTL(kc)
 #define S(kc) LSFT(kc)
 #define A(kc) LALT(kc)
 #define G(kc) LGUI(kc)
-#define F(kc) FUNC(kc)
+// Deprecated - do not use
+#define F(kc) (QK_FUNCTION | (kc))
 #define M(kc) (QK_MACRO | (kc))
 #define MACROTAP(kc) (QK_MACRO | (FUNC_TAP << 8) | (kc))
 #define MACRODOWN(...) (record->event.pressed ? MACRO(__VA_ARGS__) : MACRO_NONE)
@@ -699,19 +633,21 @@ enum quantum_keycodes {
 #define EEP_RST EEPROM_RESET
+// Audio Clicky aliases
 #define CK_TOGG CLICKY_TOGGLE
 #define CK_RST CLICKY_RESET
 #define CK_UP CLICKY_UP
 #define CK_DOWN CLICKY_DOWN
 #define CK_ON CLICKY_ENABLE
 #define CK_OFF CLICKY_DISABLE
+// Fauxclicky (deprecated) redirects to Audio Clicky
 #define FC_ON CLICKY_ENABLE
 #define FC_OFF CLICKY_DISABLE
 #define FC_TOGG CLICKY_TOGGLE
+// RGB aliases
 #define RGB_MOD RGB_MODE_FORWARD
 #define RGB_RMOD RGB_MODE_REVERSE
 #define RGB_M_P RGB_MODE_PLAIN
 #define RGB_M_B RGB_MODE_BREATHE
 #define RGB_M_R RGB_MODE_RAINBOW
@@ -721,10 +657,9 @@ enum quantum_keycodes {
 #define RGB_M_X RGB_MODE_XMAS
 #define RGB_M_G RGB_MODE_GRADIENT
 #define RGB_M_T RGB_MODE_RGBTEST
+#define RGB_M_TW RGB_MODE_TWINKLE
-// L-ayer, T-ap - 256 keycode max, 16 layer max
+// Magic aliases
-#define LT(layer, kc) (QK_LAYER_TAP | (((layer)&0xF) << 8) | ((kc)&0xFF))
 #define CL_SWAP MAGIC_SWAP_CONTROL_CAPSLOCK
 #define CL_NORM MAGIC_UNSWAP_CONTROL_CAPSLOCK
 #define CL_CTRL MAGIC_CAPSLOCK_TO_CONTROL
@@ -793,6 +728,9 @@ enum quantum_keycodes {
 // Layer tap-toggle
 #define TT(layer) (QK_LAYER_TAP_TOGGLE | ((layer)&0xFF))
+// L-ayer, T-ap - 256 keycode max, 16 layer max
+#define LT(layer, kc) (QK_LAYER_TAP | (((layer)&0xF) << 8) | ((kc)&0xFF))
 // M-od, T-ap - 256 keycode max
 #define MT(mod, kc) (QK_MOD_TAP | (((mod)&0x1F) << 8) | ((kc)&0xFF))
@@ -842,6 +780,7 @@ enum quantum_keycodes {
 #define KC_HYPR HYPR(KC_NO)
 #define KC_MEH MEH(KC_NO)
+// Unicode aliases
 // UNICODE_ENABLE - Allows Unicode input up to 0x7FFF
 #define UC(c) (QK_UNICODE | (c))
 // UNICODEMAP_ENABLE - Allows Unicode input up to 0x10FFFF, requires unicode_map
@@ -859,6 +798,7 @@ enum quantum_keycodes {
 #define UC_M_BS UNICODE_MODE_BSD
 #define UC_M_WC UNICODE_MODE_WINC
+// Swap Hands
 #define SH_T(kc) (QK_SWAP_HANDS | (kc))
 #define SH_TG (QK_SWAP_HANDS | OP_SH_TOGGLE)
 #define SH_TT (QK_SWAP_HANDS | OP_SH_TAP_TOGGLE)
@@ -868,9 +808,30 @@ enum quantum_keycodes {
 #define SH_ON (QK_SWAP_HANDS | OP_SH_ON)
 #define SH_OFF (QK_SWAP_HANDS | OP_SH_OFF)
+// MIDI aliases
+#define MIDI_TONE_MIN MI_C
+#define MIDI_TONE_MAX MI_B_5
+#define MIDI_OCTAVE_MIN MI_OCT_N2
+#define MIDI_OCTAVE_MAX MI_OCT_7
+#define MIDI_TRANSPOSE_MIN MI_TRNS_N6
+#define MIDI_TRANSPOSE_MAX MI_TRNS_6
+#define MIDI_VELOCITY_MIN MI_VEL_0
+#define MIDI_VELOCITY_MAX MI_VEL_10
+#define MIDI_CHANNEL_MIN MI_CH1
+#define MIDI_CHANNEL_MAX MI_CH16
 // Dynamic Macros aliases
 #define DM_REC1 DYN_REC_START1
 #define DM_REC2 DYN_REC_START2
 #define DM_RSTP DYN_REC_STOP
 #define DM_PLY1 DYN_MACRO_PLAY1
 #define DM_PLY2 DYN_MACRO_PLAY2
+// Joystick aliases
+#define JS_BUTTON_MIN JS_BUTTON0
+#define JS_BUTTON_MAX JS_BUTTON31
+// One Shot aliases
+#define OS_TOGG ONESHOT_TOGGLE
+#define OS_ON ONESHOT_ENABLE
+#define OS_OFF ONESHOT_DISABLE
diff --git a/quantum/rgb_matrix.c b/quantum/rgb_matrix.c
index ec17b4d72..8aae48603 100644
--- a/quantum/rgb_matrix.c
+++ b/quantum/rgb_matrix.c
@@ -131,7 +131,7 @@ last_hit_t g_last_hit_tracker;
 // internals
 static uint8_t         rgb_last_enable   = UINT8_MAX;
 static uint8_t         rgb_last_effect   = UINT8_MAX;
-static effect_params_t rgb_effect_params = {0, 0xFF};
+static effect_params_t rgb_effect_params = {0, LED_FLAG_ALL, false};
 static rgb_task_states rgb_task_state    = SYNCING;
 #if RGB_DISABLE_TIMEOUT > 0
 static uint32_t rgb_anykey_timer;
@@ -143,6 +143,11 @@ static uint32_t rgb_timer_buffer;
 static last_hit_t last_hit_buffer;
 #endif  // RGB_MATRIX_KEYREACTIVE_ENABLED
+// split rgb matrix
+#if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
+const uint8_t k_rgb_matrix_split[2] = RGB_MATRIX_SPLIT;
+#endif
 void eeconfig_read_rgb_matrix(void) { eeprom_read_block(&rgb_matrix_config, EECONFIG_RGB_MATRIX, sizeof(rgb_matrix_config)); }
 void eeconfig_update_rgb_matrix(void) { eeprom_update_block(&rgb_matrix_config, EECONFIG_RGB_MATRIX, sizeof(rgb_matrix_config)); }
@@ -153,6 +158,7 @@ void eeconfig_update_rgb_matrix_default(void) {
    rgb_matrix_config.mode   = RGB_MATRIX_STARTUP_MODE;
    rgb_matrix_config.hsv    = (HSV){RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL};
    rgb_matrix_config.speed  = RGB_MATRIX_STARTUP_SPD;
+    rgb_matrix_config.flags  = LED_FLAG_ALL;
    eeconfig_update_rgb_matrix();
 }
@@ -164,6 +170,7 @@ void eeconfig_debug_rgb_matrix(void) {
    dprintf("rgb_matrix_config.hsv.s = %d\n", rgb_matrix_config.hsv.s);
    dprintf("rgb_matrix_config.hsv.v = %d\n", rgb_matrix_config.hsv.v);
    dprintf("rgb_matrix_config.speed = %d\n", rgb_matrix_config.speed);
+    dprintf("rgb_matrix_config.flags = %d\n", rgb_matrix_config.flags);
 }
 __attribute__((weak)) uint8_t rgb_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t *led_i) { return 0; }
@@ -180,9 +187,22 @@ uint8_t rgb_matrix_map_row_column_to_led(uint8_t row, uint8_t column, uint8_t *l
 void rgb_matrix_update_pwm_buffers(void) { rgb_matrix_driver.flush(); }
-void rgb_matrix_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) { rgb_matrix_driver.set_color(index, red, green, blue); }
+void rgb_matrix_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
+#if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
+    if (!is_keyboard_left() && index >= k_rgb_matrix_split[0])
+        rgb_matrix_driver.set_color(index - k_rgb_matrix_split[0], red, green, blue);
+    else if (is_keyboard_left() && index < k_rgb_matrix_split[0])
+#endif
+        rgb_matrix_driver.set_color(index, red, green, blue);
+}
-void rgb_matrix_set_color_all(uint8_t red, uint8_t green, uint8_t blue) { rgb_matrix_driver.set_color_all(red, green, blue); }
+void rgb_matrix_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
+#if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
+    for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) rgb_matrix_set_color(i, red, green, blue);
+#else
+    rgb_matrix_driver.set_color_all(red, green, blue);
+#endif
+}
 void process_rgb_matrix(uint8_t row, uint8_t col, bool pressed) {
 #ifndef RGB_MATRIX_SPLIT
@@ -315,6 +335,10 @@ static void rgb_task_start(void) {
 static void rgb_task_render(uint8_t effect) {
    bool rendering         = false;
    rgb_effect_params.init = (effect != rgb_last_effect) || (rgb_matrix_config.enable != rgb_last_enable);
+    if (rgb_effect_params.flags != rgb_matrix_config.flags) {
+        rgb_effect_params.flags = rgb_matrix_config.flags;
+        rgb_matrix_set_color_all(0, 0, 0);
+    }
    // each effect can opt to do calculations
    // and/or request PWM buffer updates.
@@ -618,6 +642,6 @@ void rgb_matrix_decrease_speed_helper(bool write_to_eeprom) { rgb_matrix_set_spe
 void rgb_matrix_decrease_speed_noeeprom(void) { rgb_matrix_decrease_speed_helper(false); }
 void rgb_matrix_decrease_speed(void) { rgb_matrix_decrease_speed_helper(true); }
-led_flags_t rgb_matrix_get_flags(void) { return rgb_effect_params.flags; }
+led_flags_t rgb_matrix_get_flags(void) { return rgb_matrix_config.flags; }
-void rgb_matrix_set_flags(led_flags_t flags) { rgb_effect_params.flags = flags; }
+void rgb_matrix_set_flags(led_flags_t flags) { rgb_matrix_config.flags = flags; }
diff --git a/quantum/rgb_matrix_types.h b/quantum/rgb_matrix_types.h
index 7b8171fb2..1a37922af 100644
--- a/quantum/rgb_matrix_types.h
+++ b/quantum/rgb_matrix_types.h
@@ -85,10 +85,11 @@ typedef struct PACKED {
 typedef union {
    uint32_t raw;
    struct PACKED {
-        uint8_t enable : 2;
+        uint8_t     enable : 2;
-        uint8_t mode : 6;
+        uint8_t     mode : 6;
-        HSV     hsv;
+        HSV         hsv;
-        uint8_t speed;  // EECONFIG needs to be increased to support this
+        uint8_t     speed;  // EECONFIG needs to be increased to support this
+        led_flags_t flags;
    };
 } rgb_config_t;
diff --git a/quantum/split_common/matrix.c b/quantum/split_common/matrix.c
index d6636b886..f8de17809 100644
--- a/quantum/split_common/matrix.c
+++ b/quantum/split_common/matrix.c
@@ -43,6 +43,7 @@ extern matrix_row_t matrix[MATRIX_ROWS];      // debounced values
 uint8_t thisHand, thatHand;
 // user-defined overridable functions
+__attribute__((weak)) void matrix_slave_scan_kb(void) { matrix_slave_scan_user(); }
 __attribute__((weak)) void matrix_slave_scan_user(void) {}
 static inline void setPinOutput_writeLow(pin_t pin) {
@@ -284,7 +285,7 @@ bool matrix_post_scan(void) {
    } else {
        transport_slave(matrix + thatHand, matrix + thisHand);
-        matrix_slave_scan_user();
+        matrix_slave_scan_kb();
    }
    return changed;
diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c
index 2ae44e6e1..9e75e19ce 100644
--- a/quantum/split_common/split_util.c
+++ b/quantum/split_common/split_util.c
@@ -1,3 +1,18 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 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 "split_util.h"
 #include "matrix.h"
 #include "keyboard.h"
@@ -6,14 +21,7 @@
 #include "transport.h"
 #include "quantum.h"
 #include "wait.h"
+#include "usb_util.h"
-#ifdef PROTOCOL_LUFA
-#    include <LUFA/Drivers/USB/USB.h>
-#endif
-#ifdef PROTOCOL_VUSB
-#    include <usbdrv/usbdrv.h>
-#endif
 #ifdef EE_HANDS
 #    include "eeconfig.h"
@@ -31,56 +39,21 @@
 #    define SPLIT_USB_TIMEOUT_POLL 10
 #endif
-#ifdef PROTOCOL_CHIBIOS
-#    define SPLIT_USB_DETECT  // Force this on for now
-#endif
 volatile bool isLeftHand = true;
 #if defined(SPLIT_USB_DETECT)
-#    if defined(PROTOCOL_LUFA)
+static bool usbIsActive(void) {
-static inline bool usbHasActiveConnection(void) { return USB_Device_IsAddressSet(); }
-static inline void usbDisable(void) {
-    USB_Disable();
-    USB_DeviceState = DEVICE_STATE_Unattached;
-}
-#    elif defined(PROTOCOL_CHIBIOS)
-static inline bool usbHasActiveConnection(void) { return usbGetDriverStateI(&USBD1) == USB_ACTIVE; }
-static inline void usbDisable(void) { usbStop(&USBD1); }
-#    elif defined(PROTOCOL_VUSB)
-static inline bool usbHasActiveConnection(void) {
-    usbPoll();
-    return usbConfiguration;
-}
-static inline void usbDisable(void) { usbDeviceDisconnect(); }
-#    else
-static inline bool usbHasActiveConnection(void) { return true; }
-static inline void usbDisable(void) {}
-#    endif
-bool usbIsActive(void) {
    for (uint8_t i = 0; i < (SPLIT_USB_TIMEOUT / SPLIT_USB_TIMEOUT_POLL); i++) {
        // This will return true if a USB connection has been established
-        if (usbHasActiveConnection()) {
+        if (usb_connected_state()) {
            return true;
        }
        wait_ms(SPLIT_USB_TIMEOUT_POLL);
    }
-    // Avoid NO_USB_STARTUP_CHECK - Disable USB as the previous checks seem to enable it somehow
-    usbDisable();
    return false;
 }
-#elif defined(PROTOCOL_LUFA) && defined(OTGPADE)
-static inline bool usbIsActive(void) {
-    USB_OTGPAD_On();  // enables VBUS pad
-    wait_us(5);
-    return USB_VBUS_GetStatus();  // checks state of VBUS
-}
 #else
-static inline bool usbIsActive(void) { return true; }
+static inline bool usbIsActive(void) { return usb_vbus_state(); }
 #endif
 #ifdef SPLIT_HAND_MATRIX_GRID
@@ -126,6 +99,11 @@ __attribute__((weak)) bool is_keyboard_master(void) {
    // only check once, as this is called often
    if (usbstate == UNKNOWN) {
        usbstate = usbIsActive() ? MASTER : SLAVE;
+        // Avoid NO_USB_STARTUP_CHECK - Disable USB as the previous checks seem to enable it somehow
+        if (usbstate == SLAVE) {
+            usb_disable();
+        }
    }
    return (usbstate == MASTER);
diff --git a/quantum/split_common/transport.c b/quantum/split_common/transport.c
index 61b61ea08..b67702f15 100644
--- a/quantum/split_common/transport.c
+++ b/quantum/split_common/transport.c
@@ -22,6 +22,13 @@ static pin_t encoders_pad[] = ENCODERS_PAD_A;
 #    define NUMBER_OF_ENCODERS (sizeof(encoders_pad) / sizeof(pin_t))
 #endif
+#if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
+#    include "led_matrix.h"
+#endif
+#if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
+#    include "rgb_matrix.h"
+#endif
 #if defined(USE_I2C)
 #    include "i2c_master.h"
@@ -54,6 +61,14 @@ typedef struct _I2C_slave_buffer_t {
 #    ifdef WPM_ENABLE
    uint8_t current_wpm;
 #    endif
+#    if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
+    led_eeconfig_t led_matrix;
+    bool           led_suspend_state;
+#    endif
+#    if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
+    rgb_config_t rgb_matrix;
+    bool         rgb_suspend_state;
+#    endif
 } I2C_slave_buffer_t;
 static I2C_slave_buffer_t *const i2c_buffer = (I2C_slave_buffer_t *)i2c_slave_reg;
@@ -68,6 +83,10 @@ static I2C_slave_buffer_t *const i2c_buffer = (I2C_slave_buffer_t *)i2c_slave_re
 #    define I2C_RGB_START offsetof(I2C_slave_buffer_t, rgblight_sync)
 #    define I2C_ENCODER_START offsetof(I2C_slave_buffer_t, encoder_state)
 #    define I2C_WPM_START offsetof(I2C_slave_buffer_t, current_wpm)
+#    define I2C_LED_MATRIX_START offsetof(I2C_slave_buffer_t, led_matrix)
+#    define I2C_LED_SUSPEND_START offsetof(I2C_slave_buffer_t, led_suspend_state)
+#    define I2C_RGB_MATRIX_START offsetof(I2C_slave_buffer_t, rgb_matrix)
+#    define I2C_RGB_SUSPEND_START offsetof(I2C_slave_buffer_t, rgb_suspend_state)
 #    define TIMEOUT 100
@@ -141,6 +160,15 @@ bool transport_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[])
 #        endif
 #    endif
+#    if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
+    i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_LED_MATRIX_START, (void *)led_matrix_eeconfig, sizeof(i2c_buffer->led_matrix), TIMEOUT);
+    i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_LED_SUSPEND_START, (void *)g_suspend_state, sizeof(i2c_buffer->led_suspend_state), TIMEOUT);
+#    endif
+#    if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
+    i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_RGB_MATRIX_START, (void *)rgb_matrix_config, sizeof(i2c_buffer->rgb_matrix), TIMEOUT);
+    i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_RGB_SUSPEND_START, (void *)g_suspend_state, sizeof(i2c_buffer->rgb_suspend_state), TIMEOUT);
+#    endif
 #    ifndef DISABLE_SYNC_TIMER
    i2c_buffer->sync_timer = sync_timer_read32() + SYNC_TIMER_OFFSET;
    i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_SYNC_TIME_START, (void *)&i2c_buffer->sync_timer, sizeof(i2c_buffer->sync_timer), TIMEOUT);
@@ -186,6 +214,15 @@ void transport_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[])
    set_oneshot_mods(i2c_buffer->oneshot_mods);
 #        endif
 #    endif
+#    if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
+    memcpy((void *)i2c_buffer->led_matrix, (void *)led_matrix_eeconfig, sizeof(i2c_buffer->led_matrix));
+    memcpy((void *)i2c_buffer->led_suspend_state, (void *)g_suspend_state, sizeof(i2c_buffer->led_suspend_state));
+#    endif
+#    if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
+    memcpy((void *)i2c_buffer->rgb_matrix, (void *)rgb_matrix_config, sizeof(i2c_buffer->rgb_matrix));
+    memcpy((void *)i2c_buffer->rgb_suspend_state, (void *)g_suspend_state, sizeof(i2c_buffer->rgb_suspend_state));
+#    endif
 }
 void transport_master_init(void) { i2c_init(); }
@@ -208,23 +245,31 @@ typedef struct _Serial_s2m_buffer_t {
 typedef struct _Serial_m2s_buffer_t {
 #    ifdef SPLIT_MODS_ENABLE
-    uint8_t      real_mods;
+    uint8_t        real_mods;
-    uint8_t      weak_mods;
+    uint8_t        weak_mods;
 #        ifndef NO_ACTION_ONESHOT
-    uint8_t      oneshot_mods;
+    uint8_t        oneshot_mods;
 #        endif
 #    endif
 #    ifndef DISABLE_SYNC_TIMER
-    uint32_t     sync_timer;
+    uint32_t       sync_timer;
 #    endif
 #    ifdef SPLIT_TRANSPORT_MIRROR
-    matrix_row_t mmatrix[ROWS_PER_HAND];
+    matrix_row_t   mmatrix[ROWS_PER_HAND];
 #    endif
 #    ifdef BACKLIGHT_ENABLE
-    uint8_t      backlight_level;
+    uint8_t        backlight_level;
 #    endif
 #    ifdef WPM_ENABLE
-    uint8_t      current_wpm;
+    uint8_t        current_wpm;
+#    endif
+#    if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
+    led_eeconfig_t led_matrix;
+    bool           led_suspend_state;
+#    endif
+#    if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
+    rgb_config_t   rgb_matrix;
+    bool           rgb_suspend_state;
 #    endif
 } Serial_m2s_buffer_t;
@@ -333,18 +378,28 @@ bool transport_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[])
 #    ifdef WPM_ENABLE
    // Write wpm to slave
-    serial_m2s_buffer.current_wpm  = get_current_wpm();
+    serial_m2s_buffer.current_wpm       = get_current_wpm();
 #    endif
 #    ifdef SPLIT_MODS_ENABLE
-    serial_m2s_buffer.real_mods    = get_mods();
+    serial_m2s_buffer.real_mods         = get_mods();
-    serial_m2s_buffer.weak_mods    = get_weak_mods();
+    serial_m2s_buffer.weak_mods         = get_weak_mods();
 #        ifndef NO_ACTION_ONESHOT
-    serial_m2s_buffer.oneshot_mods = get_oneshot_mods();
+    serial_m2s_buffer.oneshot_mods      = get_oneshot_mods();
 #        endif
 #    endif
+#    if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
+    serial_m2s_buffer.led_matrix        = led_matrix_econfig;
+    serial_m2s_buffer.led_suspend_state = g_suspend_state;
+#    endif
+#    if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
+    serial_m2s_buffer.rgb_matrix        = rgb_matrix_config;
+    serial_m2s_buffer.rgb_suspend_state = g_suspend_state;
+#    endif
 #    ifndef DISABLE_SYNC_TIMER
-    serial_m2s_buffer.sync_timer   = sync_timer_read32() + SYNC_TIMER_OFFSET;
+    serial_m2s_buffer.sync_timer        = sync_timer_read32() + SYNC_TIMER_OFFSET;
 #    endif
    return true;
 }
@@ -381,6 +436,15 @@ void transport_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[])
    set_oneshot_mods(serial_m2s_buffer.oneshot_mods);
 #        endif
 #    endif
+#    if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
+    led_matrix_eeconfig = serial_m2s_buffer.led_matrix;
+    g_suspend_state     = serial_m2s_buffer.led_suspend_state;
+#    endif
+#    if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
+    rgb_matrix_config   = serial_m2s_buffer.rgb_matrix;
+    g_suspend_state     = serial_m2s_buffer.rgb_suspend_state;
+#    endif
 }
 #endif
diff --git a/quantum/wpm.c b/quantum/wpm.c
index da30bd252..bec419a48 100644
--- a/quantum/wpm.c
+++ b/quantum/wpm.c
@@ -19,11 +19,10 @@
 // WPM Stuff
 static uint8_t  current_wpm = 0;
-static uint8_t  latest_wpm  = 0;
 static uint16_t wpm_timer   = 0;
 // This smoothing is 40 keystrokes
-static const float wpm_smoothing = 0.0487;
+static const float wpm_smoothing = WPM_SMOOTHING;
 void set_current_wpm(uint8_t new_wpm) { current_wpm = new_wpm; }
@@ -46,19 +45,46 @@ __attribute__((weak)) bool wpm_keycode_user(uint16_t keycode) {
    return false;
 }
+#ifdef WPM_ALLOW_COUNT_REGRESSION
+__attribute__((weak)) uint8_t wpm_regress_count(uint16_t keycode) {
+    bool weak_modded = (keycode >= QK_LCTL && keycode < QK_LSFT) || (keycode >= QK_RCTL && keycode < QK_RSFT);
+    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX) || (keycode >= QK_MODS && keycode <= QK_MODS_MAX)) {
+        keycode = keycode & 0xFF;
+    } else if (keycode > 0xFF) {
+        keycode = 0;
+    }
+    if (keycode == KC_DEL || keycode == KC_BSPC) {
+        if (((get_mods() | get_oneshot_mods()) & MOD_MASK_CTRL) || weak_modded) {
+            return WPM_ESTIMATED_WORD_SIZE;
+        } else {
+            return 1;
+        }
+    } else {
+        return 0;
+    }
+}
+#endif
 void update_wpm(uint16_t keycode) {
    if (wpm_keycode(keycode)) {
        if (wpm_timer > 0) {
-            latest_wpm  = 60000 / timer_elapsed(wpm_timer) / 5;
+            current_wpm += ((60000 / timer_elapsed(wpm_timer) / WPM_ESTIMATED_WORD_SIZE) - current_wpm) * wpm_smoothing;
-            current_wpm = (latest_wpm - current_wpm) * wpm_smoothing + current_wpm;
        }
        wpm_timer = timer_read();
    }
+#ifdef WPM_ALLOW_COUNT_REGRESSION
+    uint8_t regress = wpm_regress_count(keycode);
+    if (regress) {
+        current_wpm -= regress;
+        wpm_timer = timer_read();
+    }
+#endif
 }
 void decay_wpm(void) {
    if (timer_elapsed(wpm_timer) > 1000) {
-        current_wpm = (0 - current_wpm) * wpm_smoothing + current_wpm;
+        current_wpm += (-current_wpm) * wpm_smoothing;
-        wpm_timer   = timer_read();
+        wpm_timer = timer_read();
    }
 }
diff --git a/quantum/wpm.h b/quantum/wpm.h
index 15ab4ffcd..4af52d2b9 100644
--- a/quantum/wpm.h
+++ b/quantum/wpm.h
@@ -19,10 +19,21 @@
 #include "quantum.h"
+#ifndef WPM_ESTIMATED_WORD_SIZE
+#    define WPM_ESTIMATED_WORD_SIZE 5
+#endif
+#ifndef WPM_SMOOTHING
+#    define WPM_SMOOTHING 0.0487
+#endif
 bool wpm_keycode(uint16_t keycode);
 bool wpm_keycode_kb(uint16_t keycode);
 bool wpm_keycode_user(uint16_t keycode);
+#ifdef WPM_ALLOW_COUNT_REGRESSION
+uint8_t wpm_regress_count(uint16_t keycode);
+#endif
 void    set_current_wpm(uint8_t);
 uint8_t get_current_wpm(void);
 void    update_wpm(uint16_t);
diff --git a/readme.md b/readme.md
index 6092f209b..bb85115af 100644
--- a/readme.md
+++ b/readme.md
@@ -9,6 +9,12 @@
 This is a keyboard firmware based on the [tmk\_keyboard firmware](https://github.com/tmk/tmk_keyboard) with some useful features for Atmel AVR and ARM controllers, and more specifically, the [OLKB product line](https://olkb.com), the [ErgoDox EZ](https://ergodox-ez.com) keyboard, and the [Clueboard product line](https://clueboard.co).
+# THIS IS THE DEVELOP BRANCH
+Warning- This is the `develop` branch of QMK Firmware. You may encounter broken code here. Please see [Breaking Changes](https://docs.qmk.fm/#/breaking_changes) for more information.
+# Original readme continues
 ## Documentation
 * [See the official documentation on docs.qmk.fm](https://docs.qmk.fm)
diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk
index 40595a1e3..cdf9ba649 100644
--- a/tmk_core/chibios.mk
+++ b/tmk_core/chibios.mk
@@ -190,6 +190,8 @@ else ifneq ("$(wildcard $(KEYBOARD_PATH_2)/ld/$(MCU_LDSCRIPT).ld)","")
    LDSCRIPT = $(KEYBOARD_PATH_2)/ld/$(MCU_LDSCRIPT).ld
 else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/ld/$(MCU_LDSCRIPT).ld)","")
    LDSCRIPT = $(KEYBOARD_PATH_1)/ld/$(MCU_LDSCRIPT).ld
+else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/$(BOARD)/ld/$(MCU_LDSCRIPT).ld)","")
+    LDSCRIPT = $(TOP_DIR)/platforms/chibios/$(BOARD)/ld/$(MCU_LDSCRIPT).ld
 else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/common/ld/$(MCU_LDSCRIPT).ld)","")
    LDSCRIPT = $(TOP_DIR)/platforms/chibios/common/ld/$(MCU_LDSCRIPT).ld
 else ifneq ("$(wildcard $(STARTUPLD_CONTRIB)/$(MCU_LDSCRIPT).ld)","")
diff --git a/tmk_core/common.mk b/tmk_core/common.mk
index 238b3c69f..2f8f81126 100644
--- a/tmk_core/common.mk
+++ b/tmk_core/common.mk
@@ -12,6 +12,7 @@ TMK_COMMON_SRC +=	$(COMMON_DIR)/host.c \
        $(COMMON_DIR)/sendchar_null.c \
        $(COMMON_DIR)/eeconfig.c \
        $(COMMON_DIR)/report.c \
+        $(COMMON_DIR)/usb_util.c \
        $(PLATFORM_COMMON_DIR)/suspend.c \
        $(PLATFORM_COMMON_DIR)/timer.c \
        $(COMMON_DIR)/sync_timer.c \
@@ -24,28 +25,6 @@ else
    include $(TMK_PATH)/$(COMMON_DIR)/lib_printf.mk
 endif
-# Option modules
-BOOTMAGIC_ENABLE ?= no
-VALID_MAGIC_TYPES := yes full lite
-ifneq ($(strip $(BOOTMAGIC_ENABLE)), no)
-  ifeq ($(filter $(BOOTMAGIC_ENABLE),$(VALID_MAGIC_TYPES)),)
-    $(error BOOTMAGIC_ENABLE="$(BOOTMAGIC_ENABLE)" is not a valid type of magic)
-  endif
-  ifeq ($(strip $(BOOTMAGIC_ENABLE)), lite)
-      TMK_COMMON_DEFS += -DBOOTMAGIC_LITE
-      TMK_COMMON_SRC += $(COMMON_DIR)/bootmagic_lite.c
-      TMK_COMMON_DEFS += -DMAGIC_ENABLE
-      TMK_COMMON_SRC += $(COMMON_DIR)/magic.c
-  else
-    TMK_COMMON_DEFS += -DBOOTMAGIC_ENABLE
-    TMK_COMMON_SRC += $(COMMON_DIR)/bootmagic.c
-  endif
-else
-    TMK_COMMON_DEFS += -DMAGIC_ENABLE
-    TMK_COMMON_SRC += $(COMMON_DIR)/magic.c
-endif
 SHARED_EP_ENABLE = no
 MOUSE_SHARED_EP ?= yes
 ifeq ($(strip $(KEYBOARD_SHARED_EP)), yes)
diff --git a/tmk_core/common/action_util.c b/tmk_core/common/action_util.c
index 000503b08..a57c8bf66 100644
--- a/tmk_core/common/action_util.c
+++ b/tmk_core/common/action_util.c
@@ -147,12 +147,16 @@ void clear_oneshot_swaphands(void) {
 * FIXME: needs doc
 */
 void set_oneshot_layer(uint8_t layer, uint8_t state) {
-    oneshot_layer_data = layer << 3 | state;
+    if (!keymap_config.oneshot_disable) {
-    layer_on(layer);
+        oneshot_layer_data = layer << 3 | state;
+        layer_on(layer);
 #    if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
-    oneshot_layer_time = timer_read();
+        oneshot_layer_time = timer_read();
 #    endif
-    oneshot_layer_changed_kb(get_oneshot_layer());
+        oneshot_layer_changed_kb(get_oneshot_layer());
+    } else {
+        layer_on(layer);
+    }
 }
 /** \brief Reset oneshot layer
 *
@@ -172,7 +176,7 @@ void reset_oneshot_layer(void) {
 void clear_oneshot_layer_state(oneshot_fullfillment_t state) {
    uint8_t start_state = oneshot_layer_data;
    oneshot_layer_data &= ~state;
-    if (!get_oneshot_layer_state() && start_state != oneshot_layer_data) {
+    if ((!get_oneshot_layer_state() && start_state != oneshot_layer_data) || keymap_config.oneshot_disable) {
        layer_off(get_oneshot_layer());
        reset_oneshot_layer();
    }
@@ -182,6 +186,39 @@ void clear_oneshot_layer_state(oneshot_fullfillment_t state) {
 * FIXME: needs doc
 */
 bool is_oneshot_layer_active(void) { return get_oneshot_layer_state(); }
+/** \brief set oneshot
+ *
+ * FIXME: needs doc
+ */
+void oneshot_set(bool active) {
+    if (keymap_config.oneshot_disable != active) {
+        keymap_config.oneshot_disable = active;
+        eeconfig_update_keymap(keymap_config.raw);
+        dprintf("Oneshot: active: %d\n", active);
+    }
+}
+/** \brief toggle oneshot
+ *
+ * FIXME: needs doc
+ */
+void oneshot_toggle(void) { oneshot_set(!keymap_config.oneshot_disable); }
+/** \brief enable oneshot
+ *
+ * FIXME: needs doc
+ */
+void oneshot_enable(void) { oneshot_set(true); }
+/** \brief disable oneshot
+ *
+ * FIXME: needs doc
+ */
+void oneshot_disable(void) { oneshot_set(false); }
+bool is_oneshot_enabled(void) { return keymap_config.oneshot_disable; }
 #endif
 /** \brief Send keyboard report
@@ -321,14 +358,17 @@ void del_oneshot_mods(uint8_t mods) {
 * FIXME: needs doc
 */
 void set_oneshot_mods(uint8_t mods) {
-    if (oneshot_mods != mods) {
+    if (!keymap_config.oneshot_disable) {
+        if (oneshot_mods != mods) {
 #    if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
-        oneshot_time = timer_read();
+            oneshot_time = timer_read();
 #    endif
-        oneshot_mods = mods;
+            oneshot_mods = mods;
-        oneshot_mods_changed_kb(mods);
+            oneshot_mods_changed_kb(mods);
+        }
    }
 }
 /** \brief clear oneshot mods
 *
 * FIXME: needs doc
diff --git a/tmk_core/common/action_util.h b/tmk_core/common/action_util.h
index ff29f79b0..f2b3897ae 100644
--- a/tmk_core/common/action_util.h
+++ b/tmk_core/common/action_util.h
@@ -85,6 +85,11 @@ void oneshot_mods_changed_kb(uint8_t mods);
 void oneshot_layer_changed_user(uint8_t layer);
 void oneshot_layer_changed_kb(uint8_t layer);
+void oneshot_toggle(void);
+void oneshot_enable(void);
+void oneshot_disable(void);
+bool is_oneshot_enabled(void);
 /* inspect */
 uint8_t has_anymod(void);
diff --git a/tmk_core/common/arm_atsam/_wait.h b/tmk_core/common/arm_atsam/_wait.h
new file mode 100644
index 000000000..41b686b56
--- /dev/null
+++ b/tmk_core/common/arm_atsam/_wait.h
@@ -0,0 +1,22 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include "clks.h"
+#define wait_ms(ms) CLK_delay_ms(ms)
+#define wait_us(us) CLK_delay_us(us)
+#define waitInputPinDelay()
diff --git a/tmk_core/common/avr/_wait.h b/tmk_core/common/avr/_wait.h
new file mode 100644
index 000000000..56eb316fa
--- /dev/null
+++ b/tmk_core/common/avr/_wait.h
@@ -0,0 +1,29 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include <util/delay.h>
+#define wait_ms(ms) _delay_ms(ms)
+#define wait_us(us) _delay_us(us)
+/* The AVR series GPIOs have a one clock read delay for changes in the digital input signal.
+ * But here's more margin to make it two clocks. */
+#ifndef GPIO_INPUT_PIN_DELAY
+#    define GPIO_INPUT_PIN_DELAY 2
+#endif
+#define waitInputPinDelay() __builtin_avr_delay_cycles(GPIO_INPUT_PIN_DELAY)
diff --git a/tmk_core/common/avr/suspend.c b/tmk_core/common/avr/suspend.c
index 47a82a2ee..96b19a77f 100644
--- a/tmk_core/common/avr/suspend.c
+++ b/tmk_core/common/avr/suspend.c
@@ -28,6 +28,13 @@
 #    include "rgblight.h"
 #endif
+#ifdef LED_MATRIX_ENABLE
+#    include "led_matrix.h"
+#endif
+#ifdef RGB_MATRIX_ENABLE
+#    include "rgb_matrix.h"
+#endif
 /** \brief Suspend idle
 *
 * FIXME: needs doc
diff --git a/tmk_core/common/chibios/_wait.h b/tmk_core/common/chibios/_wait.h
new file mode 100644
index 000000000..5bface53e
--- /dev/null
+++ b/tmk_core/common/chibios/_wait.h
@@ -0,0 +1,55 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include <ch.h>
+/* chThdSleepX of zero maps to infinite - so we map to a tiny delay to still yield */
+#define wait_ms(ms)                     \
+    do {                                \
+        if (ms != 0) {                  \
+            chThdSleepMilliseconds(ms); \
+        } else {                        \
+            chThdSleepMicroseconds(1);  \
+        }                               \
+    } while (0)
+#define wait_us(us)                     \
+    do {                                \
+        if (us != 0) {                  \
+            chThdSleepMicroseconds(us); \
+        } else {                        \
+            chThdSleepMicroseconds(1);  \
+        }                               \
+    } while (0)
+/* For GPIOs on ARM-based MCUs, the input pins are sampled by the clock of the bus
+ * to which the GPIO is connected.
+ * The connected buses differ depending on the various series of MCUs.
+ * And since the instruction execution clock of the CPU and the bus clock of GPIO are different,
+ * there is a delay of several clocks to read the change of the input signal.
+ *
+ * Define this delay with the GPIO_INPUT_PIN_DELAY macro.
+ * If the GPIO_INPUT_PIN_DELAY macro is not defined, the following default values will be used.
+ * (A fairly large value of 0.25 microseconds is set.)
+ */
+#include "wait.c"
+#ifndef GPIO_INPUT_PIN_DELAY
+#    define GPIO_INPUT_PIN_DELAY (STM32_SYSCLK / 1000000L / 4)
+#endif
+#define waitInputPinDelay() wait_cpuclock(GPIO_INPUT_PIN_DELAY)
diff --git a/tmk_core/common/chibios/bootloader.c b/tmk_core/common/chibios/bootloader.c
index 6cabcc4b8..11f7abf43 100644
--- a/tmk_core/common/chibios/bootloader.c
+++ b/tmk_core/common/chibios/bootloader.c
@@ -13,7 +13,23 @@
 #    define STM32_BOOTLOADER_DUAL_BANK FALSE
 #endif
-#if STM32_BOOTLOADER_DUAL_BANK
+#ifdef BOOTLOADER_TINYUF2
+#    define DBL_TAP_MAGIC 0xf01669ef  // From tinyuf2's board_api.h
+// defined by linker script
+extern uint32_t _board_dfu_dbl_tap[];
+#    define DBL_TAP_REG _board_dfu_dbl_tap[0]
+void bootloader_jump(void) {
+    DBL_TAP_REG = DBL_TAP_MAGIC;
+    NVIC_SystemReset();
+}
+void enter_bootloader_mode_if_requested(void) { /* not needed, no two-stage reset */
+}
+#elif STM32_BOOTLOADER_DUAL_BANK
 // Need pin definitions
 #    include "config_common.h"
@@ -79,7 +95,7 @@ void enter_bootloader_mode_if_requested(void) {
    }
 }
-#elif defined(KL2x) || defined(K20x)  // STM32_BOOTLOADER_DUAL_BANK // STM32_BOOTLOADER_ADDRESS
+#elif defined(KL2x) || defined(K20x) || defined(MK66F18)  // STM32_BOOTLOADER_DUAL_BANK // STM32_BOOTLOADER_ADDRESS
 /* Kinetis */
 #    if defined(BOOTLOADER_KIIBOHD)
diff --git a/tmk_core/common/chibios/chibios_config.h b/tmk_core/common/chibios/chibios_config.h
index b4d96465d..1d8ace495 100644
--- a/tmk_core/common/chibios/chibios_config.h
+++ b/tmk_core/common/chibios/chibios_config.h
@@ -15,6 +15,8 @@
 */
 #pragma once
+#define SPLIT_USB_DETECT  // Force this on for now
 #if defined(STM32F1XX)
 #    define USE_GPIOV1
 #endif
@@ -28,4 +30,9 @@
 #    define USE_I2CV1
 #    define USE_I2CV1_CONTRIB  // for some reason a bunch of ChibiOS-Contrib boards only have clock_speed
 #    define USE_GPIOV1
+#    define STM32_SYSCLK KINETIS_SYSCLK_FREQUENCY
+#endif
+#if defined(MK66F18)
+#    define STM32_SYSCLK KINETIS_SYSCLK_FREQUENCY
 #endif
diff --git a/tmk_core/common/chibios/pin_defs.h b/tmk_core/common/chibios/pin_defs.h
index 86bc1076e..c03f8de0c 100644
--- a/tmk_core/common/chibios/pin_defs.h
+++ b/tmk_core/common/chibios/pin_defs.h
@@ -70,6 +70,23 @@
 #    define A13 PAL_LINE(GPIOA, 13)
 #    define A14 PAL_LINE(GPIOA, 14)
 #    define A15 PAL_LINE(GPIOA, 15)
+#    define A16 PAL_LINE(GPIOA, 16)
+#    define A17 PAL_LINE(GPIOA, 17)
+#    define A18 PAL_LINE(GPIOA, 18)
+#    define A19 PAL_LINE(GPIOA, 19)
+#    define A20 PAL_LINE(GPIOA, 20)
+#    define A21 PAL_LINE(GPIOA, 21)
+#    define A22 PAL_LINE(GPIOA, 22)
+#    define A23 PAL_LINE(GPIOA, 23)
+#    define A24 PAL_LINE(GPIOA, 24)
+#    define A25 PAL_LINE(GPIOA, 25)
+#    define A26 PAL_LINE(GPIOA, 26)
+#    define A27 PAL_LINE(GPIOA, 27)
+#    define A28 PAL_LINE(GPIOA, 28)
+#    define A29 PAL_LINE(GPIOA, 29)
+#    define A30 PAL_LINE(GPIOA, 30)
+#    define A31 PAL_LINE(GPIOA, 31)
+#    define A32 PAL_LINE(GPIOA, 32)
 #    define B0 PAL_LINE(GPIOB, 0)
 #    define B1 PAL_LINE(GPIOB, 1)
 #    define B2 PAL_LINE(GPIOB, 2)
@@ -90,6 +107,19 @@
 #    define B17 PAL_LINE(GPIOB, 17)
 #    define B18 PAL_LINE(GPIOB, 18)
 #    define B19 PAL_LINE(GPIOB, 19)
+#    define B20 PAL_LINE(GPIOB, 20)
+#    define B21 PAL_LINE(GPIOB, 21)
+#    define B22 PAL_LINE(GPIOB, 22)
+#    define B23 PAL_LINE(GPIOB, 23)
+#    define B24 PAL_LINE(GPIOB, 24)
+#    define B25 PAL_LINE(GPIOB, 25)
+#    define B26 PAL_LINE(GPIOB, 26)
+#    define B27 PAL_LINE(GPIOB, 27)
+#    define B28 PAL_LINE(GPIOB, 28)
+#    define B29 PAL_LINE(GPIOB, 29)
+#    define B30 PAL_LINE(GPIOB, 30)
+#    define B31 PAL_LINE(GPIOB, 31)
+#    define B32 PAL_LINE(GPIOB, 32)
 #    define C0 PAL_LINE(GPIOC, 0)
 #    define C1 PAL_LINE(GPIOC, 1)
 #    define C2 PAL_LINE(GPIOC, 2)
@@ -106,6 +136,23 @@
 #    define C13 PAL_LINE(GPIOC, 13)
 #    define C14 PAL_LINE(GPIOC, 14)
 #    define C15 PAL_LINE(GPIOC, 15)
+#    define C16 PAL_LINE(GPIOC, 16)
+#    define C17 PAL_LINE(GPIOC, 17)
+#    define C18 PAL_LINE(GPIOC, 18)
+#    define C19 PAL_LINE(GPIOC, 19)
+#    define C20 PAL_LINE(GPIOC, 20)
+#    define C21 PAL_LINE(GPIOC, 21)
+#    define C22 PAL_LINE(GPIOC, 22)
+#    define C23 PAL_LINE(GPIOC, 23)
+#    define C24 PAL_LINE(GPIOC, 24)
+#    define C25 PAL_LINE(GPIOC, 25)
+#    define C26 PAL_LINE(GPIOC, 26)
+#    define C27 PAL_LINE(GPIOC, 27)
+#    define C28 PAL_LINE(GPIOC, 28)
+#    define C29 PAL_LINE(GPIOC, 29)
+#    define C30 PAL_LINE(GPIOC, 30)
+#    define C31 PAL_LINE(GPIOC, 31)
+#    define C32 PAL_LINE(GPIOC, 32)
 #    define D0 PAL_LINE(GPIOD, 0)
 #    define D1 PAL_LINE(GPIOD, 1)
 #    define D2 PAL_LINE(GPIOD, 2)
@@ -122,6 +169,23 @@
 #    define D13 PAL_LINE(GPIOD, 13)
 #    define D14 PAL_LINE(GPIOD, 14)
 #    define D15 PAL_LINE(GPIOD, 15)
+#    define D16 PAL_LINE(GPIOD, 16)
+#    define D17 PAL_LINE(GPIOD, 17)
+#    define D18 PAL_LINE(GPIOD, 18)
+#    define D19 PAL_LINE(GPIOD, 19)
+#    define D20 PAL_LINE(GPIOD, 20)
+#    define D21 PAL_LINE(GPIOD, 21)
+#    define D22 PAL_LINE(GPIOD, 22)
+#    define D23 PAL_LINE(GPIOD, 23)
+#    define D24 PAL_LINE(GPIOD, 24)
+#    define D25 PAL_LINE(GPIOD, 25)
+#    define D26 PAL_LINE(GPIOD, 26)
+#    define D27 PAL_LINE(GPIOD, 27)
+#    define D28 PAL_LINE(GPIOD, 28)
+#    define D29 PAL_LINE(GPIOD, 29)
+#    define D30 PAL_LINE(GPIOD, 30)
+#    define D31 PAL_LINE(GPIOD, 31)
+#    define D32 PAL_LINE(GPIOD, 32)
 #    define E0 PAL_LINE(GPIOE, 0)
 #    define E1 PAL_LINE(GPIOE, 1)
 #    define E2 PAL_LINE(GPIOE, 2)
@@ -138,6 +202,23 @@
 #    define E13 PAL_LINE(GPIOE, 13)
 #    define E14 PAL_LINE(GPIOE, 14)
 #    define E15 PAL_LINE(GPIOE, 15)
+#    define E16 PAL_LINE(GPIOE, 16)
+#    define E17 PAL_LINE(GPIOE, 17)
+#    define E18 PAL_LINE(GPIOE, 18)
+#    define E19 PAL_LINE(GPIOE, 19)
+#    define E20 PAL_LINE(GPIOE, 20)
+#    define E21 PAL_LINE(GPIOE, 21)
+#    define E22 PAL_LINE(GPIOE, 22)
+#    define E23 PAL_LINE(GPIOE, 23)
+#    define E24 PAL_LINE(GPIOE, 24)
+#    define E25 PAL_LINE(GPIOE, 25)
+#    define E26 PAL_LINE(GPIOE, 26)
+#    define E27 PAL_LINE(GPIOE, 27)
+#    define E28 PAL_LINE(GPIOE, 28)
+#    define E29 PAL_LINE(GPIOE, 29)
+#    define E30 PAL_LINE(GPIOE, 30)
+#    define E31 PAL_LINE(GPIOE, 31)
+#    define E32 PAL_LINE(GPIOE, 32)
 #    define F0 PAL_LINE(GPIOF, 0)
 #    define F1 PAL_LINE(GPIOF, 1)
 #    define F2 PAL_LINE(GPIOF, 2)
diff --git a/tmk_core/common/chibios/sleep_led.c b/tmk_core/common/chibios/sleep_led.c
index 5595eec0e..477056a45 100644
--- a/tmk_core/common/chibios/sleep_led.c
+++ b/tmk_core/common/chibios/sleep_led.c
@@ -9,21 +9,13 @@
 * Use LP timer on Kinetises, TIM14 on STM32F0.
 */
-#if defined(KL2x) || defined(K20x)
+#ifndef SLEEP_LED_GPT_DRIVER
+#    if defined(STM32F0XX)
-/* Use Low Power Timer (LPTMR) */
+#        define SLEEP_LED_GPT_DRIVER GPTD14
-#    define TIMER_INTERRUPT_VECTOR KINETIS_LPTMR0_IRQ_VECTOR
+#    endif
-#    define RESET_COUNTER LPTMR0->CSR |= LPTMRx_CSR_TCF
-#elif defined(STM32F0XX)
-/* Use TIM14 manually */
-#    define TIMER_INTERRUPT_VECTOR STM32_TIM14_HANDLER
-#    define RESET_COUNTER STM32_TIM14->SR &= ~STM32_TIM_SR_UIF
 #endif
-#if defined(KL2x) || defined(K20x) || defined(STM32F0XX) /* common parts for timers/interrupts */
+#if defined(KL2x) || defined(K20x) || defined(SLEEP_LED_GPT_DRIVER) /* common parts for timers/interrupts */
 /* Breathing Sleep LED brighness(PWM On period) table
 * (64[steps] * 4[duration]) / 64[PWM periods/s] = 4 second breath cycle
@@ -33,10 +25,7 @@
 */
 static const uint8_t breathing_table[64] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 4, 6, 10, 15, 23, 32, 44, 58, 74, 93, 113, 135, 157, 179, 199, 218, 233, 245, 252, 255, 252, 245, 233, 218, 199, 179, 157, 135, 113, 93, 74, 58, 44, 32, 23, 15, 10, 6, 4, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-/* interrupt handler */
+void sleep_led_timer_callback(void) {
-OSAL_IRQ_HANDLER(TIMER_INTERRUPT_VECTOR) {
-    OSAL_IRQ_PROLOGUE();
    /* Software PWM
     * timer:1111 1111 1111 1111
     *       \_____/\/ \_______/____  count(0-255)
@@ -64,17 +53,16 @@ OSAL_IRQ_HANDLER(TIMER_INTERRUPT_VECTOR) {
    if (timer.pwm.count == breathing_table[timer.pwm.index]) {
        led_set(0);
    }
-    /* Reset the counter */
-    RESET_COUNTER;
-    OSAL_IRQ_EPILOGUE();
 }
 #endif /* common parts for known platforms */
 #if defined(KL2x) || defined(K20x) /* platform selection: familiar Kinetis chips */
+/* Use Low Power Timer (LPTMR) */
+#    define TIMER_INTERRUPT_VECTOR KINETIS_LPTMR0_IRQ_VECTOR
+#    define RESET_COUNTER LPTMR0->CSR |= LPTMRx_CSR_TCF
 /* LPTMR clock options */
 #    define LPTMR_CLOCK_MCGIRCLK 0 /* 4MHz clock */
 #    define LPTMR_CLOCK_LPO 1      /* 1kHz clock */
@@ -86,6 +74,18 @@ OSAL_IRQ_HANDLER(TIMER_INTERRUPT_VECTOR) {
 #        define SIM_SCGC5_LPTMR SIM_SCGC5_LPTIMER
 #    endif
+/* interrupt handler */
+OSAL_IRQ_HANDLER(TIMER_INTERRUPT_VECTOR) {
+    OSAL_IRQ_PROLOGUE();
+    sleep_led_timer_callback();
+    /* Reset the counter */
+    RESET_COUNTER;
+    OSAL_IRQ_EPILOGUE();
+}
 /* Initialise the timer */
 void sleep_led_init(void) {
    /* Make sure the clock to the LPTMR is enabled */
@@ -159,45 +159,23 @@ void sleep_led_toggle(void) {
    LPTMR0->CSR ^= LPTMRx_CSR_TEN;
 }
-#elif defined(STM32F0XX) /* platform selection: STM32F0XX */
+#elif defined(SLEEP_LED_GPT_DRIVER)
-/* Initialise the timer */
-void sleep_led_init(void) {
-    /* enable clock */
-    rccEnableTIM14(FALSE); /* low power enable = FALSE */
-    rccResetTIM14();
-    /* prescale */
-    /* Assuming 48MHz internal clock */
-    /* getting cca 65484 irqs/sec */
-    STM32_TIM14->PSC = 733;
-    /* auto-reload */
+static void gptTimerCallback(GPTDriver *gptp) {
-    /* 0 => interrupt every time */
+    (void)gptp;
-    STM32_TIM14->ARR = 3;
+    sleep_led_timer_callback();
+}
-    /* enable counter update event interrupt */
+static const GPTConfig gptcfg = {1000000, gptTimerCallback, 0, 0};
-    STM32_TIM14->DIER |= STM32_TIM_DIER_UIE;
-    /* register interrupt vector */
+/* Initialise the timer */
-    nvicEnableVector(STM32_TIM14_NUMBER, 2); /* vector, priority */
+void sleep_led_init(void) { gptStart(&SLEEP_LED_GPT_DRIVER, &gptcfg); }
-}
-void sleep_led_enable(void) {
+void sleep_led_enable(void) { gptStartContinuous(&SLEEP_LED_GPT_DRIVER, gptcfg.frequency / 0xFFFF); }
-    /* Enable the timer */
-    STM32_TIM14->CR1 = STM32_TIM_CR1_CEN | STM32_TIM_CR1_URS;
-    /* URS => update event only on overflow; setting UG bit disabled */
-}
-void sleep_led_disable(void) {
+void sleep_led_disable(void) { gptStopTimer(&SLEEP_LED_GPT_DRIVER); }
-    /* Disable the timer */
-    STM32_TIM14->CR1 = 0;
-}
-void sleep_led_toggle(void) {
+void sleep_led_toggle(void) { (SLEEP_LED_GPT_DRIVER.state == GPT_READY) ? sleep_led_enable() : sleep_led_disable(); }
-    /* Toggle the timer */
-    STM32_TIM14->CR1 ^= STM32_TIM_CR1_CEN;
-}
 #else /* platform selection: not on familiar chips */
diff --git a/tmk_core/common/chibios/suspend.c b/tmk_core/common/chibios/suspend.c
index 49e20641f..b3949185e 100644
--- a/tmk_core/common/chibios/suspend.c
+++ b/tmk_core/common/chibios/suspend.c
@@ -24,6 +24,13 @@
 #    include "rgblight.h"
 #endif
+#ifdef LED_MATRIX_ENABLE
+#    include "led_matrix.h"
+#endif
+#ifdef RGB_MATRIX_ENABLE
+#    include "rgb_matrix.h"
+#endif
 /** \brief suspend idle
 *
 * FIXME: needs doc
@@ -53,6 +60,13 @@ void suspend_power_down(void) {
    backlight_set(0);
 #endif
+#ifdef LED_MATRIX_ENABLE
+    led_matrix_task();
+#endif
+#ifdef RGB_MATRIX_ENABLE
+    rgb_matrix_task();
+#endif
    // Turn off LED indicators
    uint8_t leds_off = 0;
 #if defined(BACKLIGHT_CAPS_LOCK) && defined(BACKLIGHT_ENABLE)
diff --git a/tmk_core/common/chibios/wait.c b/tmk_core/common/chibios/wait.c
new file mode 100644
index 000000000..c6270fd95
--- /dev/null
+++ b/tmk_core/common/chibios/wait.c
@@ -0,0 +1,89 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 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/>.
+ */
+#ifndef __OPTIMIZE__
+#    pragma message "Compiler optimizations disabled; wait_cpuclock() won't work as designed"
+#endif
+#define CLOCK_DELAY_NOP8 "nop\n\t nop\n\t nop\n\t nop\n\t   nop\n\t nop\n\t nop\n\t nop\n\t"
+__attribute__((always_inline)) static inline void wait_cpuclock(unsigned int n) { /* n: 1..135 */
+    /* The argument n must be a constant expression.
+     * That way, compiler optimization will remove unnecessary code. */
+    if (n < 1) {
+        return;
+    }
+    if (n > 8) {
+        unsigned int n8 = n / 8;
+        n               = n - n8 * 8;
+        switch (n8) {
+            case 16:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 15:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 14:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 13:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 12:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 11:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 10:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 9:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 8:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 7:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 6:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 5:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 4:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 3:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 2:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 1:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 0:
+                break;
+        }
+    }
+    switch (n) {
+        case 8:
+            asm volatile("nop" ::: "memory");
+        case 7:
+            asm volatile("nop" ::: "memory");
+        case 6:
+            asm volatile("nop" ::: "memory");
+        case 5:
+            asm volatile("nop" ::: "memory");
+        case 4:
+            asm volatile("nop" ::: "memory");
+        case 3:
+            asm volatile("nop" ::: "memory");
+        case 2:
+            asm volatile("nop" ::: "memory");
+        case 1:
+            asm volatile("nop" ::: "memory");
+        case 0:
+            break;
+    }
+}
+\ No newline at end of file
diff --git a/tmk_core/common/eeconfig.c b/tmk_core/common/eeconfig.c
index 5e3ebe6ee..92a509217 100644
--- a/tmk_core/common/eeconfig.c
+++ b/tmk_core/common/eeconfig.c
@@ -57,7 +57,7 @@ void eeconfig_init_quantum(void) {
    eeprom_update_dword(EECONFIG_HAPTIC, 0);
    eeprom_update_byte(EECONFIG_VELOCIKEY, 0);
    eeprom_update_dword(EECONFIG_RGB_MATRIX, 0);
-    eeprom_update_byte(EECONFIG_RGB_MATRIX_SPEED, 0);
+    eeprom_update_word(EECONFIG_RGB_MATRIX_EXTENDED, 0);
    // TODO: Remove once ARM has a way to configure EECONFIG_HANDEDNESS
    //        within the emulated eeprom via dfu-util or another tool
diff --git a/tmk_core/common/eeconfig.h b/tmk_core/common/eeconfig.h
index 86b9e6f99..9e18fd4e1 100644
--- a/tmk_core/common/eeconfig.h
+++ b/tmk_core/common/eeconfig.h
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <stdbool.h>
 #ifndef EECONFIG_MAGIC_NUMBER
-#    define EECONFIG_MAGIC_NUMBER (uint16_t)0xFEEB  // When changing, decrement this value to avoid future re-init issues
+#    define EECONFIG_MAGIC_NUMBER (uint16_t)0xFEEA  // When changing, decrement this value to avoid future re-init issues
 #endif
 #define EECONFIG_MAGIC_NUMBER_OFF (uint16_t)0xFFFF
@@ -43,12 +43,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EECONFIG_VELOCIKEY (uint8_t *)23
 #define EECONFIG_HAPTIC (uint32_t *)24
+// Mutually exclusive
+#define EECONFIG_LED_MATRIX (uint32_t *)28
 #define EECONFIG_RGB_MATRIX (uint32_t *)28
-#define EECONFIG_RGB_MATRIX_SPEED (uint8_t *)32
+// Speed & Flags
+#define EECONFIG_LED_MATRIX_EXTENDED (uint16_t *)32
+#define EECONFIG_RGB_MATRIX_EXTENDED (uint16_t *)32
 // TODO: Combine these into a single word and single block of EEPROM
-#define EECONFIG_KEYMAP_UPPER_BYTE (uint8_t *)33
+#define EECONFIG_KEYMAP_UPPER_BYTE (uint8_t *)34
 // Size of EEPROM being used, other code can refer to this for available EEPROM
-#define EECONFIG_SIZE 34
+#define EECONFIG_SIZE 35
 /* debug bit */
 #define EECONFIG_DEBUG_ENABLE (1 << 0)
 #define EECONFIG_DEBUG_MATRIX (1 << 1)
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c
index ce3255c06..24baf41c0 100644
--- a/tmk_core/common/keyboard.c
+++ b/tmk_core/common/keyboard.c
@@ -34,11 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef BACKLIGHT_ENABLE
 #    include "backlight.h"
 #endif
-#ifdef BOOTMAGIC_ENABLE
-#    include "bootmagic.h"
-#else
-#    include "magic.h"
-#endif
 #ifdef MOUSEKEY_ENABLE
 #    include "mousekey.h"
 #endif
@@ -54,6 +49,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGBLIGHT_ENABLE
 #    include "rgblight.h"
 #endif
+#ifdef LED_MATRIX_ENABLE
+#    include "led_matrix.h"
+#endif
 #ifdef RGB_MATRIX_ENABLE
 #    include "rgb_matrix.h"
 #endif
@@ -96,6 +94,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef DIP_SWITCH_ENABLE
 #    include "dip_switch.h"
 #endif
+#ifdef STM32_EEPROM_ENABLE
+#    include "eeprom_stm32.h"
+#endif
+#ifdef EEPROM_DRIVER
+#    include "eeprom_driver.h"
+#endif
 static uint32_t last_input_modification_time = 0;
 uint32_t        last_input_activity_time(void) { return last_input_modification_time; }
@@ -233,6 +237,12 @@ void keyboard_setup(void) {
    disable_jtag();
 #endif
    print_set_sendchar(sendchar);
+#ifdef STM32_EEPROM_ENABLE
+    EEPROM_Init();
+#endif
+#ifdef EEPROM_DRIVER
+    eeprom_driver_init();
+#endif
    matrix_setup();
    keyboard_pre_init_kb();
 }
@@ -296,11 +306,6 @@ void keyboard_init(void) {
 #ifdef ADB_MOUSE_ENABLE
    adb_mouse_init();
 #endif
-#ifdef BOOTMAGIC_ENABLE
-    bootmagic();
-#else
-    magic();
-#endif
 #ifdef BACKLIGHT_ENABLE
    backlight_init();
 #endif
@@ -337,6 +342,9 @@ void keyboard_init(void) {
 * This is differnet than keycode events as no layer processing, or filtering occurs.
 */
 void switch_events(uint8_t row, uint8_t col, bool pressed) {
+#if defined(LED_MATRIX_ENABLE)
+    process_led_matrix(row, col, pressed);
+#endif
 #if defined(RGB_MATRIX_ENABLE)
    process_rgb_matrix(row, col, pressed);
 #endif
@@ -422,6 +430,9 @@ MATRIX_LOOP_END:
    rgblight_task();
 #endif
+#ifdef LED_MATRIX_ENABLE
+    led_matrix_task();
+#endif
 #ifdef RGB_MATRIX_ENABLE
    rgb_matrix_task();
 #endif
diff --git a/tmk_core/common/magic.c b/tmk_core/common/magic.c
deleted file mode 100644
index e14994164..000000000
--- a/tmk_core/common/magic.c
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <stdint.h>
-#include <stdbool.h>
-#if defined(__AVR__)
-#    include <util/delay.h>
-#endif
-#include "matrix.h"
-#include "bootloader.h"
-#include "debug.h"
-#include "keymap.h"
-#include "host.h"
-#include "action_layer.h"
-#include "eeconfig.h"
-#include "magic.h"
-keymap_config_t keymap_config;
-/** \brief Magic
- *
- * FIXME: Needs doc
- */
-void magic(void) {
-    /* check signature */
-    if (!eeconfig_is_enabled()) {
-        eeconfig_init();
-    }
-    /* debug enable */
-    debug_config.raw = eeconfig_read_debug();
-    /* keymap config */
-    keymap_config.raw = eeconfig_read_keymap();
-    uint8_t default_layer = 0;
-    default_layer         = eeconfig_read_default_layer();
-    default_layer_set((layer_state_t)default_layer);
-    /* Also initialize layer state to trigger callback functions for layer_state */
-    layer_state_set_kb((layer_state_t)layer_state);
-}
diff --git a/tmk_core/common/magic.h b/tmk_core/common/magic.h
deleted file mode 100644
index a6552c04d..000000000
--- a/tmk_core/common/magic.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-void magic(void);
diff --git a/tmk_core/common/test/_wait.h b/tmk_core/common/test/_wait.h
new file mode 100644
index 000000000..4e22f593b
--- /dev/null
+++ b/tmk_core/common/test/_wait.h
@@ -0,0 +1,22 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include <inttypes.h>
+void wait_ms(uint32_t ms);
+#define wait_us(us) wait_ms(us / 1000)
+#define waitInputPinDelay()
diff --git a/tmk_core/common/usb_util.c b/tmk_core/common/usb_util.c
new file mode 100644
index 000000000..e4c50fcb1
--- /dev/null
+++ b/tmk_core/common/usb_util.c
@@ -0,0 +1,29 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 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 "usb_util.h"
+#include "wait.h"
+__attribute__((weak)) void usb_disable(void) {}
+__attribute__((weak)) bool usb_connected_state(void) { return true; }
+__attribute__((weak)) bool usb_vbus_state(void) {
+#ifdef USB_VBUS_PIN
+    setPinInput(USB_VBUS_PIN);
+    wait_us(5);
+    return readPin(USB_VBUS_PIN);
+#else
+    return true;
+#endif
+}
diff --git a/tmk_core/common/usb_util.h b/tmk_core/common/usb_util.h
new file mode 100644
index 000000000..4ebedb1e7
--- /dev/null
+++ b/tmk_core/common/usb_util.h
@@ -0,0 +1,22 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include <stdbool.h>
+void usb_disable(void);
+bool usb_connected_state(void);
+bool usb_vbus_state(void);
diff --git a/tmk_core/common/wait.h b/tmk_core/common/wait.h
index 28224fe3a..cf7180fb0 100644
--- a/tmk_core/common/wait.h
+++ b/tmk_core/common/wait.h
@@ -1,3 +1,18 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 #pragma once
 #include <inttypes.h>
@@ -6,114 +21,8 @@
 extern "C" {
 #endif
-#if defined(__ARMEL__) || defined(__ARMEB__)
+#if __has_include_next("_wait.h")
-#    ifndef __OPTIMIZE__
+#    include_next "_wait.h" /* Include the platforms _wait.h */
-#        pragma message "Compiler optimizations disabled; wait_cpuclock() won't work as designed"
-#    endif
-#    define wait_cpuclock(x) wait_cpuclock_allnop(x)
-#    define CLOCK_DELAY_NOP8 "nop\n\t nop\n\t nop\n\t nop\n\t   nop\n\t nop\n\t nop\n\t nop\n\t"
-__attribute__((always_inline)) static inline void wait_cpuclock_allnop(unsigned int n) { /* n: 1..135 */
-    /* The argument n must be a constant expression.
-     * That way, compiler optimization will remove unnecessary code. */
-    if (n < 1) {
-        return;
-    }
-    if (n > 8) {
-        unsigned int n8 = n / 8;
-        n               = n - n8 * 8;
-        switch (n8) {
-            case 16:
-                asm volatile(CLOCK_DELAY_NOP8::: "memory");
-            case 15:
-                asm volatile(CLOCK_DELAY_NOP8::: "memory");
-            case 14:
-                asm volatile(CLOCK_DELAY_NOP8::: "memory");
-            case 13:
-                asm volatile(CLOCK_DELAY_NOP8::: "memory");
-            case 12:
-                asm volatile(CLOCK_DELAY_NOP8::: "memory");
-            case 11:
-                asm volatile(CLOCK_DELAY_NOP8::: "memory");
-            case 10:
-                asm volatile(CLOCK_DELAY_NOP8::: "memory");
-            case 9:
-                asm volatile(CLOCK_DELAY_NOP8::: "memory");
-            case 8:
-                asm volatile(CLOCK_DELAY_NOP8::: "memory");
-            case 7:
-                asm volatile(CLOCK_DELAY_NOP8::: "memory");
-            case 6:
-                asm volatile(CLOCK_DELAY_NOP8::: "memory");
-            case 5:
-                asm volatile(CLOCK_DELAY_NOP8::: "memory");
-            case 4:
-                asm volatile(CLOCK_DELAY_NOP8::: "memory");
-            case 3:
-                asm volatile(CLOCK_DELAY_NOP8::: "memory");
-            case 2:
-                asm volatile(CLOCK_DELAY_NOP8::: "memory");
-            case 1:
-                asm volatile(CLOCK_DELAY_NOP8::: "memory");
-            case 0:
-                break;
-        }
-    }
-    switch (n) {
-        case 8:
-            asm volatile("nop" ::: "memory");
-        case 7:
-            asm volatile("nop" ::: "memory");
-        case 6:
-            asm volatile("nop" ::: "memory");
-        case 5:
-            asm volatile("nop" ::: "memory");
-        case 4:
-            asm volatile("nop" ::: "memory");
-        case 3:
-            asm volatile("nop" ::: "memory");
-        case 2:
-            asm volatile("nop" ::: "memory");
-        case 1:
-            asm volatile("nop" ::: "memory");
-        case 0:
-            break;
-    }
-}
-#endif
-#if defined(__AVR__)
-#    include <util/delay.h>
-#    define wait_ms(ms) _delay_ms(ms)
-#    define wait_us(us) _delay_us(us)
-#    define wait_cpuclock(x) __builtin_avr_delay_cycles(x)
-#elif defined PROTOCOL_CHIBIOS
-#    include <ch.h>
-#    define wait_ms(ms)                     \
-        do {                                \
-            if (ms != 0) {                  \
-                chThdSleepMilliseconds(ms); \
-            } else {                        \
-                chThdSleepMicroseconds(1);  \
-            }                               \
-        } while (0)
-#    define wait_us(us)                     \
-        do {                                \
-            if (us != 0) {                  \
-                chThdSleepMicroseconds(us); \
-            } else {                        \
-                chThdSleepMicroseconds(1);  \
-            }                               \
-        } while (0)
-#elif defined PROTOCOL_ARM_ATSAM
-#    include "clks.h"
-#    define wait_ms(ms) CLK_delay_ms(ms)
-#    define wait_us(us) CLK_delay_us(us)
-#else  // Unit tests
-void wait_ms(uint32_t ms);
-#    define wait_us(us) wait_ms(us / 1000)
 #endif
 #ifdef __cplusplus
diff --git a/tmk_core/protocol.mk b/tmk_core/protocol.mk
index 0c41642b9..cc87e8347 100644
--- a/tmk_core/protocol.mk
+++ b/tmk_core/protocol.mk
@@ -54,5 +54,9 @@ ifeq ($(strip $(XT_ENABLE)), yes)
    OPT_DEFS += -DXT_ENABLE
 endif
+ifeq ($(strip $(USB_HID_ENABLE)), yes)
+    include $(TMK_DIR)/protocol/usb_hid.mk
+endif
 # Search Path
 VPATH += $(TMK_DIR)/protocol
diff --git a/tmk_core/protocol/chibios.mk b/tmk_core/protocol/chibios.mk
index 80554abb3..d01697835 100644
--- a/tmk_core/protocol/chibios.mk
+++ b/tmk_core/protocol/chibios.mk
@@ -6,6 +6,7 @@ SRC += $(CHIBIOS_DIR)/usb_main.c
 SRC += $(CHIBIOS_DIR)/main.c
 SRC += usb_descriptor.c
 SRC += $(CHIBIOS_DIR)/usb_driver.c
+SRC += $(CHIBIOS_DIR)/usb_util.c
 SRC += $(LIBSRC)
 VPATH += $(TMK_PATH)/$(PROTOCOL_DIR)
diff --git a/tmk_core/protocol/chibios/main.c b/tmk_core/protocol/chibios/main.c
index 63e4c99d2..e2ec01118 100644
--- a/tmk_core/protocol/chibios/main.c
+++ b/tmk_core/protocol/chibios/main.c
@@ -51,12 +51,6 @@
 #ifdef MIDI_ENABLE
 #    include "qmk_midi.h"
 #endif
-#ifdef STM32_EEPROM_ENABLE
-#    include "eeprom_stm32.h"
-#endif
-#ifdef EEPROM_DRIVER
-#    include "eeprom_driver.h"
-#endif
 #include "suspend.h"
 #include "wait.h"
@@ -150,13 +144,6 @@ int main(void) {
    halInit();
    chSysInit();
-#ifdef STM32_EEPROM_ENABLE
-    EEPROM_Init();
-#endif
-#ifdef EEPROM_DRIVER
-    eeprom_driver_init();
-#endif
    // TESTING
    // chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);
diff --git a/tmk_core/protocol/chibios/usb_util.c b/tmk_core/protocol/chibios/usb_util.c
new file mode 100644
index 000000000..5945e8a8d
--- /dev/null
+++ b/tmk_core/protocol/chibios/usb_util.c
@@ -0,0 +1,21 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 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 <hal.h>
+#include "usb_util.h"
+void usb_disable(void) { usbStop(&USBD1); }
+bool usb_connected_state(void) { return usbGetDriverStateI(&USBD1) == USB_ACTIVE; }
diff --git a/tmk_core/protocol/lufa.mk b/tmk_core/protocol/lufa.mk
index 1cc1fa04e..514d5fac4 100644
--- a/tmk_core/protocol/lufa.mk
+++ b/tmk_core/protocol/lufa.mk
@@ -44,6 +44,7 @@ ifeq ($(strip $(VIRTSER_ENABLE)), yes)
 endif
 SRC += $(LUFA_SRC)
+SRC += $(LUFA_DIR)/usb_util.c
 # Search Path
 VPATH += $(TMK_PATH)/$(LUFA_DIR)
@@ -66,8 +67,8 @@ LUFA_OPTS += -DFIXED_CONTROL_ENDPOINT_SIZE=8
 LUFA_OPTS += -DFIXED_CONTROL_ENDPOINT_SIZE=8
 LUFA_OPTS += -DFIXED_NUM_CONFIGURATIONS=1
-# Remote wakeup fix for ATmega32U2        https://github.com/tmk/tmk_keyboard/issues/361
+# Remote wakeup fix for ATmega16/32U2        https://github.com/tmk/tmk_keyboard/issues/361
-ifeq ($(MCU),atmega32u2)
+ifneq (,$(filter $(MCU), at90usb162 atmega16u2 atmega32u2))
        LUFA_OPTS += -DNO_LIMITED_CONTROLLER_CONNECT
 endif
diff --git a/tmk_core/protocol/lufa/usb_util.c b/tmk_core/protocol/lufa/usb_util.c
new file mode 100644
index 000000000..9e943a21b
--- /dev/null
+++ b/tmk_core/protocol/lufa/usb_util.c
@@ -0,0 +1,34 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 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 <LUFA/Drivers/USB/USB.h>
+#include "usb_util.h"
+#include "wait.h"
+void usb_disable(void) {
+    USB_Disable();
+    USB_DeviceState = DEVICE_STATE_Unattached;
+}
+bool usb_connected_state(void) { return USB_Device_IsAddressSet(); }
+#if defined(OTGPADE)
+bool usb_vbus_state(void) {
+    USB_OTGPAD_On();  // enables VBUS pad
+    wait_us(5);
+    return USB_VBUS_GetStatus();  // checks state of VBUS
+}
+#endif
diff --git a/tmk_core/protocol/vusb.mk b/tmk_core/protocol/vusb.mk
index 1de600308..e4d013b38 100644
--- a/tmk_core/protocol/vusb.mk
+++ b/tmk_core/protocol/vusb.mk
@@ -5,6 +5,7 @@ VUSB_PATH = $(LIB_PATH)/vusb
 SRC += $(VUSB_DIR)/main.c \
        $(VUSB_DIR)/vusb.c \
+        $(VUSB_DIR)/usb_util.c \
        $(VUSB_PATH)/usbdrv/usbdrv.c \
        $(VUSB_PATH)/usbdrv/usbdrvasm.S \
        $(VUSB_PATH)/usbdrv/oddebug.c
diff --git a/tmk_core/protocol/vusb/usb_util.c b/tmk_core/protocol/vusb/usb_util.c
new file mode 100644
index 000000000..602854dbe
--- /dev/null
+++ b/tmk_core/protocol/vusb/usb_util.c
@@ -0,0 +1,24 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 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 <usbdrv/usbdrv.h>
+#include "usb_util.h"
+void usb_disable(void) { usbDeviceDisconnect(); }
+bool usb_connected_state(void) {
+    usbPoll();
+    return usbConfiguration;
+}
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index bbcfc1e4d..8dbed35fb 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -223,6 +223,12 @@ ifneq ($(filter Darwin FreeBSD,$(shell uname -s)),)
  MD5SUM = md5
 endif
+# UF2 format settings
+# To produce a UF2 file in your build, add to your keyboard's rules.mk:
+#      FIRMWARE_FORMAT = uf2
+UF2CONV = $(TOP_DIR)/util/uf2conv.py
+UF2_FAMILY ?= 0x0
 # Compiler flags to generate dependency files.
 #GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d
 GENDEPFLAGS = -MMD -MP -MF $(patsubst %.o,%.td,$@)
@@ -255,6 +261,7 @@ DFU_SUFFIX_ARGS ?=
 elf: $(BUILD_DIR)/$(TARGET).elf
 hex: $(BUILD_DIR)/$(TARGET).hex
+uf2: $(BUILD_DIR)/$(TARGET).uf2
 cpfirmware: $(FIRMWARE_FORMAT)
        $(SILENT) || printf "Copying $(TARGET).$(FIRMWARE_FORMAT) to qmk_firmware folder" | $(AWK_CMD)
        $(COPY) $(BUILD_DIR)/$(TARGET).$(FIRMWARE_FORMAT) $(TARGET).$(FIRMWARE_FORMAT) && $(PRINT_OK)
@@ -283,32 +290,44 @@ gccversion :
 # Create final output files (.hex, .eep) from ELF output file.
 %.hex: %.elf
-        @$(SILENT) || printf "$(MSG_FLASH) $@" | $(AWK_CMD)
        $(eval CMD=$(HEX) $< $@)
+        #@$(SILENT) || printf "$(MSG_EXECUTING) '$(CMD)':\n"
+        @$(SILENT) || printf "$(MSG_FLASH) $@" | $(AWK_CMD)
+        @$(BUILD_CMD)
+%.uf2: %.hex
+        $(eval CMD=$(UF2CONV) $(BUILD_DIR)/$(TARGET).hex -o $(BUILD_DIR)/$(TARGET).uf2 -c -f $(UF2_FAMILY) >/dev/null 2>&1)
+        #@$(SILENT) || printf "$(MSG_EXECUTING) '$(CMD)':\n"
+        @$(SILENT) || printf "$(MSG_UF2) $@" | $(AWK_CMD)
        @$(BUILD_CMD)
 %.eep: %.elf
-        @$(SILENT) || printf "$(MSG_EEPROM) $@" | $(AWK_CMD)
        $(eval CMD=$(EEP) $< $@ || exit 0)
+        #@$(SILENT) || printf "$(MSG_EXECUTING) '$(CMD)':\n"
+        @$(SILENT) || printf "$(MSG_EEPROM) $@" | $(AWK_CMD)
        @$(BUILD_CMD)
 # Create extended listing file from ELF output file.
 %.lss: %.elf
-        @$(SILENT) || printf "$(MSG_EXTENDED_LISTING) $@" | $(AWK_CMD)
        $(eval CMD=$(OBJDUMP) -h -S -z $< > $@)
+        #@$(SILENT) || printf "$(MSG_EXECUTING) '$(CMD)':\n"
+        @$(SILENT) || printf "$(MSG_EXTENDED_LISTING) $@" | $(AWK_CMD)
        @$(BUILD_CMD)
 # Create a symbol table from ELF output file.
 %.sym: %.elf
-        @$(SILENT) || printf "$(MSG_SYMBOL_TABLE) $@" | $(AWK_CMD)
        $(eval CMD=$(NM) -n $< > $@ )
+        #@$(SILENT) || printf "$(MSG_EXECUTING) '$(CMD)':\n"
+        @$(SILENT) || printf "$(MSG_SYMBOL_TABLE) $@" | $(AWK_CMD)
        @$(BUILD_CMD)
 %.bin: %.elf
-        @$(SILENT) || printf "$(MSG_BIN) $@" | $(AWK_CMD)
        $(eval CMD=$(BIN) $< $@ || exit 0)
+        #@$(SILENT) || printf "$(MSG_EXECUTING) '$(CMD)':\n"
+        @$(SILENT) || printf "$(MSG_BIN) $@" | $(AWK_CMD)
        @$(BUILD_CMD)
        if [ ! -z "$(DFU_SUFFIX_ARGS)" ]; then \
+                #$(SILENT) || printf "$(MSG_EXECUTING) '$(DFU_SUFFIX) $(DFU_SUFFIX_ARGS) -a $(BUILD_DIR)/$(TARGET).bin 1>/dev/null':\n" ;\
                $(DFU_SUFFIX) $(DFU_SUFFIX_ARGS) -a $(BUILD_DIR)/$(TARGET).bin 1>/dev/null ;\
        fi
        $(COPY) $(BUILD_DIR)/$(TARGET).bin $(TARGET).bin;
@@ -476,7 +495,7 @@ $(eval $(foreach OUTPUT,$(OUTPUTS),$(shell mkdir -p $(OUTPUT) 2>/dev/null)))
 # Listing of phony targets.
 .PHONY : all dump_vars finish sizebefore sizeafter qmkversion \
-gccversion build elf hex eep lss sym coff extcoff \
+gccversion build elf hex uf2 eep lss sym coff extcoff \
 clean clean_list debug gdb-config show_path \
 program teensy dfu dfu-ee dfu-start \
 flash dfu-split-left dfu-split-right \
diff --git a/users/gordon/rules.mk b/users/gordon/rules.mk
index 19e77b01b..06e671a63 100644
--- a/users/gordon/rules.mk
+++ b/users/gordon/rules.mk
@@ -1,4 +1,4 @@
 TAP_DANCE_ENABLE = yes
 SRC += gordon.c
-# BOOTMAGIC_ENABLE = yes
+# BOOTMAGIC_ENABLE = full
diff --git a/util/uf2conv.py b/util/uf2conv.py
new file mode 100755
index 000000000..044a7f231
--- /dev/null
+++ b/util/uf2conv.py
@@ -0,0 +1,319 @@
+#!/usr/bin/env python3
+import sys
+import struct
+import subprocess
+import re
+import os
+import os.path
+import argparse
+UF2_MAGIC_START0 = 0x0A324655 # "UF2\n"
+UF2_MAGIC_START1 = 0x9E5D5157 # Randomly selected
+UF2_MAGIC_END    = 0x0AB16F30 # Ditto
+families = {
+    'SAMD21': 0x68ed2b88,
+    'SAML21': 0x1851780a,
+    'SAMD51': 0x55114460,
+    'NRF52': 0x1b57745f,
+    'STM32F0': 0x647824b6,
+    'STM32F1': 0x5ee21072,
+    'STM32F2': 0x5d1a0a2e,
+    'STM32F3': 0x6b846188,
+    'STM32F4': 0x57755a57,
+    'STM32F7': 0x53b80f00,
+    'STM32G0': 0x300f5633,
+    'STM32G4': 0x4c71240a,
+    'STM32H7': 0x6db66082,
+    'STM32L0': 0x202e3a91,
+    'STM32L1': 0x1e1f432d,
+    'STM32L4': 0x00ff6919,
+    'STM32L5': 0x04240bdf,
+    'STM32WB': 0x70d16653,
+    'STM32WL': 0x21460ff0,
+    'ATMEGA32': 0x16573617,
+    'MIMXRT10XX': 0x4FB2D5BD,
+    'LPC55': 0x2abc77ec,
+    'GD32F350': 0x31D228C6,
+    'ESP32S2': 0xbfdd4eee,
+    'RP2040': 0xe48bff56
+}
+INFO_FILE = "/INFO_UF2.TXT"
+appstartaddr = 0x2000
+familyid = 0x0
+def is_uf2(buf):
+    w = struct.unpack("<II", buf[0:8])
+    return w[0] == UF2_MAGIC_START0 and w[1] == UF2_MAGIC_START1
+def is_hex(buf):
+    try:
+        w = buf[0:30].decode("utf-8")
+    except UnicodeDecodeError:
+        return False
+    if w[0] == ':' and re.match(b"^[:0-9a-fA-F\r\n]+$", buf):
+        return True
+    return False
+def convert_from_uf2(buf):
+    global appstartaddr
+    numblocks = len(buf) // 512
+    curraddr = None
+    outp = []
+    for blockno in range(numblocks):
+        ptr = blockno * 512
+        block = buf[ptr:ptr + 512]
+        hd = struct.unpack(b"<IIIIIIII", block[0:32])
+        if hd[0] != UF2_MAGIC_START0 or hd[1] != UF2_MAGIC_START1:
+            print("Skipping block at " + ptr + "; bad magic")
+            continue
+        if hd[2] & 1:
+            # NO-flash flag set; skip block
+            continue
+        datalen = hd[4]
+        if datalen > 476:
+            assert False, "Invalid UF2 data size at " + ptr
+        newaddr = hd[3]
+        if curraddr == None:
+            appstartaddr = newaddr
+            curraddr = newaddr
+        padding = newaddr - curraddr
+        if padding < 0:
+            assert False, "Block out of order at " + ptr
+        if padding > 10*1024*1024:
+            assert False, "More than 10M of padding needed at " + ptr
+        if padding % 4 != 0:
+            assert False, "Non-word padding size at " + ptr
+        while padding > 0:
+            padding -= 4
+            outp += b"\x00\x00\x00\x00"
+        outp.append(block[32 : 32 + datalen])
+        curraddr = newaddr + datalen
+    return b"".join(outp)
+def convert_to_carray(file_content):
+    outp = "const unsigned long bindata_len = %d;\n" % len(file_content)
+    outp += "const unsigned char bindata[] __attribute__((aligned(16))) = {"
+    for i in range(len(file_content)):
+        if i % 16 == 0:
+            outp += "\n"
+        outp += "0x%02x, " % file_content[i]
+    outp += "\n};\n"
+    return bytes(outp, "utf-8")
+def convert_to_uf2(file_content):
+    global familyid
+    datapadding = b""
+    while len(datapadding) < 512 - 256 - 32 - 4:
+        datapadding += b"\x00\x00\x00\x00"
+    numblocks = (len(file_content) + 255) // 256
+    outp = []
+    for blockno in range(numblocks):
+        ptr = 256 * blockno
+        chunk = file_content[ptr:ptr + 256]
+        flags = 0x0
+        if familyid:
+            flags |= 0x2000
+        hd = struct.pack(b"<IIIIIIII",
+            UF2_MAGIC_START0, UF2_MAGIC_START1,
+            flags, ptr + appstartaddr, 256, blockno, numblocks, familyid)
+        while len(chunk) < 256:
+            chunk += b"\x00"
+        block = hd + chunk + datapadding + struct.pack(b"<I", UF2_MAGIC_END)
+        assert len(block) == 512
+        outp.append(block)
+    return b"".join(outp)
+class Block:
+    def __init__(self, addr):
+        self.addr = addr
+        self.bytes = bytearray(256)
+    def encode(self, blockno, numblocks):
+        global familyid
+        flags = 0x0
+        if familyid:
+            flags |= 0x2000
+        hd = struct.pack("<IIIIIIII",
+            UF2_MAGIC_START0, UF2_MAGIC_START1,
+            flags, self.addr, 256, blockno, numblocks, familyid)
+        hd += self.bytes[0:256]
+        while len(hd) < 512 - 4:
+            hd += b"\x00"
+        hd += struct.pack("<I", UF2_MAGIC_END)
+        return hd
+def convert_from_hex_to_uf2(buf):
+    global appstartaddr
+    appstartaddr = None
+    upper = 0
+    currblock = None
+    blocks = []
+    for line in buf.split('\n'):
+        if line[0] != ":":
+            continue
+        i = 1
+        rec = []
+        while i < len(line) - 1:
+            rec.append(int(line[i:i+2], 16))
+            i += 2
+        tp = rec[3]
+        if tp == 4:
+            upper = ((rec[4] << 8) | rec[5]) << 16
+        elif tp == 2:
+            upper = ((rec[4] << 8) | rec[5]) << 4
+            assert (upper & 0xffff) == 0
+        elif tp == 1:
+            break
+        elif tp == 0:
+            addr = upper | (rec[1] << 8) | rec[2]
+            if appstartaddr == None:
+                appstartaddr = addr
+            i = 4
+            while i < len(rec) - 1:
+                if not currblock or currblock.addr & ~0xff != addr & ~0xff:
+                    currblock = Block(addr & ~0xff)
+                    blocks.append(currblock)
+                currblock.bytes[addr & 0xff] = rec[i]
+                addr += 1
+                i += 1
+    numblocks = len(blocks)
+    resfile = b""
+    for i in range(0, numblocks):
+        resfile += blocks[i].encode(i, numblocks)
+    return resfile
+def to_str(b):
+    return b.decode("utf-8")
+def get_drives():
+    drives = []
+    if sys.platform == "win32":
+        r = subprocess.check_output(["wmic", "PATH", "Win32_LogicalDisk",
+                                     "get", "DeviceID,", "VolumeName,",
+                                     "FileSystem,", "DriveType"])
+        for line in to_str(r).split('\n'):
+            words = re.split('\s+', line)
+            if len(words) >= 3 and words[1] == "2" and words[2] == "FAT":
+                drives.append(words[0])
+    else:
+        rootpath = "/media"
+        if sys.platform == "darwin":
+            rootpath = "/Volumes"
+        elif sys.platform == "linux":
+            tmp = rootpath + "/" + os.environ["USER"]
+            if os.path.isdir(tmp):
+                rootpath = tmp
+        for d in os.listdir(rootpath):
+            drives.append(os.path.join(rootpath, d))
+    def has_info(d):
+        try:
+            return os.path.isfile(d + INFO_FILE)
+        except:
+            return False
+    return list(filter(has_info, drives))
+def board_id(path):
+    with open(path + INFO_FILE, mode='r') as file:
+        file_content = file.read()
+    return re.search("Board-ID: ([^\r\n]*)", file_content).group(1)
+def list_drives():
+    for d in get_drives():
+        print(d, board_id(d))
+def write_file(name, buf):
+    with open(name, "wb") as f:
+        f.write(buf)
+    print("Wrote %d bytes to %s" % (len(buf), name))
+def main():
+    global appstartaddr, familyid
+    def error(msg):
+        print(msg)
+        sys.exit(1)
+    parser = argparse.ArgumentParser(description='Convert to UF2 or flash directly.')
+    parser.add_argument('input', metavar='INPUT', type=str, nargs='?',
+                        help='input file (HEX, BIN or UF2)')
+    parser.add_argument('-b' , '--base', dest='base', type=str,
+                        default="0x2000",
+                        help='set base address of application for BIN format (default: 0x2000)')
+    parser.add_argument('-o' , '--output', metavar="FILE", dest='output', type=str,
+                        help='write output to named file; defaults to "flash.uf2" or "flash.bin" where sensible')
+    parser.add_argument('-d' , '--device', dest="device_path",
+                        help='select a device path to flash')
+    parser.add_argument('-l' , '--list', action='store_true',
+                        help='list connected devices')
+    parser.add_argument('-c' , '--convert', action='store_true',
+                        help='do not flash, just convert')
+    parser.add_argument('-D' , '--deploy', action='store_true',
+                        help='just flash, do not convert')
+    parser.add_argument('-f' , '--family', dest='family', type=str,
+                        default="0x0",
+                        help='specify familyID - number or name (default: 0x0)')
+    parser.add_argument('-C' , '--carray', action='store_true',
+                        help='convert binary file to a C array, not UF2')
+    args = parser.parse_args()
+    appstartaddr = int(args.base, 0)
+    if args.family.upper() in families:
+        familyid = families[args.family.upper()]
+    else:
+        try:
+            familyid = int(args.family, 0)
+        except ValueError:
+            error("Family ID needs to be a number or one of: " + ", ".join(families.keys()))
+    if args.list:
+        list_drives()
+    else:
+        if not args.input:
+            error("Need input file")
+        with open(args.input, mode='rb') as f:
+            inpbuf = f.read()
+        from_uf2 = is_uf2(inpbuf)
+        ext = "uf2"
+        if args.deploy:
+            outbuf = inpbuf
+        elif from_uf2:
+            outbuf = convert_from_uf2(inpbuf)
+            ext = "bin"
+        elif is_hex(inpbuf):
+            outbuf = convert_from_hex_to_uf2(inpbuf.decode("utf-8"))
+        elif args.carray:
+            outbuf = convert_to_carray(inpbuf)
+            ext = "h"
+        else:
+            outbuf = convert_to_uf2(inpbuf)
+        print("Converting to %s, output size: %d, start address: 0x%x" %
+              (ext, len(outbuf), appstartaddr))
+        if args.convert or ext != "uf2":
+            drives = []
+            if args.output == None:
+                args.output = "flash." + ext
+        else:
+            drives = get_drives()
+        if args.output:
+            write_file(args.output, outbuf)
+        else:
+            if len(drives) == 0:
+                error("No drive to deploy.")
+        for d in drives:
+            print("Flashing %s (%s)" % (d, board_id(d)))
+            write_file(d + "/NEW.UF2", outbuf)
+if __name__ == "__main__":
+    main()