diff --git a/.clang-format b/.clang-format
index b4f7967831..ce145e299c 100644
--- a/.clang-format
+++ b/.clang-format
@@ -5,6 +5,9 @@ AlignConsecutiveAssignments: 'true'
 AlignConsecutiveDeclarations: 'true'
 AlignOperands: 'true'
 AllowAllParametersOfDeclarationOnNextLine: 'false'
+AllowShortCaseLabelsOnASingleLine: 'false'
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortLoopsOnASingleLine: 'false'
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: 'false'
@@ -20,6 +23,7 @@ SortIncludes: 'false'
 SpaceBeforeAssignmentOperators: 'true'
 SpaceBeforeParens: ControlStatements
 SpaceInEmptyParentheses: 'false'
+SpacesBeforeTrailingComments: 1
 TabWidth: '4'
 UseTab: Never
 
diff --git a/.gitignore b/.gitignore
index 8d065cc1c3..e3a02fe8f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@
 # QMK-specific
 api_data/v1
 doxygen/
+quantum/version.h
 *.bin
 *.eep
 *.hex
diff --git a/Makefile b/Makefile
index 22c79880a3..4c2e6a04dc 100644
--- a/Makefile
+++ b/Makefile
@@ -275,7 +275,7 @@ define PARSE_KEYMAP
     # Specify the variables that we are passing forward to submake
     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)
+    MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f $(BUILDDEFS_PATH)/build_keyboard.mk $$(MAKE_TARGET)
     # The message to display
     MAKE_MSG := $$(MSG_MAKE_KB)
     # We run the command differently, depending on if we want more output or not
@@ -317,7 +317,7 @@ define BUILD_TEST
     TEST_NAME := $$(notdir $$(TEST_PATH))
     MAKE_TARGET := $2
     COMMAND := $1
-    MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_test.mk $$(MAKE_TARGET)
+    MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f $(BUILDDEFS_PATH)/build_test.mk $$(MAKE_TARGET)
     MAKE_VARS := TEST=$$(TEST_NAME) TEST_PATH=$$(TEST_PATH) FULL_TESTS="$$(FULL_TESTS)"
     MAKE_MSG := $$(MSG_MAKE_TEST)
     $$(eval $$(call BUILD))
@@ -339,7 +339,7 @@ define PARSE_TEST
     TESTS :=
     TEST_NAME := $$(firstword $$(subst :, ,$$(RULE)))
     TEST_TARGET := $$(subst $$(TEST_NAME),,$$(subst $$(TEST_NAME):,,$$(RULE)))
-    include $(ROOT_DIR)/testlist.mk
+    include $(BUILDDEFS_PATH)/testlist.mk
     ifeq ($$(TEST_NAME),all)
         MATCHED_TESTS := $$(TEST_LIST)
     else
diff --git a/builddefs/bootloader.mk b/builddefs/bootloader.mk
index 470febc346..226213297e 100644
--- a/builddefs/bootloader.mk
+++ b/builddefs/bootloader.mk
@@ -38,9 +38,18 @@
 # RISC-V:
 #     gd32v-dfu    GD32V USB DFU in ROM
 #
+# If you need to provide your own implementation, you can set inside `rules.mk`
+# `BOOTLOADER = custom` -- you'll need to provide your own implementations. See
+# the respective file under `platforms/<PLATFORM>/bootloaders/custom.c` to see
+# which functions may be overridden.
+#
 # BOOTLOADER_SIZE can still be defined manually, but it's recommended
 # you add any possible configuration to this list
 
+ifeq ($(strip $(BOOTLOADER)), custom)
+    OPT_DEFS += -DBOOTLOADER_CUSTOM
+    BOOTLOADER_TYPE = custom
+endif
 ifeq ($(strip $(BOOTLOADER)), atmel-dfu)
     OPT_DEFS += -DBOOTLOADER_ATMEL_DFU
     OPT_DEFS += -DBOOTLOADER_DFU
@@ -195,5 +204,5 @@ ifeq ($(strip $(BOOTLOADER)), md-boot)
 endif
 
 ifeq ($(strip $(BOOTLOADER_TYPE)),)
-    BOOTLOADER_TYPE = none
+    $(call CATASTROPHIC_ERROR,Invalid BOOTLOADER,No bootloader specified. Please set an appropriate 'BOOTLOADER' in your keyboard's 'rules.mk' file.)
 endif
diff --git a/build_full_test.mk b/builddefs/build_full_test.mk
similarity index 94%
rename from build_full_test.mk
rename to builddefs/build_full_test.mk
index 4cd1ac61b5..4e4b4e4bfd 100644
--- a/build_full_test.mk
+++ b/builddefs/build_full_test.mk
@@ -14,7 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 $(TEST)_INC := \
-	tests\test_common\common_config.h
+	tests/test_common/common_config.h
 
 $(TEST)_SRC := \
 	$(TMK_COMMON_SRC) \
@@ -33,4 +33,4 @@ $(TEST)_DEFS := $(TMK_COMMON_DEFS) $(OPT_DEFS)
 
 $(TEST)_CONFIG := $(TEST_PATH)/config.h
 
-VPATH += $(TOP_DIR)/tests/test_common
\ No newline at end of file
+VPATH += $(TOP_DIR)/tests/test_common
diff --git a/build_json.mk b/builddefs/build_json.mk
similarity index 100%
rename from build_json.mk
rename to builddefs/build_json.mk
diff --git a/build_keyboard.mk b/builddefs/build_keyboard.mk
similarity index 97%
rename from build_keyboard.mk
rename to builddefs/build_keyboard.mk
index 471eb1041d..3e9e4bcb78 100644
--- a/build_keyboard.mk
+++ b/builddefs/build_keyboard.mk
@@ -45,6 +45,9 @@ ifdef SKIP_GIT
 VERSION_H_FLAGS := --skip-git
 endif
 
+# Generate the board's version.h file.
+$(shell $(QMK_BIN) generate-version-h $(VERSION_H_FLAGS) -q -o $(KEYMAP_OUTPUT)/src/version.h)
+
 # Determine which subfolders exist.
 KEYBOARD_FOLDER_PATH_1 := $(KEYBOARD)
 KEYBOARD_FOLDER_PATH_2 := $(patsubst %/,%,$(dir $(KEYBOARD_FOLDER_PATH_1)))
@@ -108,7 +111,7 @@ INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --keyboard
 include $(INFO_RULES_MK)
 
 # Check for keymap.json first, so we can regenerate keymap.c
-include build_json.mk
+include $(BUILDDEFS_PATH)/build_json.mk
 
 # Pull in keymap level rules.mk
 ifeq ("$(wildcard $(KEYMAP_PATH))", "")
@@ -135,9 +138,9 @@ ifeq ("$(wildcard $(KEYMAP_PATH))", "")
         KEYMAP_PATH := $(MAIN_KEYMAP_PATH_1)
     else ifneq ($(LAYOUTS),)
         # If we haven't found a keymap yet fall back to community layouts
-        include build_layout.mk
+        include $(BUILDDEFS_PATH)/build_layout.mk
     else
-        $(error Could not find keymap)
+        $(call CATASTROPHIC_ERROR,Invalid keymap,Could not find keymap)
         # this state should never be reached
     endif
 endif
@@ -165,13 +168,8 @@ generated-files: $(KEYMAP_OUTPUT)/src/config.h $(KEYMAP_OUTPUT)/src/keymap.c
 
 endif
 
-generated-files: $(KEYMAP_OUTPUT)/src/version.h
-$(KEYMAP_OUTPUT)/src/version.h:
-	[ -d $(KEYMAP_OUTPUT)/src ] || mkdir -p $(KEYMAP_OUTPUT)/src
-	$(QMK_BIN) generate-version-h $(VERSION_H_FLAGS) -q -o $(KEYMAP_OUTPUT)/src/version.h
-
 ifeq ($(strip $(CTPC)), yes)
-  CONVERT_TO_PROTON_C=yes
+    CONVERT_TO_PROTON_C=yes
 endif
 
 ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes)
@@ -397,9 +395,10 @@ VPATH += $(KEYMAP_PATH)
 VPATH += $(USER_PATH)
 VPATH += $(KEYBOARD_PATHS)
 VPATH += $(COMMON_VPATH)
+VPATH += $(KEYBOARD_OUTPUT)/src
 VPATH += $(KEYMAP_OUTPUT)/src
 
-include common_features.mk
+include $(BUILDDEFS_PATH)/common_features.mk
 
 # XAP embedded info.json
 ifeq ($(strip $(XAP_ENABLE)), yes)
@@ -485,7 +484,7 @@ check-md5: build
 objs-size: build
 
 include $(BUILDDEFS_PATH)/show_options.mk
-include $(TMK_PATH)/rules.mk
+include $(BUILDDEFS_PATH)/common_rules.mk
 
 # Ensure we have generated files available for each of the objects
 define GEN_FILES
diff --git a/build_layout.mk b/builddefs/build_layout.mk
similarity index 93%
rename from build_layout.mk
rename to builddefs/build_layout.mk
index b4b00793ea..6166bd847c 100644
--- a/build_layout.mk
+++ b/builddefs/build_layout.mk
@@ -25,7 +25,7 @@ ifneq ($(FORCE_LAYOUT),)
         $(info Forcing layout: $(FORCE_LAYOUT))
         LAYOUTS := $(FORCE_LAYOUT)
     else
-        $(error Forced layout does not exist)
+        $(call CATASTROPHIC_ERROR,Invalid layout,Forced layout does not exist)
     endif
 endif
 
diff --git a/build_test.mk b/builddefs/build_test.mk
similarity index 93%
rename from build_test.mk
rename to builddefs/build_test.mk
index ec6699b4ea..7226004aab 100644
--- a/build_test.mk
+++ b/builddefs/build_test.mk
@@ -54,7 +54,7 @@ include tests/test_common/build.mk
 include $(TEST_PATH)/test.mk
 endif
 
-include common_features.mk
+include $(BUILDDEFS_PATH)/common_features.mk
 include $(BUILDDEFS_PATH)/generic_features.mk
 include $(PLATFORM_PATH)/common.mk
 include $(TMK_PATH)/protocol.mk
@@ -63,7 +63,7 @@ include $(QUANTUM_PATH)/encoder/tests/rules.mk
 include $(QUANTUM_PATH)/sequencer/tests/rules.mk
 include $(PLATFORM_PATH)/test/rules.mk
 ifneq ($(filter $(FULL_TESTS),$(TEST)),)
-include build_full_test.mk
+include $(BUILDDEFS_PATH)/build_full_test.mk
 endif
 
 $(TEST)_SRC += \
@@ -77,7 +77,7 @@ $(TEST_OBJ)/$(TEST)_DEFS := $($(TEST)_DEFS)
 $(TEST_OBJ)/$(TEST)_CONFIG := $($(TEST)_CONFIG)
 
 include $(PLATFORM_PATH)/$(PLATFORM_KEY)/platform.mk
-include $(TMK_PATH)/rules.mk
+include $(BUILDDEFS_PATH)/common_rules.mk
 
 
 $(shell mkdir -p $(BUILD_DIR)/test 2>/dev/null)
diff --git a/common_features.mk b/builddefs/common_features.mk
similarity index 84%
rename from common_features.mk
rename to builddefs/common_features.mk
index 6af96531f2..cbff9fa4fa 100644
--- a/common_features.mk
+++ b/builddefs/common_features.mk
@@ -109,10 +109,9 @@ ifeq ($(strip $(MOUSEKEY_ENABLE)), yes)
 endif
 
 VALID_POINTING_DEVICE_DRIVER_TYPES := adns5050 adns9800 analog_joystick cirque_pinnacle_i2c cirque_pinnacle_spi pmw3360 pmw3389 pimoroni_trackball custom
-POINTING_DEVICE_DRIVER ?= custom
 ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
     ifeq ($(filter $(POINTING_DEVICE_DRIVER),$(VALID_POINTING_DEVICE_DRIVER_TYPES)),)
-        $(error POINTING_DEVICE_DRIVER="$(POINTING_DEVICE_DRIVER)" is not a valid pointing device type)
+        $(call CATASTROPHIC_ERROR,Invalid POINTING_DEVICE_DRIVER,POINTING_DEVICE_DRIVER="$(POINTING_DEVICE_DRIVER)" is not a valid pointing device type)
     else
         OPT_DEFS += -DPOINTING_DEVICE_ENABLE
         MOUSE_ENABLE := yes
@@ -153,7 +152,7 @@ endif
 VALID_EEPROM_DRIVER_TYPES := vendor custom transient i2c spi
 EEPROM_DRIVER ?= vendor
 ifeq ($(filter $(EEPROM_DRIVER),$(VALID_EEPROM_DRIVER_TYPES)),)
-  $(error EEPROM_DRIVER="$(EEPROM_DRIVER)" is not a valid EEPROM driver)
+  $(call CATASTROPHIC_ERROR,Invalid EEPROM_DRIVER,EEPROM_DRIVER="$(EEPROM_DRIVER)" is not a valid EEPROM driver)
 else
   OPT_DEFS += -DEEPROM_ENABLE
   ifeq ($(strip $(EEPROM_DRIVER)), custom)
@@ -220,6 +219,21 @@ else
   endif
 endif
 
+VALID_FLASH_DRIVER_TYPES := spi
+FLASH_DRIVER ?= no
+ifneq ($(strip $(FLASH_DRIVER)), no)
+    ifeq ($(filter $(FLASH_DRIVER),$(VALID_FLASH_DRIVER_TYPES)),)
+        $(error FLASH_DRIVER="$(FLASH_DRIVER)" is not a valid FLASH driver)
+    else
+        OPT_DEFS += -DFLASH_ENABLE
+        ifeq ($(strip $(FLASH_DRIVER)), spi)
+            OPT_DEFS += -DFLASH_DRIVER -DFLASH_SPI
+            COMMON_VPATH += $(DRIVER_PATH)/flash
+            SRC += flash_spi.c
+        endif
+    endif
+endif
+
 RGBLIGHT_ENABLE ?= no
 VALID_RGBLIGHT_TYPES := WS2812 APA102 custom
 
@@ -231,7 +245,7 @@ ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
     RGBLIGHT_DRIVER ?= WS2812
 
     ifeq ($(filter $(RGBLIGHT_DRIVER),$(VALID_RGBLIGHT_TYPES)),)
-        $(error RGBLIGHT_DRIVER="$(RGBLIGHT_DRIVER)" is not a valid RGB type)
+        $(call CATASTROPHIC_ERROR,Invalid RGBLIGHT_DRIVER,RGBLIGHT_DRIVER="$(RGBLIGHT_DRIVER)" is not a valid RGB type)
     else
         COMMON_VPATH += $(QUANTUM_DIR)/rgblight
         POST_CONFIG_H += $(QUANTUM_DIR)/rgblight/rgblight_post_config.h
@@ -256,12 +270,12 @@ ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
 endif
 
 LED_MATRIX_ENABLE ?= no
-VALID_LED_MATRIX_TYPES := IS31FL3731 custom
+VALID_LED_MATRIX_TYPES := IS31FL3731 IS31FL3742A IS31FL3743A IS31FL3745 IS31FL3746A custom
 # TODO: IS31FL3733 IS31FL3737 IS31FL3741
 
 ifeq ($(strip $(LED_MATRIX_ENABLE)), yes)
     ifeq ($(filter $(LED_MATRIX_DRIVER),$(VALID_LED_MATRIX_TYPES)),)
-        $(error "$(LED_MATRIX_DRIVER)" is not a valid matrix type)
+        $(call CATASTROPHIC_ERROR,Invalid LED_MATRIX_DRIVER,LED_MATRIX_DRIVER="$(LED_MATRIX_DRIVER)" is not a valid matrix type)
     endif
     OPT_DEFS += -DLED_MATRIX_ENABLE
 ifneq (,$(filter $(MCU), atmega16u2 atmega32u2 at90usb162))
@@ -283,14 +297,43 @@ endif
         SRC += is31fl3731-simple.c
         QUANTUM_LIB_SRC += i2c_master.c
     endif
+
+	ifeq ($(strip $(LED_MATRIX_DRIVER)), IS31FL3742A)
+        OPT_DEFS += -DIS31FLCOMMON -DIS31FL3742A -DSTM32_I2C -DHAL_USE_I2C=TRUE
+        COMMON_VPATH += $(DRIVER_PATH)/led/issi
+        SRC += is31flcommon.c
+        QUANTUM_LIB_SRC += i2c_master.c
+    endif
+
+	ifeq ($(strip $(LED_MATRIX_DRIVER)), IS31FL3743A)
+        OPT_DEFS += -DIS31FLCOMMON -DIS31FL3743A -DSTM32_I2C -DHAL_USE_I2C=TRUE
+        COMMON_VPATH += $(DRIVER_PATH)/led/issi
+        SRC += is31flcommon.c
+        QUANTUM_LIB_SRC += i2c_master.c
+    endif
+
+	ifeq ($(strip $(LED_MATRIX_DRIVER)), IS31FL3745)
+        OPT_DEFS += -DIS31FLCOMMON -DIS31FL3745 -DSTM32_I2C -DHAL_USE_I2C=TRUE
+        COMMON_VPATH += $(DRIVER_PATH)/led/issi
+        SRC += is31flcommon.c
+        QUANTUM_LIB_SRC += i2c_master.c
+    endif
+
+	ifeq ($(strip $(LED_MATRIX_DRIVER)), IS31FL3746A)
+        OPT_DEFS += -DIS31FLCOMMON -DIS31FL3746A -DSTM32_I2C -DHAL_USE_I2C=TRUE
+        COMMON_VPATH += $(DRIVER_PATH)/led/issi
+        SRC += is31flcommon.c
+        QUANTUM_LIB_SRC += i2c_master.c
+    endif
+
 endif
 
 RGB_MATRIX_ENABLE ?= no
-VALID_RGB_MATRIX_TYPES := AW20216 IS31FL3731 IS31FL3733 IS31FL3737 IS31FL3741 CKLED2001 WS2812 custom
 
+VALID_RGB_MATRIX_TYPES := AW20216 IS31FL3731 IS31FL3733 IS31FL3737 IS31FL3741 IS31FL3742A IS31FL3743A IS31FL3745 IS31FL3746A CKLED2001 WS2812 custom
 ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
     ifeq ($(filter $(RGB_MATRIX_DRIVER),$(VALID_RGB_MATRIX_TYPES)),)
-        $(error "$(RGB_MATRIX_DRIVER)" is not a valid matrix type)
+        $(call CATASTROPHIC_ERROR,Invalid RGB_MATRIX_DRIVER,RGB_MATRIX_DRIVER="$(RGB_MATRIX_DRIVER)" is not a valid matrix type)
     endif
     OPT_DEFS += -DRGB_MATRIX_ENABLE
 ifneq (,$(filter $(MCU), atmega16u2 atmega32u2 at90usb162))
@@ -342,6 +385,34 @@ endif
         QUANTUM_LIB_SRC += i2c_master.c
     endif
 
+	ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3742A)
+        OPT_DEFS += -DIS31FLCOMMON -DIS31FL3742A -DSTM32_I2C -DHAL_USE_I2C=TRUE
+        COMMON_VPATH += $(DRIVER_PATH)/led/issi
+        SRC += is31flcommon.c
+        QUANTUM_LIB_SRC += i2c_master.c
+    endif
+
+	ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3743A)
+        OPT_DEFS += -DIS31FLCOMMON -DIS31FL3743A -DSTM32_I2C -DHAL_USE_I2C=TRUE
+        COMMON_VPATH += $(DRIVER_PATH)/led/issi
+        SRC += is31flcommon.c
+        QUANTUM_LIB_SRC += i2c_master.c
+    endif
+
+	ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3745)
+        OPT_DEFS += -DIS31FLCOMMON -DIS31FL3745 -DSTM32_I2C -DHAL_USE_I2C=TRUE
+        COMMON_VPATH += $(DRIVER_PATH)/led/issi
+        SRC += is31flcommon.c
+        QUANTUM_LIB_SRC += i2c_master.c
+    endif
+
+	ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3746A)
+        OPT_DEFS += -DIS31FLCOMMON -DIS31FL3746A -DSTM32_I2C -DHAL_USE_I2C=TRUE
+        COMMON_VPATH += $(DRIVER_PATH)/led/issi
+        SRC += is31flcommon.c
+        QUANTUM_LIB_SRC += i2c_master.c
+    endif
+
     ifeq ($(strip $(RGB_MATRIX_DRIVER)), CKLED2001)
         OPT_DEFS += -DCKLED2001 -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led
@@ -404,7 +475,7 @@ else
 endif
 ifeq ($(strip $(BACKLIGHT_ENABLE)), yes)
     ifeq ($(filter $(BACKLIGHT_DRIVER),$(VALID_BACKLIGHT_TYPES)),)
-        $(error BACKLIGHT_DRIVER="$(BACKLIGHT_DRIVER)" is not a valid backlight type)
+        $(call CATASTROPHIC_ERROR,Invalid BACKLIGHT_DRIVER,BACKLIGHT_DRIVER="$(BACKLIGHT_DRIVER)" is not a valid backlight type)
     endif
 
     COMMON_VPATH += $(QUANTUM_DIR)/backlight
@@ -429,7 +500,7 @@ VALID_WS2812_DRIVER_TYPES := bitbang pwm spi i2c
 WS2812_DRIVER ?= bitbang
 ifeq ($(strip $(WS2812_DRIVER_REQUIRED)), yes)
     ifeq ($(filter $(WS2812_DRIVER),$(VALID_WS2812_DRIVER_TYPES)),)
-        $(error WS2812_DRIVER="$(WS2812_DRIVER)" is not a valid WS2812 driver)
+        $(call CATASTROPHIC_ERROR,Invalid WS2812_DRIVER,WS2812_DRIVER="$(WS2812_DRIVER)" is not a valid WS2812 driver)
     endif
 
     OPT_DEFS += -DWS2812_DRIVER_$(strip $(shell echo $(WS2812_DRIVER) | tr '[:lower:]' '[:upper:]'))
@@ -484,7 +555,7 @@ VALID_MAGIC_TYPES := yes
 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)
+    $(call CATASTROPHIC_ERROR,Invalid BOOTMAGIC_ENABLE,BOOTMAGIC_ENABLE="$(BOOTMAGIC_ENABLE)" is not a valid type of magic)
   endif
   ifneq ($(strip $(BOOTMAGIC_ENABLE)), no)
       OPT_DEFS += -DBOOTMAGIC_LITE
@@ -500,7 +571,7 @@ CUSTOM_MATRIX ?= no
 
 ifneq ($(strip $(CUSTOM_MATRIX)), yes)
     ifeq ($(filter $(CUSTOM_MATRIX),$(VALID_CUSTOM_MATRIX_TYPES)),)
-        $(error CUSTOM_MATRIX="$(CUSTOM_MATRIX)" is not a valid custom matrix type)
+        $(call CATASTROPHIC_ERROR,Invalid CUSTOM_MATRIX,CUSTOM_MATRIX="$(CUSTOM_MATRIX)" is not a valid custom matrix type)
     endif
 
     # Include common stuff for all non custom matrix users
@@ -583,7 +654,7 @@ VALID_OLED_DRIVER_TYPES := SSD1306 custom
 OLED_DRIVER ?= SSD1306
 ifeq ($(strip $(OLED_ENABLE)), yes)
     ifeq ($(filter $(OLED_DRIVER),$(VALID_OLED_DRIVER_TYPES)),)
-        $(error OLED_DRIVER="$(OLED_DRIVER)" is not a valid OLED driver)
+        $(call CATASTROPHIC_ERROR,Invalid OLED_DRIVER,OLED_DRIVER="$(OLED_DRIVER)" is not a valid OLED driver)
     else
         OPT_DEFS += -DOLED_ENABLE
         COMMON_VPATH += $(DRIVER_PATH)/oled
@@ -651,7 +722,7 @@ endif
 ifeq ($(strip $(PS2_USE_BUSYWAIT)), yes)
     PS2_ENABLE := yes
     SRC += ps2_busywait.c
-    SRC += ps2_io_avr.c
+    SRC += ps2_io.c
     OPT_DEFS += -DPS2_USE_BUSYWAIT
 endif
 
@@ -680,7 +751,7 @@ VALID_JOYSTICK_TYPES := analog digital
 JOYSTICK_DRIVER ?= analog
 ifeq ($(strip $(JOYSTICK_ENABLE)), yes)
     ifeq ($(filter $(JOYSTICK_DRIVER),$(VALID_JOYSTICK_TYPES)),)
-        $(error "$(JOYSTICK_DRIVER)" is not a valid joystick driver)
+        $(call CATASTROPHIC_ERROR,Invalid JOYSTICK_DRIVER,JOYSTICK_DRIVER="$(JOYSTICK_DRIVER)" is not a valid joystick driver)
     endif
     OPT_DEFS += -DJOYSTICK_ENABLE
     SRC += $(QUANTUM_DIR)/process_keycode/process_joystick.c
@@ -700,7 +771,7 @@ VALID_USBPD_DRIVER_TYPES = custom vendor
 USBPD_DRIVER ?= vendor
 ifeq ($(strip $(USBPD_ENABLE)), yes)
     ifeq ($(filter $(strip $(USBPD_DRIVER)),$(VALID_USBPD_DRIVER_TYPES)),)
-        $(error USBPD_DRIVER="$(USBPD_DRIVER)" is not a valid USBPD driver)
+        $(call CATASTROPHIC_ERROR,Invalid USBPD_DRIVER,USBPD_DRIVER="$(USBPD_DRIVER)" is not a valid USBPD driver)
     else
         OPT_DEFS += -DUSBPD_ENABLE
         ifeq ($(strip $(USBPD_DRIVER)), vendor)
@@ -710,7 +781,7 @@ ifeq ($(strip $(USBPD_ENABLE)), yes)
                 OPT_DEFS += -DUSBPD_STM32G4
                 SRC += usbpd_stm32g4.c
             else
-                $(error There is no vendor-provided USBPD driver available)
+                $(call CATASTROPHIC_ERROR,Invalid USBPD_DRIVER,There is no vendor-provided USBPD driver available)
             endif
         else ifeq ($(strip $(USBPD_DRIVER)), custom)
             OPT_DEFS += -DUSBPD_CUSTOM
@@ -735,7 +806,7 @@ BLUETOOTH_ENABLE ?= no
 VALID_BLUETOOTH_DRIVER_TYPES := BluefruitLE RN42 custom
 ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
     ifeq ($(filter $(strip $(BLUETOOTH_DRIVER)),$(VALID_BLUETOOTH_DRIVER_TYPES)),)
-        $(error "$(BLUETOOTH_DRIVER)" is not a valid Bluetooth driver type)
+        $(call CATASTROPHIC_ERROR,Invalid BLUETOOTH_DRIVER,BLUETOOTH_DRIVER="$(BLUETOOTH_DRIVER)" is not a valid Bluetooth driver type)
     endif
     OPT_DEFS += -DBLUETOOTH_ENABLE
     NO_USB_STARTUP_CHECK := yes
diff --git a/tmk_core/rules.mk b/builddefs/common_rules.mk
similarity index 97%
rename from tmk_core/rules.mk
rename to builddefs/common_rules.mk
index 6767a8e4af..b303a87919 100644
--- a/tmk_core/rules.mk
+++ b/builddefs/common_rules.mk
@@ -234,6 +234,7 @@ endif
 
 # Define programs and commands.
 SHELL = sh
+SED = sed
 REMOVE = rm -f
 REMOVEDIR = rmdir
 COPY = cp
@@ -292,17 +293,15 @@ sym: $(BUILD_DIR)/$(TARGET).sym
 LIBNAME=lib$(TARGET).a
 lib: $(LIBNAME)
 
-# Display size of file.
-HEXSIZE = $(SIZE) --target=$(FORMAT) $(BUILD_DIR)/$(TARGET).hex
-#ELFSIZE = $(SIZE) --mcu=$(MCU) --format=avr $(TARGET).elf
-ELFSIZE = $(SIZE) $(BUILD_DIR)/$(TARGET).elf
+# Display size of file, modifying the output so people don't mistakenly grab the hex output
+BINARY_SIZE = $(SIZE) --target=$(FORMAT) $(BUILD_DIR)/$(TARGET).hex | $(SED) -e 's/\.build\/.*$$/$(TARGET).$(FIRMWARE_FORMAT)/g'
 
 sizebefore:
-	@if test -f $(BUILD_DIR)/$(TARGET).hex; then $(SECHO) $(MSG_SIZE_BEFORE); $(SILENT) || $(HEXSIZE); \
+	@if test -f $(BUILD_DIR)/$(TARGET).hex; then $(SECHO) $(MSG_SIZE_BEFORE); $(SILENT) || $(BINARY_SIZE); \
 	2>/dev/null; $(SECHO); fi
 
 sizeafter: $(BUILD_DIR)/$(TARGET).hex
-	@if test -f $(BUILD_DIR)/$(TARGET).hex; then $(SECHO); $(SECHO) $(MSG_SIZE_AFTER); $(SILENT) || $(HEXSIZE); \
+	@if test -f $(BUILD_DIR)/$(TARGET).hex; then $(SECHO); $(SECHO) $(MSG_SIZE_AFTER); $(SILENT) || $(BINARY_SIZE); \
 	2>/dev/null; $(SECHO); fi
 
 # Display compiler version information.
@@ -479,7 +478,7 @@ ifeq ($(findstring avr-gcc,$(CC)),avr-gcc)
 SIZE_MARGIN = 1024
 
 check-size:
-	$(eval MAX_SIZE=$(shell n=`$(CC) -E -mmcu=$(MCU) -D__ASSEMBLER__ $(CFLAGS) $(OPT_DEFS) platforms/avr/bootloader_size.c 2> /dev/null | sed -ne 's/\r//;/^#/n;/^AVR_SIZE:/,$${s/^AVR_SIZE: //;p;}'` && echo $$(($$n)) || echo 0))
+	$(eval MAX_SIZE=$(shell n=`$(CC) -E -mmcu=$(MCU) -D__ASSEMBLER__ $(CFLAGS) $(OPT_DEFS) platforms/avr/bootloader_size.c 2> /dev/null | $(SED) -ne 's/\r//;/^#/n;/^AVR_SIZE:/,$${s/^AVR_SIZE: //;p;}'` && echo $$(($$n)) || echo 0))
 	$(eval CURRENT_SIZE=$(shell if [ -f $(BUILD_DIR)/$(TARGET).hex ]; then $(SIZE) --target=$(FORMAT) $(BUILD_DIR)/$(TARGET).hex | $(AWK) 'NR==2 {print $$4}'; else printf 0; fi))
 	$(eval FREE_SIZE=$(shell expr $(MAX_SIZE) - $(CURRENT_SIZE)))
 	$(eval OVER_SIZE=$(shell expr $(CURRENT_SIZE) - $(MAX_SIZE)))
diff --git a/builddefs/message.mk b/builddefs/message.mk
index 1187491452..d441f560be 100644
--- a/builddefs/message.mk
+++ b/builddefs/message.mk
@@ -101,3 +101,8 @@ MSG_FLASH_ARCH = $(WARN_COLOR)WARNING:$(NO_COLOR) This board's architecture is n
 MSG_BOOTLOADER_NOT_FOUND = $(ERROR_COLOR)ERROR:$(NO_COLOR) $(MSG_BOOTLOADER_NOT_FOUND_BASE) Trying again in 5s (Ctrl+C to cancel)\n
 BOOTLOADER_RETRY_TIME ?= 0.5
 MSG_BOOTLOADER_NOT_FOUND_QUICK_RETRY = $(MSG_BOOTLOADER_NOT_FOUND_BASE) Trying again every $(BOOTLOADER_RETRY_TIME)s (Ctrl+C to cancel)
+
+define CATASTROPHIC_ERROR
+    $(shell printf "\n * %-99s $(ERROR_STRING)\n" "$2" >&2)
+    $(error $1)
+endef
\ No newline at end of file
diff --git a/testlist.mk b/builddefs/testlist.mk
similarity index 85%
rename from testlist.mk
rename to builddefs/testlist.mk
index 904485c15c..86da5668ac 100644
--- a/testlist.mk
+++ b/builddefs/testlist.mk
@@ -8,7 +8,7 @@ include $(PLATFORM_PATH)/test/testlist.mk
 define VALIDATE_TEST_LIST
     ifneq ($1,)
         ifeq ($$(findstring -,$1),-)
-            $$(error Test names can't contain '-', but '$1' does)
+            $$(call CATASTROPHIC_ERROR,Invalid test name,Test names can't contain '-', but '$1' does.)
         else
             $$(eval $$(call VALIDATE_TEST_LIST,$$(firstword $2),$$(wordlist 2,9999,$2)))
         endif
diff --git a/data/mappings/keyboard_aliases.json b/data/mappings/keyboard_aliases.json
index 430229ecff..343812718e 100644
--- a/data/mappings/keyboard_aliases.json
+++ b/data/mappings/keyboard_aliases.json
@@ -584,5 +584,615 @@
     },
     zeal65: {
           target: 'wilba_tech/zeal65'
+    },
+    # Moved during 2022 Q1 cycle
+    6ball: {
+        target: 'maple_computing/6ball'
+    },
+    7skb: {
+        target: 'salicylic_acid3/7skb'
+    },
+    7splus: {
+        target: 'salicylic_acid3/7splus'
+    },
+    acr60: {
+        target: 'mechkeys/acr60'
+    },
+    adalyn: {
+        target: 'tominabox1/adalyn'
+    },
+    ajisai74: {
+        target: 'salicylic_acid3/ajisai74'
+    },
+    aleth42: {
+        target: '25keys/aleth42'
+    },
+    alicia_cook: {
+        target: 'ibnuda/alicia_cook'
+    },
+    allison: {
+        target: 'prototypist/allison'
+    },
+    allison_numpad: {
+        target: 'prototypist/allison_numpad'
+    },
+    alu84: {
+        target: 'mechkeys/alu84'
+    },
+    angel17: {
+        target: 'kakunpc/angel17'
+    },
+    angel64/alpha: {
+        target: 'kakunpc/angel64/alpha'
+    },
+    angel64/rev1: {
+        target: 'kakunpc/angel64/rev1'
+    },
+    arch_36: {
+        target: 'obosob/arch_36'
+    },
+    bakeneko60: {
+        target: 'kkatano/bakeneko60'
+    },
+    bakeneko65/rev2: {
+        target: 'kkatano/bakeneko65/rev2'
+    },
+    bakeneko65/rev3: {
+        target: 'kkatano/bakeneko65/rev3'
+    },
+    bakeneko80: {
+        target: 'kkatano/bakeneko80'
+    },
+    barleycorn: {
+        target: 'yiancardesigns/barleycorn'
+    },
+    bat43/rev1: {
+        target: 'dailycraft/bat43/rev1'
+    },
+    bat43/rev2: {
+        target: 'dailycraft/bat43/rev2'
+    },
+    bigseries/1key: {
+        target: 'woodkeys/bigseries/1key'
+    },
+    bigseries/2key: {
+        target: 'woodkeys/bigseries/2key'
+    },
+    bigseries/3key: {
+        target: 'woodkeys/bigseries/3key'
+    },
+    bigseries/4key: {
+        target: 'woodkeys/bigseries/4key'
+    },
+    bkf: {
+        target: 'drhigsby/bkf'
+    },
+    business_card/alpha: {
+        target: 'kakunpc/business_card/alpha'
+    },
+    business_card/beta: {
+        target: 'kakunpc/business_card/beta'
+    },
+    butterstick: {
+        target: 'gboards/butterstick'
+    },
+    c39: {
+        target: 'maple_computing/c39'
+    },
+    cassette42: {
+        target: '25keys/cassette42'
+    },
+    chidori: {
+        target: 'kagizaraya/chidori'
+    },
+    chili: {
+        target: 'ydkb/chili'
+    },
+    chimera_ergo: {
+        target: 'glenpickle/chimera_ergo'
+    },
+    chimera_ls: {
+        target: 'glenpickle/chimera_ls'
+    },
+    chimera_ortho: {
+        target: 'glenpickle/chimera_ortho'
+    },
+    chimera_ortho_plus: {
+        target: 'glenpickle/chimera_ortho_plus'
+    },
+    choc_taro: {
+        target: 'kakunpc/choc_taro'
+    },
+    choco60: {
+        target: 'recompile_keys/choco60'
+    },
+    christmas_tree: {
+        target: 'maple_computing/christmas_tree'
+    },
+    claw44/rev1: {
+        target: 'dailycraft/claw44/rev1'
+    },
+    cocoa40: {
+        target: 'recompile_keys/cocoa40'
+    },
+    comet46: {
+        target: 'satt/comet46'
+    },
+    cu24: {
+        target: 'capsunlocked/cu24'
+    },
+    cu75: {
+        target: 'capsunlocked/cu75'
+    },
+    cu80: {
+        target: 'capsunlocked/cu80/v1'
+    },
+    delilah: {
+        target: 'rainkeebs/delilah'
+    },
+    diverge3: {
+        target: 'unikeyboard/diverge3'
+    },
+    divergetm2: {
+        target: 'unikeyboard/divergetm2'
+    },
+    dozen0: {
+        target: 'yynmt/dozen0'
+    },
+    dubba175: {
+        target: 'drhigsby/dubba175'
+    },
+    eggman: {
+        target: 'qpockets/eggman'
+    },
+    ergo42: {
+        target: 'biacco42/ergo42'
+    },
+    ergoarrows: {
+        target: 'salicylic_acid3/ergoarrows'
+    },
+    ergodash/mini: {
+        target: 'omkbd/ergodash/mini'
+    },
+    ergodash/rev1: {
+        target: 'omkbd/ergodash/rev1'
+    },
+    ergodox_infinity: {
+        target: 'input_club/ergodox_infinity'
+    },
+    ergotaco: {
+        target: 'gboards/ergotaco'
+    },
+    espectro: {
+        target: 'mechkeys/espectro'
+    },
+    felix: {
+        target: 'unikeyboard/felix'
+    },
+    four_banger: {
+        target: 'bpiphany/four_banger'
+    },
+    freyr: {
+        target: 'hnahkb/freyr'
+    },
+    geminate60: {
+        target: 'weirdo/geminate60'
+    },
+    georgi: {
+        target: 'gboards/georgi'
+    },
+    gergo: {
+        target: 'gboards/gergo'
+    },
+    getta25: {
+        target: 'salicylic_acid3/getta25'
+    },
+    gingham: {
+        target: 'yiancardesigns/gingham'
+    },
+    gurindam: {
+        target: 'ibnuda/gurindam'
+    },
+    halberd: {
+        target: 'kagizaraya/halberd'
+    },
+    hecomi/alpha: {
+        target: 'takashiski/hecomi/alpha'
+    },
+    hid_liber: {
+        target: 'bpiphany/hid_liber'
+    },
+    id67/default_rgb: {
+        target: 'idobao/id67/default_rgb'
+    },
+    id67/rgb: {
+        target: 'idobao/id67/rgb'
+    },
+    id80: {
+        target: 'idobao/id80/v1'
+    },
+    id87: {
+        target: 'idobao/id87/v1'
+    },
+    idobo: {
+        target: 'idobao/id75/v1'
+    },
+    infinity60: {
+        target: 'input_club/infinity60'
+    },
+    ivy/rev1: {
+        target: 'maple_computing/ivy/rev1'
+    },
+    jisplit89: {
+        target: 'salicylic_acid3/jisplit89'
+    },
+    jnao: {
+        target: 'maple_computing/jnao'
+    },
+    just60: {
+        target: 'ydkb/just60'
+    },
+    k_type: {
+        target: 'input_club/k_type'
+    },
+    kagamidget: {
+        target: 'yynmt/kagamidget'
+    },
+    kelowna/rgb64: {
+        target: 'weirdo/kelowna/rgb64'
+    },
+    kprepublic/bm65hsrgb_iso: {
+        target: 'kprepublic/bm65hsrgb_iso/rev1'
+    },
+    kprepublic/bm68hsrgb: {
+        target: 'kprepublic/bm68hsrgb/rev1'
+    },
+    latin17rgb: {
+        target: 'latincompass/latin17rgb'
+    },
+    latin47ble: {
+        target: 'latincompass/latin47ble'
+    },
+    latin60rgb: {
+        target: 'latincompass/latin60rgb'
+    },
+    latin64ble: {
+        target: 'latincompass/latin64ble'
+    },
+    latin6rgb: {
+        target: 'latincompass/latin6rgb'
+    },
+    latinpad: {
+        target: 'latincompass/latinpad'
+    },
+    latinpadble: {
+        target: 'latincompass/latinpadble'
+    },
+    launchpad/rev1: {
+        target: 'maple_computing/launchpad/rev1'
+    },
+    lck75: {
+        target: 'lyso1/lck75'
+    },
+    le_chiffre: {
+        target: 'tominabox1/le_chiffre'
+    },
+    lefishe: {
+        target: 'lyso1/lefishe'
+    },
+    lets_split_eh/eh: {
+        target: 'maple_computing/lets_split_eh/eh'
+    },
+    ls_60: {
+        target: 'weirdo/ls_60'
+    },
+    m3n3van: {
+        target: 'matthewdias/m3n3van'
+    },
+    mechmini/v1: {
+        target: 'mechkeys/mechmini/v1'
+    },
+    mechmini/v2: {
+        target: 'mechkeys/mechmini/v2'
+    },
+    meira: {
+        target: 'woodkeys/meira'
+    },
+    meishi: {
+        target: 'biacco42/meishi'
+    },
+    meishi2: {
+        target: 'biacco42/meishi2'
+    },
+    minidox/rev1: {
+        target: 'maple_computing/minidox/rev1'
+    },
+    minim: {
+        target: 'matthewdias/minim'
+    },
+    mio: {
+        target: 'recompile_keys/mio'
+    },
+    model_v: {
+        target: 'matthewdias/model_v'
+    },
+    montex: {
+        target: 'idobao/montex/v1'
+    },
+    nafuda: {
+        target: 'salicylic_acid3/nafuda'
+    },
+    naiping/np64: {
+        target: 'weirdo/naiping/np64'
+    },
+    naiping/nphhkb: {
+        target: 'weirdo/naiping/nphhkb'
+    },
+    naiping/npminila: {
+        target: 'weirdo/naiping/npminila'
+    },
+    naked48: {
+        target: 'salicylic_acid3/naked48'
+    },
+    naked60: {
+        target: 'salicylic_acid3/naked60'
+    },
+    naked64: {
+        target: 'salicylic_acid3/naked64'
+    },
+    namecard2x4: {
+        target: 'takashiski/namecard2x4'
+    },
+    nebula12: {
+        target: 'spaceholdings/nebula12'
+    },
+    nebula68: {
+        target: 'spaceholdings/nebula68'
+    },
+    nebula68b: {
+        target: 'spaceholdings/nebula68b'
+    },
+    niu_mini: {
+        target: 'kbdfans/niu_mini'
+    },
+    nk1: {
+        target: 'novelkeys/nk1'
+    },
+    nk65: {
+        target: 'novelkeys/nk65'
+    },
+    nk87: {
+        target: 'novelkeys/nk87'
+    },
+    nknl7en: {
+        target: 'salicylic_acid3/nknl7en'
+    },
+    nknl7jp: {
+        target: 'salicylic_acid3/nknl7jp'
+    },
+    nomu30: {
+        target: 'recompile_keys/nomu30'
+    },
+    novelpad: {
+        target: 'novelkeys/novelpad'
+    },
+    ogurec: {
+        target: 'drhigsby/ogurec'
+    },
+    otaku_split/rev0: {
+        target: 'takashiski/otaku_split/rev0'
+    },
+    otaku_split/rev1: {
+        target: 'takashiski/otaku_split/rev1'
+    },
+    owl8: {
+        target: 'dailycraft/owl8'
+    },
+    packrat: {
+        target: 'drhigsby/packrat'
+    },
+    pistachio: {
+        target: 'rate/pistachio'
+    },
+    pistachio_mp: {
+        target: 'rate/pistachio_mp'
+    },
+    pistachio_pro: {
+        target: 'rate/pistachio_pro'
+    },
+    plexus75: {
+        target: 'checkerboards/plexus75'
+    },
+    pursuit40: {
+        target: 'checkerboards/pursuit40'
+    },
+    qaz: {
+        target: 'tominabox1/qaz'
+    },
+    quark: {
+        target: 'checkerboards/quark'
+    },
+    rabbit_capture_plan: {
+        target: 'kakunpc/rabbit_capture_plan'
+    },
+    rainkeeb: {
+        target: 'rainkeebs/rainkeeb'
+    },
+    reviung33: {
+        target: 'reviung/reviung33'
+    },
+    reviung34: {
+        target: 'reviung/reviung34'
+    },
+    reviung39: {
+        target: 'reviung/reviung39'
+    },
+    reviung41: {
+        target: 'reviung/reviung41'
+    },
+    reviung5: {
+        target: 'reviung/reviung5'
+    },
+    reviung53: {
+        target: 'reviung/reviung53'
+    },
+    reviung61: {
+        target: 'reviung/reviung61'
+    },
+    runner3680/3x6: {
+        target: 'omkbd/runner3680/3x6'
+    },
+    runner3680/3x7: {
+        target: 'omkbd/runner3680/3x7'
+    },
+    runner3680/3x8: {
+        target: 'omkbd/runner3680/3x8'
+    },
+    runner3680/4x6: {
+        target: 'omkbd/runner3680/4x6'
+    },
+    runner3680/4x7: {
+        target: 'omkbd/runner3680/4x7'
+    },
+    runner3680/4x8: {
+        target: 'omkbd/runner3680/4x8'
+    },
+    runner3680/5x6: {
+        target: 'omkbd/runner3680/5x6'
+    },
+    runner3680/5x6_5x8: {
+        target: 'omkbd/runner3680/5x6_5x8'
+    },
+    runner3680/5x7: {
+        target: 'omkbd/runner3680/5x7'
+    },
+    runner3680/5x8: {
+        target: 'omkbd/runner3680/5x8'
+    },
+    scarletbandana: {
+        target: 'woodkeys/scarletbandana'
+    },
+    scythe: {
+        target: 'kagizaraya/scythe'
+    },
+    seigaiha: {
+        target: 'yiancardesigns/seigaiha'
+    },
+    setta21: {
+        target: 'salicylic_acid3/setta21'
+    },
+    space_space/rev1: {
+        target: 'qpockets/space_space/rev1'
+    },
+    space_space/rev2: {
+        target: 'qpockets/space_space/rev2'
+    },
+    spiderisland/winry25tc: {
+        target: 'winry/winry25tc'
+    },
+    splitreus62: {
+        target: 'nacly/splitreus62'
+    },
+    squiggle/rev1: {
+        target: 'ibnuda/squiggle/rev1'
+    },
+    standaside: {
+        target: 'edi/standaside'
+    },
+    steal_this_keyboard: {
+        target: 'obosob/steal_this_keyboard'
+    },
+    stella: {
+        target: 'hnahkb/stella'
+    },
+    suihankey/alpha: {
+        target: 'kakunpc/suihankey/alpha'
+    },
+    suihankey/rev1: {
+        target: 'kakunpc/suihankey/rev1'
+    },
+    suihankey/split: {
+        target: 'kakunpc/suihankey/split'
+    },
+    the_ruler: {
+        target: 'maple_computing/the_ruler'
+    },
+    thedogkeyboard: {
+        target: 'kakunpc/thedogkeyboard'
+    },
+    tiger910: {
+        target: 'weirdo/tiger910'
+    },
+    treadstone32: {
+        target: 'marksard/treadstone32'
+    },
+    treadstone48/rev1: {
+        target: 'marksard/treadstone48/rev1'
+    },
+    treadstone48/rev2: {
+        target: 'marksard/treadstone48/rev2'
+    },
+    txuu: {
+        target: 'matthewdias/txuu'
+    },
+    ua62: {
+        target: 'nacly/ua62'
+    },
+    underscore33/rev1: {
+        target: 'tominabox1/underscore33/rev1'
+    },
+    underscore33/rev2: {
+        target: 'tominabox1/underscore33/rev2'
+    },
+    vn66: {
+        target: 'hnahkb/vn66'
+    },
+    wallaby: {
+        target: 'kkatano/wallaby'
+    },
+    wanten: {
+        target: 'qpockets/wanten'
+    },
+    whitefox: {
+        target: 'input_club/whitefox'
+    },
+    wings42/rev1: {
+        target: 'dailycraft/wings42/rev1'
+    },
+    wings42/rev1_extkeys: {
+        target: 'dailycraft/wings42/rev1_extkeys'
+    },
+    wings42/rev2: {
+        target: 'dailycraft/wings42/rev2'
+    },
+    yasui: {
+        target: 'rainkeebs/yasui'
+    },
+    yd60mq: {
+        target: 'ymdk/yd60mq'
+    },
+    yd68: {
+        target: 'ydkb/yd68'
+    },
+    ymd75: {
+        target: 'ymdk/ymd75'
+    },
+    ymd96: {
+        target: 'ymdk/ymd96'
+    },
+    ymdk_np21: {
+        target: 'ymdk/np21'
+    },
+    yurei: {
+        target: 'kkatano/yurei'
+    },
+    zinc: {
+        target: '25keys/zinc'
+    },
+    zinc/rev1: {
+        target: '25keys/zinc/rev1'
+    },
+    zinc/reva: {
+        target: '25keys/zinc/reva'
     }
 }
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 132484b708..fc0844a086 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -57,7 +57,7 @@
         },
         "bootloader": {
             "type": "string",
-            "enum": ["atmel-dfu", "bootloadhid", "bootloadHID", "caterina", "halfkay", "kiibohd", "lufa-dfu", "lufa-ms", "md-boot", "micronucleus", "qmk-dfu", "qmk-hid", "stm32-dfu", "stm32duino", "gd32v-dfu", "wb32-dfu", "unknown", "usbasploader", "USBasp", "tinyuf2"],
+            "enum": ["atmel-dfu", "bootloadhid", "bootloadHID", "custom", "caterina", "halfkay", "kiibohd", "lufa-dfu", "lufa-ms", "md-boot", "qmk-dfu", "qmk-hid", "stm32-dfu", "stm32duino", "gd32v-dfu", "wb32-dfu", "unknown", "usbasploader", "USBasp", "tinyuf2"],
         },
         "bootloader_instructions": {
             "type": "string",
diff --git a/data/templates/base/%(KEYBOARD)s.c b/data/templates/base/%(KEYBOARD)s.c
deleted file mode 100644
index 0c509aff65..0000000000
--- a/data/templates/base/%(KEYBOARD)s.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright %(YEAR)s %(YOUR_NAME)s (@%(USER_NAME)s)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "%(KEYBOARD)s.h"
diff --git a/data/templates/base/%(KEYBOARD)s.h b/data/templates/base/%(KEYBOARD)s.h
deleted file mode 100644
index 3e8ca3912d..0000000000
--- a/data/templates/base/%(KEYBOARD)s.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright %(YEAR)s %(YOUR_NAME)s (@%(USER_NAME)s)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, \
-      k10,  k12    \
-) { \
-    { k00, k01,   k02 }, \
-    { k10, KC_NO, k12 }  \
-}
diff --git a/data/templates/base/info.json b/data/templates/base/info.json
deleted file mode 100644
index a50ccba7bf..0000000000
--- a/data/templates/base/info.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "keyboard_name": "%(KEYBOARD)s",
-    "url": "",
-    "maintainer": "%(USER_NAME)s",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"label": "k00", "x": 0, "y": 0},
-                {"label": "k01", "x": 1, "y": 0},
-                {"label": "k02", "x": 2, "y": 0},
-
-                {"label": "k10", "x": 0, "y": 1, "w": 1.5},
-                {"label": "k12", "x": 1.5, "y": 1, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/data/templates/base/keymaps/default/keymap.c b/data/templates/base/keymaps/default/keymap.c
deleted file mode 100644
index 3fec3d5120..0000000000
--- a/data/templates/base/keymaps/default/keymap.c
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright %(YEAR)s %(YOUR_NAME)s (@%(USER_NAME)s)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _BASE,
-    _FN
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    [_BASE] = LAYOUT(
-        KC_A,    KC_1,    MO(_FN),
-            KC_TAB,   KC_SPC
-    ),
-    [_FN] = LAYOUT(
-        _______, _______,  _______,
-            RESET,    XXXXXXX
-    )
-};
diff --git a/data/templates/base/keymaps/default/readme.md b/data/templates/base/keymaps/default/readme.md
deleted file mode 100644
index 63a0643275..0000000000
--- a/data/templates/base/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for %(KEYBOARD)s
diff --git a/data/templates/keyboard/info.json b/data/templates/keyboard/info.json
new file mode 100644
index 0000000000..92718faf3a
--- /dev/null
+++ b/data/templates/keyboard/info.json
@@ -0,0 +1,24 @@
+{
+    "keyboard_name": "%KEYBOARD%",
+    "maintainer": "%USER_NAME%",
+    "processor": "%MCU%",
+    "bootloader": "%BOOTLOADER%",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["C2"],
+        "rows": ["D1"]
+    },
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_ver": "0x0001"
+    },
+    "features": {
+        "bootmagic_lite": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    }
+}
\ No newline at end of file
diff --git a/data/templates/avr/readme.md b/data/templates/keyboard/readme.md
similarity index 82%
rename from data/templates/avr/readme.md
rename to data/templates/keyboard/readme.md
index 207850e065..ca703c53f0 100644
--- a/data/templates/avr/readme.md
+++ b/data/templates/keyboard/readme.md
@@ -1,20 +1,20 @@
-# %(KEYBOARD)s
+# %KEYBOARD%
 
-![%(KEYBOARD)s](imgur.com image replace me!)
+![%KEYBOARD%](imgur.com image replace me!)
 
 *A short description of the keyboard/project*
 
-* Keyboard Maintainer: [%(YOUR_NAME)s](https://github.com/%(USER_NAME)s)
+* Keyboard Maintainer: [%REAL_NAME%](https://github.com/%USER_NAME%)
 * Hardware Supported: *The PCBs, controllers supported*
 * Hardware Availability: *Links to where you can find this hardware*
 
 Make example for this keyboard (after setting up your build environment):
 
-    make %(KEYBOARD)s:default
+    make %KEYBOARD%:default
 
 Flashing example for this keyboard:
 
-    make %(KEYBOARD)s:default:flash
+    make %KEYBOARD%:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
diff --git a/data/templates/keyboard/rules.mk b/data/templates/keyboard/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/data/templates/keyboard/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/docs/api_docs.md b/docs/api_docs.md
index 5032dbc87e..eefb61a54d 100644
--- a/docs/api_docs.md
+++ b/docs/api_docs.md
@@ -62,7 +62,7 @@ This shows us that the job has made it through the queue and is currently runnin
 
 Once your compile job has finished you'll check the `result` key. The value of this key is a hash containing several key bits of information:
 
-* `firmware_binary_url`: A list of URLs for the the flashable firmware
-* `firmware_keymap_url`: A list of URLs for the the `keymap.c`
+* `firmware_binary_url`: A list of URLs for the flashable firmware
+* `firmware_keymap_url`: A list of URLs for the `keymap.c`
 * `firmware_source_url`: A list of URLs for the full firmware source code
 * `output`: The stdout and stderr for this compile job. Errors will be found here.
diff --git a/docs/cli_commands.md b/docs/cli_commands.md
index 01241b00d8..93af906b8a 100644
--- a/docs/cli_commands.md
+++ b/docs/cli_commands.md
@@ -54,7 +54,7 @@ or in keymap directory
 ```
 $ cd ~/qmk_firmware/keyboards/gh60/satan/keymaps/colemak
 $ qmk compile
-Ψ Compiling keymap with make make gh60/satan:colemak
+Ψ Compiling keymap with make gh60/satan:colemak
 ...
 ```
 
@@ -310,7 +310,7 @@ Any arguments that are not provided will prompt for input. If `-u` is not passed
 **Usage**:
 
 ```
-qmk new-keyboard [-kb KEYBOARD] [-t {avr,ps2avrgb}] -u USERNAME
+qmk new-keyboard [-kb KEYBOARD] [-t {atmega32u4,STM32F303,etc}] [-l {60_ansi,75_iso,etc}] -u USERNAME
 ```
 
 ## `qmk new-keymap`
diff --git a/docs/config_options.md b/docs/config_options.md
index 832af78b22..838c4d86fd 100644
--- a/docs/config_options.md
+++ b/docs/config_options.md
@@ -61,6 +61,8 @@ This is a C header file that is one of the first things included, and will persi
   * pins unused by the keyboard for reference
 * `#define MATRIX_HAS_GHOST`
   * define is matrix has ghost (unlikely)
+* `#define MATRIX_UNSELECT_DRIVE_HIGH`
+  * On un-select of matrix pins, rather than setting pins to input-high, sets them to output-high.
 * `#define DIODE_DIRECTION COL2ROW`
   * COL2ROW or ROW2COL - how your matrix is configured. COL2ROW means the black mark on your diode is facing to the rows, and between the switch and the rows.
 * `#define DIRECT_PINS { { F1, F0, B0, C7 }, { F4, F5, F6, F7 } }`
diff --git a/docs/custom_quantum_functions.md b/docs/custom_quantum_functions.md
index dd1654bd29..f9a6e1bcc8 100644
--- a/docs/custom_quantum_functions.md
+++ b/docs/custom_quantum_functions.md
@@ -408,7 +408,7 @@ The `val` is the value of the data that you want to write to EEPROM.  And the `e
 
 ### Deferred Execution :id=deferred-execution
 
-QMK has the ability to execute a callback after a specified period of time, rather than having to manually manage timers.
+QMK has the ability to execute a callback after a specified period of time, rather than having to manually manage timers. To enable this functionality, set `DEFERRED_EXEC_ENABLE = yes` in rules.mk.
 
 #### Deferred executor callbacks
 
diff --git a/docs/data_driven_config.md b/docs/data_driven_config.md
index c2ad4fed8f..38fb5dbf14 100644
--- a/docs/data_driven_config.md
+++ b/docs/data_driven_config.md
@@ -74,7 +74,7 @@ Whenever QMK generates a complete `info.json` it extracts information from `conf
 
 If you are not sure how to edit this file or are not comfortable with Python [open an issue](https://github.com/qmk/qmk_firmware/issues/new?assignees=&labels=cli%2C+python&template=other_issues.md&title=) or [join #cli on Discord](https://discord.gg/heQPAgy) and someone can help you with this part.
 
-### Add code to generate it
+### Add code to generate it :id=add-code-to-generate-it
 
 The final piece of the puzzle is providing your new option to the build system. This is done by generating two files:
 
diff --git a/docs/feature_encoders.md b/docs/feature_encoders.md
index 37d5a75311..6a1a3750a6 100644
--- a/docs/feature_encoders.md
+++ b/docs/feature_encoders.md
@@ -85,7 +85,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 }
 ```
 
-!> If you return `true`, this will allow the keyboard level code to run, as well.  Returning `false` will override the keyboard level code.  Depending on how the keyboard level function is set up. 
+!> If you return `true`, it will allow the keyboard level code to run as well. Returning `false` will override the keyboard level code, depending on how the keyboard function is set up. 
 
 Layer conditions can also be used with the callback function like the following:
 
diff --git a/docs/feature_led_indicators.md b/docs/feature_led_indicators.md
index 59a9f7accc..95d1cd4752 100644
--- a/docs/feature_led_indicators.md
+++ b/docs/feature_led_indicators.md
@@ -1,6 +1,6 @@
 # LED Indicators
 
-?> This feature requires additional configuration to work on both halves of a split keyboard see [Data sync options](feature_split_keyboard.md#data-sync-options)
+?> LED indicators on split keyboards will require state information synced to the slave half (e.g. `#define SPLIT_LED_STATE_ENABLE`). See [data sync options](feature_split_keyboard.md#data-sync-options) for more details.
 
 QMK provides methods to read 5 of the LEDs defined in the HID spec:
 
diff --git a/docs/feature_led_matrix.md b/docs/feature_led_matrix.md
index 37f38cc6ed..37c74843aa 100644
--- a/docs/feature_led_matrix.md
+++ b/docs/feature_led_matrix.md
@@ -67,6 +67,109 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
 
 Where `Cx_y` is the location of the LED in the matrix defined by [the datasheet](https://www.issi.com/WW/pdf/31FL3731.pdf) and the header file `drivers/led/issi/is31fl3731-simple.h`. The `driver` is the index of the driver you defined in your `config.h` (`0`, `1`, `2`, or `3` ).
 
+---
+### IS31FLCOMMON :id=is31flcommon
+
+There is basic support for addressable LED matrix lighting with a selection of I2C ISSI Lumissil LED controllers through a shared common driver. To enable it, add this to your `rules.mk`:
+
+```makefile
+LED_MATRIX_ENABLE = yes
+LED_MATRIX_DRIVER = <driver name>
+```
+
+Where `<driver name>` is the applicable LED driver chip as below
+
+| Driver Name | Data Sheet | Capability |
+|-------------|------------|------------|
+| `IS31FL3742A` | [datasheet](https://www.lumissil.com/assets/pdf/core/IS31FL3742A_DS.pdf) | 180 LED, 30x6 Matrix |
+| `ISSIFL3743A` | [datasheet](https://www.lumissil.com/assets/pdf/core/IS31FL3743A_DS.pdf) | 198 LED, 18x11 Matrix |
+| `IS31FL3745` | [datasheet](https://www.lumissil.com/assets/pdf/core/IS31FL3745_DS.pdf) | 144 LED, 18x8 Matrix |
+| `IS31FL3746A` | [datasheet](https://www.lumissil.com/assets/pdf/core/IS31FL3746A_DS.pdf) | 72 LED, 18x4 Matrix |
+
+You can use between 1 and 4 IC's. Do not specify `DRIVER_ADDR_<N>` define for IC's if not present on your keyboard. The `DRIVER_ADDR_1` default assumes that all Address pins on the controller have been connected to GND. Drivers that have SYNC functionality have the default settings to disable if 1 driver. If more than 1 drivers then `DRIVER_ADDR_1` will be set to Master and the remaiing ones set to Slave.
+
+Configure the hardware via your `config.h`:
+
+| Variable | Description | Default |
+|----------|-------------|---------|
+| `ISSI_TIMEOUT` | (Optional) How long to wait for i2c messages, in milliseconds | 100 |
+| `ISSI_PERSISTENCE` | (Optional) Retry failed messages this many times | 0 |
+| `DRIVER_COUNT` | (Required) How many LED driver IC's are present | |
+| `DRIVER_LED_TOTAL` | (Required) How many LED lights are present across all drivers | |
+| `DRIVER_ADDR_1` | (Optional) Address for the first LED driver | |
+| `DRIVER_ADDR_<N>` | (Required) Address for the additional LED drivers | |
+| `ISSI_SSR_<N>` | (Optional) Configuration for the Spread Spectrum Register | |
+| `ISSI_CONFIGURATION` | (Optional) Configuration for the Configuration Register | |
+| `ISSI_GLOBALCURRENT` | (Optional) Configuration for the Global Current Register | 0xFF |
+| `ISSI_PULLDOWNUP` | (Optional) Configuration for the Pull Up & Pull Down Register | |
+| `ISSI_TEMP` | (Optional) Configuration for the Tempature Register | |
+| `ISSI_PWM_ENABLE` | (Optional) Configuration for the PWM Enable Register | |
+| `ISSI_PWM_SET` | (Optional) Configuration for the PWM Setting Register | |
+| `ISSI_SCAL_LED ` | (Optional) Configuration for the LEDs Scaling Registers | 0xFF |
+| `ISSI_MANUAL_SCALING` | (Optional) If you wish to configure the Scaling Registers manually | |
+
+
+Defaults
+
+| Variable | IS31FL3742A | IS31FL3743A | IS31FL3745 | IS31FL3746 |
+|----------|-------------|-------------|------------|------------|
+| `DRIVER_ADDR_1` | 0b0110000 | 0b0100000 | 0b0100000 | 0b1100000 |
+| `ISSI_SSR_1` | 0x00 | 0x00 / 0x60 | 0x00 / 0xC0 | 0x00 |
+| `ISSI_SSR_<2-4>` | 0x00 | 0x40 | 0x80 | 0x00 |
+| `ISSI_CONFIGURATION` | 0x31 | 0x01 | 0x31 | 0x01 |
+| `ISSI_PULLDOWNUP` | 0x55 | 0x33 | 0x33 | 0x33 |
+| `ISSI_TEMP` | N/A | 0x00 | 0x00 | 0x00 |
+| `ISSI_PWM_ENABLE` | N/A | N/A | N/A | 0x00 |
+| `ISSI_PWM_SET` | 0x00 | N/A | N/A | 0x00 |
+
+Here is an example using 2 drivers.
+
+```c
+#define DRIVER_ADDR_2 0b0100001
+
+#define DRIVER_COUNT 2
+#define DRIVER_1_LED_TOTAL 66
+#define DRIVER_2_LED_TOTAL 42
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+```
+!> Note the parentheses, this is so when `DRIVER_LED_TOTAL` is used in code and expanded, the values are added together before any additional math is applied to them. As an example, `rand() % (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)` will give very different results than `rand() % DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL`.
+
+Currently only 4 drivers are supported, but it would be trivial to support for more. Note that using a combination of different drivers is not supported. All drivers must be of the same model.
+
+Define these arrays listing all the LEDs in your `<keyboard>.c`:
+
+```c
+const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *    driver
+ *    |  LED address
+ *    |  | */
+    { 0, CS1_SW1 },
+    { 0, CS2_SW1 },
+    // ...
+}
+```
+
+Where `CSx_SWx` is the location of the LED in the matrix defined by the datasheet. The `driver` is the index of the driver you defined in your `config.h` (`0`, `1`, `2`, or `3` for now).
+
+`ISSI_MANUAL_SCALING` is used to override the Scaling for individual LED's. By default they will be set as per `ISSI_SCAL_LED`. In `config.h` set how many LED's you want to manually set scaling for.
+Eg `#define ISSI_MANUAL_SCALING 3`
+
+Then Define the array listing all the LEDs you want to override in your `<keyboard>.c`:
+
+```c
+const is31_led __flash g_is31_scaling[ISSI_MANUAL_SCALING] = {
+ *   LED Index
+ *   |  Scaling
+ *   |  | */
+    {5, 120},
+    {9, 120},
+    ....
+}
+```
+
+Where LED Index is the position of the LED in the `g_is31_leds` array. The `scaling` value between 0 and 255 to be written to the Scaling Register.
+
 ---
 
 ## Common Configuration :id=common-configuration
diff --git a/docs/feature_macros.md b/docs/feature_macros.md
index 810028cf70..78bc4ba0a5 100644
--- a/docs/feature_macros.md
+++ b/docs/feature_macros.md
@@ -40,7 +40,7 @@ You can define up to 32 macros in a `keymap.json` file, as used by [Configurator
 
 ### Selecting Your Host Keyboard Layout
 
-If you type in a language other than English, or use a non-QWERTY layout like Colemak, Dvorak, or Workman, you may have set your computer's input language to match this layout. This presents a challenge when creating macros- you may need to type different keys to get the same letters! To address this you can add the `host_language` key to your keymap.json, like so:
+If you type in a language other than English, or use a non-QWERTY layout like Colemak, Dvorak, or Workman, you may have set your computer's input language to match this layout. This presents a challenge when creating macros - you may need to type different keys to get the same letters! To address this you can add the `host_language` key to your `keymap.json`, like so:
 
 ```json
 {
@@ -75,7 +75,7 @@ The current list of available languages is:
 
 ### Macro Basics
 
-Each macro is an array consisting of strings and objects (dictionaries.) Strings are typed to your computer while objects allow you to control how your macro is typed out.
+Each macro is an array consisting of strings and objects (dictionaries). Strings are typed to your computer while objects allow you to control how your macro is typed out.
 
 #### Object Format
 
diff --git a/docs/feature_mouse_keys.md b/docs/feature_mouse_keys.md
index a9fa71abdc..905da36e43 100644
--- a/docs/feature_mouse_keys.md
+++ b/docs/feature_mouse_keys.md
@@ -164,7 +164,7 @@ small and detailed movements of the cursor.
 * **KC_ACL2:** This acceleration sets your cursor to the maximum (computer defined) speed. This is
 useful for moving the cursor large distances without much accuracy.
 
-To use constant speed mode, you must at least define `MK_COMBINED` in your keymap’s `config.h` file:
+To use combined speed mode, you must at least define `MK_COMBINED` in your keymap’s `config.h` file:
 
 ```c
 #define MK_COMBINED
diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index 1972406ff7..4b39599f8a 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -2,7 +2,7 @@
 
 Pointing Device is a generic name for a feature intended to be generic: moving the system pointer around.  There are certainly other options for it - like mousekeys - but this aims to be easily modifiable and hardware driven.  You can implement custom keys to control functionality, or you can gather information from other peripherals and insert it directly here - let QMK handle the processing for you.
 
-To enable Pointing Device, uncomment the following line in your rules.mk:
+To enable Pointing Device, add the following line in your rules.mk and specify one of the driver options below.
 
 ```make
 POINTING_DEVICE_ENABLE = yes
@@ -181,7 +181,13 @@ The CPI range is 50-16000, in increments of 50. Defaults to 2000 CPI.
 
 ### Custom Driver
 
-If you have a sensor type that isn't supported here, you can manually implement it, by adding these functions (with the correct implementation for your device):
+If you have a sensor type that isn't supported above, a custom option is available by adding the following to your `rules.mk`
+
+```make
+POINTING_DEVICE_DRIVER = custom
+```
+
+Using the custom driver will require implementing the following functions:
 
 ```c
 void           pointing_device_driver_init(void) {}
diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index 3384aa7180..a021779d43 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -232,6 +232,115 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
 
 Where `X_Y` is the location of the LED in the matrix defined by [the datasheet](https://www.issi.com/WW/pdf/31FL3737.pdf) and the header file `drivers/led/issi/is31fl3737.h`. The `driver` is the index of the driver you defined in your `config.h` (Only `0`, `1` for now).
 
+---
+### IS31FLCOMMON :id=is31flcommon
+
+There is basic support for addressable RGB matrix lighting with a selection of I2C ISSI Lumissil RGB controllers through a shared common driver. To enable it, add this to your `rules.mk`:
+
+```makefile
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = <driver name>
+```
+
+Where `<driver name>` is the applicable LED driver chip as below
+
+| Driver Name | Data Sheet | Capability |
+|-------------|------------|------------|
+| `IS31FL3742A` | [datasheet](https://www.lumissil.com/assets/pdf/core/IS31FL3742A_DS.pdf) | 60 RGB, 30x6 Matrix |
+| `ISSIFL3743A` | [datasheet](https://www.lumissil.com/assets/pdf/core/IS31FL3743A_DS.pdf) | 66 RGB, 18x11 Matrix |
+| `IS31FL3745` | [datasheet](https://www.lumissil.com/assets/pdf/core/IS31FL3745_DS.pdf) | 48 RGB, 18x8 Matrix |
+| `IS31FL3746A` | [datasheet](https://www.lumissil.com/assets/pdf/core/IS31FL3746A_DS.pdf) | 24 RGB, 18x4 Matrix |
+
+You can use between 1 and 4 IC's. Do not specify `DRIVER_ADDR_<N>` define for IC's if not present on your keyboard. The `DRIVER_ADDR_1` default assumes that all Address pins on the controller have been connected to GND. Drivers that have SYNC functionality have the default settings to disable if 1 driver. If more than 1 drivers then `DRIVER_ADDR_1` will be set to Master and the remaining ones set to Slave.
+
+Configure the hardware via your `config.h`:
+
+| Variable | Description | Default |
+|----------|-------------|---------|
+| `ISSI_TIMEOUT` | (Optional) How long to wait for i2c messages, in milliseconds | 100 |
+| `ISSI_PERSISTENCE` | (Optional) Retry failed messages this many times | 0 |
+| `DRIVER_COUNT` | (Required) How many RGB driver IC's are present | |
+| `DRIVER_LED_TOTAL` | (Required) How many RGB lights are present across all drivers | |
+| `DRIVER_ADDR_1` | (Optional) Address for the first RGB driver | |
+| `DRIVER_ADDR_<N>` | (Required) Address for the additional RGB drivers | |
+| `ISSI_SSR_<N>` | (Optional) Configuration for the Spread Spectrum Register | |
+| `ISSI_CONFIGURATION` | (Optional) Configuration for the Configuration Register | |
+| `ISSI_GLOBALCURRENT` | (Optional) Configuration for the Global Current Register | 0xFF |
+| `ISSI_PULLDOWNUP` | (Optional) Configuration for the Pull Up & Pull Down Register | |
+| `ISSI_TEMP` | (Optional) Configuration for the Tempature Register | |
+| `ISSI_PWM_ENABLE` | (Optional) Configuration for the PWM Enable Register | |
+| `ISSI_PWM_SET` | (Optional) Configuration for the PWM Setting Register | |
+| `ISSI_SCAL_RED` | (Optional) Configuration for the RED LEDs in Scaling Registers | 0xFF |
+| `ISSI_SCAL_BLUE` | (Optional) Configuration for the BLUE LEDs in Scaling Registers | 0xFF |
+| `ISSI_SCAL_GREEN` | (Optional) Configuration for the GREEN LEDs in Scaling Registers | 0xFF |
+| `ISSI_MANUAL_SCALING` | (Optional) If you wish to configure the Scaling Registers manually | |
+
+
+Defaults
+
+| Variable | IS31FL3742A | IS31FL3743A | IS31FL3745 | IS31FL3746 |
+|----------|-------------|-------------|------------|------------|
+| `DRIVER_ADDR_1` | 0b0110000 | 0b0100000 | 0b0100000 | 0b1100000 |
+| `ISSI_SSR_1` | 0x00 | 0x00 / 0x60 | 0x00 / 0xC0 | 0x00 |
+| `ISSI_SSR_<2-4>` | 0x00 | 0x40 | 0x80 | 0x00 |
+| `ISSI_CONFIGURATION` | 0x31 | 0x01 | 0x31 | 0x01 |
+| `ISSI_PULLDOWNUP` | 0x55 | 0x33 | 0x33 | 0x33 |
+| `ISSI_TEMP` | N/A | 0x00 | 0x00 | 0x00 |
+| `ISSI_PWM_ENABLE` | N/A | N/A | N/A | 0x00 |
+| `ISSI_PWM_SET` | 0x00 | N/A | N/A | 0x00 |
+
+Here is an example using 2 drivers.
+
+```c
+#define DRIVER_ADDR_2 0b0100001
+
+#define DRIVER_COUNT 2
+#define DRIVER_1_LED_TOTAL 66
+#define DRIVER_2_LED_TOTAL 42
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+```
+
+!> Note the parentheses, this is so when `DRIVER_LED_TOTAL` is used in code and expanded, the values are added together before any additional math is applied to them. As an example, `rand() % (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)` will give very different results than `rand() % DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL`.
+
+Currently only 4 drivers are supported, but it would be trivial to support for more. Note that using a combination of different drivers is not supported. All drivers must be of the same model.
+
+Define these arrays listing all the LEDs in your `<keyboard>.c`:
+
+```c
+const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |        G location
+ *   |  |        |        B location
+ *   |  |        |        | */
+    {0, CS1_SW1, CS2_SW1, CS3_SW1},
+    ....
+}
+```
+
+Where `CSx_SWx` is the location of the LED in the matrix defined by the datasheet. The `driver` is the index of the driver you defined in your `config.h` (`0`, `1`, `2`, or `3` for now).
+
+`ISSI_MANUAL_SCALING` is used to override the Scaling for individual LED's. By default they will be set as per `ISSI_SCAL_<colour>`. In `config.h` set how many LED's you want to manually set scaling for.
+Eg `#define ISSI_MANUAL_SCALING 3`
+
+Then Define the array listing all the LEDs you want to override in your `<keyboard>.c`:
+
+```c
+const is31_led __flash g_is31_scaling[ISSI_MANUAL_SCALING] = {
+ *   LED Index
+ *   |  R scaling
+ *   |  |    G scaling
+ *   |  |    |    B scaling
+ *   |  |    |    | */
+    {5, 120, 155, 167},
+    {9, 120, 155, 167},
+    ....
+}
+```
+
+Where LED Index is the position of the LED in the `g_is31_leds` array. The `scaling` value between 0 and 255 to be written to the Scaling Register.
+
 ---
 
 ### WS2812 :id=ws2812
@@ -418,6 +527,8 @@ All RGB keycodes are currently shared with the RGBLIGHT system:
 `RGB_MODE_PLAIN`, `RGB_MODE_BREATHE`, `RGB_MODE_RAINBOW`, and `RGB_MODE_SWIRL` are the only ones that are mapped properly. The rest don't have a direct equivalent, and are not mapped.
 
 ?> `RGB_*` keycodes cannot be used with functions like `tap_code16(RGB_HUD)` as they're not USB HID keycodes. If you wish to replicate similar behaviour in custom code within your firmware (e.g. inside `encoder_update_user()` or `process_record_user()`), the equivalent [RGB functions](#functions-idfunctions) should be used instead.
+
+
 !> By default, if you have both the [RGB Light](feature_rgblight.md) and the RGB Matrix 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.
 
 ## RGB Matrix Effects :id=rgb-matrix-effects
@@ -455,6 +566,7 @@ enum rgb_matrix_effects {
     RGB_MATRIX_HUE_PENDULUM,        // Hue shifts up a slight ammount in a wave to the right, then back to the left
     RGB_MATRIX_HUE_WAVE,            // Hue shifts up a slight ammount and then back down in a wave to the right
     RGB_MATRIX_PIXEL_FRACTAL,       // Single hue fractal filled keys pulsing horizontally out to edges
+    RGB_MATRIX_PIXEL_FLOW,          // Pulsing RGB flow along LED wiring with random hues
     RGB_MATRIX_PIXEL_RAIN,          // Randomly light keys with random hues
 #if define(RGB_MATRIX_FRAMEBUFFER_EFFECTS)
     RGB_MATRIX_TYPING_HEATMAP,      // How hot is your WPM!
@@ -510,6 +622,7 @@ You can enable a single effect by defining `ENABLE_[EFFECT_NAME]` in your `confi
 |`#define ENABLE_RGB_MATRIX_HUE_PENDULUM`              |Enables `RGB_MATRIX_HUE_PENDULUM`             |
 |`#define ENABLE_RGB_MATRIX_HUE_WAVE`                  |Enables `RGB_MATRIX_HUE_WAVE `                |
 |`#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL`             |Enables `RGB_MATRIX_PIXEL_FRACTAL`            |
+|`#define ENABLE_RGB_MATRIX_PIXEL_FLOW`                |Enables `RGB_MATRIX_PIXEL_FLOW`               |
 |`#define ENABLE_RGB_MATRIX_PIXEL_RAIN`                |Enables `RGB_MATRIX_PIXEL_RAIN`               |
 
 ?> These modes don't require any additional defines.
@@ -555,9 +668,7 @@ In order to change the delay of temperature decrease define
 
 ## Custom RGB Matrix Effects :id=custom-rgb-matrix-effects
 
-By setting `RGB_MATRIX_CUSTOM_USER = yes` in `rules.mk`, new effects can be defined directly from your keymap or userspace, without having to edit any QMK core files.
-
-To declare new effects, create a `rgb_matrix_user.inc` file in the user keymap directory or userspace folder.
+By setting `RGB_MATRIX_CUSTOM_USER = yes` in `rules.mk`, new effects can be defined directly from your keymap or userspace, without having to edit any QMK core files. To declare new effects, create a `rgb_matrix_user.inc` file in the user keymap directory or userspace folder.
 
 ?> Hardware maintainers who want to limit custom effects to a specific keyboard can create a `rgb_matrix_kb.inc` file in the root of the keyboard directory, and add `RGB_MATRIX_CUSTOM_KB = yes` to the keyboard level `rules.mk`.
 
@@ -707,6 +818,7 @@ Where `28` is an unused index from `eeconfig.h`.
 |`rgb_matrix_decrease_speed_noeeprom()`      |Decrease the speed of the animations (not written to EEPROM) |
 |`rgb_matrix_set_speed(speed)`               |Set the speed of the animations to the given value where `speed` is between 0 and 255 |
 |`rgb_matrix_set_speed_noeeprom(speed)`      |Set the speed of the animations to the given value where `speed` is between 0 and 255 (not written to EEPROM) |
+|`rgb_matrix_reload_from_eeprom()`           |Reload the effect configuration (enabled, mode and color) from EEPROM |
 
 ### Change Color :id=change-color
 |Function                                    |Description  |
@@ -810,6 +922,8 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
 }
 ```
 
+?> Split keyboards will require layer state data syncing with `#define SPLIT_LAYER_STATE_ENABLE`. See [Data Sync Options](feature_split_keyboard?id=data-sync-options) for more details.
+
 #### Examples :id=indicator-examples
 
 This example sets the modifiers to be a specific color based on the layer state.  You can use a switch case here, instead, if you would like.  This uses HSV and then converts to RGB, because this allows the brightness to be limited (important when using the WS2812 driver).
diff --git a/docs/feature_rgblight.md b/docs/feature_rgblight.md
index 7fafaff47e..194daee294 100644
--- a/docs/feature_rgblight.md
+++ b/docs/feature_rgblight.md
@@ -76,9 +76,10 @@ Changing the **Value** sets the overall brightness.<br>
 |`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.
+?> `RGB_*` keycodes cannot be used with functions like `tap_code16(RGB_HUI)` as they're not USB HID keycodes. If you wish to replicate similar behaviour in custom code within your firmware (e.g. inside `encoder_update_user()` or `process_record_user()`), the equivalent [RGB functions](#functions) should be used instead.
 
-?> `RGB_*` keycodes cannot be used with functions like `tap_code16(RGB_HUI)` as they're not USB HID keycodes. If you wish to replicate similar behaviour in custom code within your firmware (e.g. inside `encoder_update_user()` or `process_record_user()`), the equivalent [RGB functions](#functions-idfunctions) should be used instead.
+
+!> 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.
 
 ## Configuration
 
@@ -203,7 +204,7 @@ const uint8_t RGBLED_GRADIENT_RANGES[] PROGMEM = {255, 170, 127, 85, 64};
 
 ## Lighting Layers
 
-?> **Note:** Lighting Layers is an RGB Light feature, it will not work for RGB Matrix. See [RGB Matrix Indicators](feature_rgb_matrix.md?indicators) for details on how to do so.
+?> **Note:** Lighting Layers is an RGB Light feature, it will not work for RGB Matrix. See [RGB Matrix Indicators](feature_rgb_matrix.md#indicators) for details on how to do so.
 
 By including `#define RGBLIGHT_LAYERS` in your `config.h` file you can enable lighting layers. These make
 it easy to use your underglow LEDs as status indicators to show which keyboard layer is currently active, or the state of caps lock, all without disrupting any animations. [Here's a video](https://youtu.be/uLGE1epbmdY) showing an example of what you can do.
diff --git a/docs/feature_tap_dance.md b/docs/feature_tap_dance.md
index 6edce651cd..c055a9989a 100644
--- a/docs/feature_tap_dance.md
+++ b/docs/feature_tap_dance.md
@@ -243,7 +243,7 @@ Now, at the bottom of your `keymap.c` file, you'll need to add the following:
  *
  * How to figure out tap dance state: interrupted and pressed.
  *
- * Interrupted: If the state of a dance dance is "interrupted", that means that another key has been hit
+ * Interrupted: If the state of a dance is "interrupted", that means that another key has been hit
  *  under the tapping term. This is typically indicitive that you are trying to "tap" the key.
  *
  * Pressed: Whether or not the key is still being pressed. If this value is true, that means the tapping term
diff --git a/docs/flash_driver.md b/docs/flash_driver.md
new file mode 100644
index 0000000000..fa7fed5171
--- /dev/null
+++ b/docs/flash_driver.md
@@ -0,0 +1,24 @@
+# FLASH Driver Configuration :id=flash-driver-configuration
+
+The FLASH driver can be swapped out depending on the needs of the keyboard, or whether extra hardware is present.
+
+Driver                             | Description
+-----------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+`FLASH_DRIVER = spi`               | Supports writing to almost all NOR Flash chips. See the driver section below.
+
+
+## SPI FLASH Driver Configuration :id=spi-flash-driver-configuration
+
+Currently QMK supports almost all NOR Flash chips over SPI. As such, requires a working spi_master driver configuration. You can override the driver configuration via your config.h:
+
+`config.h` override                            | Description                                                                          | Default Value
+-----------------------------------------------|--------------------------------------------------------------------------------------|-----------------
+`#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN`  | SPI Slave select pin in order to inform that the FLASH is currently being addressed  | _none_
+`#define EXTERNAL_FLASH_SPI_CLOCK_DIVISOR`     | Clock divisor used to divide the peripheral clock to derive the SPI frequency        | `8`
+`#define EXTERNAL_FLASH_PAGE_SIZE`             | The Page size of the FLASH in bytes, as specified in the datasheet                   | `256`
+`#define EXTERNAL_FLASH_SECTOR_SIZE`           | The sector size of the FLASH in bytes, as specified in the datasheet                 | `(4 * 1024)`
+`#define EXTERNAL_FLASH_BLOCK_SIZE`            | The block size of the FLASH in bytes, as specified in the datasheet                  | `(64 * 1024)`
+`#define EXTERNAL_FLASH_SIZE`                  | The total size of the FLASH in bytes, as specified in the datasheet                  | `(512 * 1024)`
+`#define EXTERNAL_FLASH_ADDRESS_SIZE`          | The Flash address size in bytes, as specified in datasheet                           | `3`
+
+!> All the above default configurations are based on MX25L4006E NOR Flash.
diff --git a/docs/hardware_avr.md b/docs/hardware_avr.md
index 3d58cdc055..69aca2cf34 100644
--- a/docs/hardware_avr.md
+++ b/docs/hardware_avr.md
@@ -1,6 +1,6 @@
 # Keyboards with AVR Processors
 
-This page describes the support for for AVR processors in QMK. AVR processors include the atmega32u4, atmega32u2, at90usb1286, and other processors from Atmel Corporation. AVR processors are 8-bit MCUs that are designed to be easy to work with. The most common AVR processors in keyboards have on-board USB and plenty of GPIO for supporting large keyboard matrices. They are the most popular MCU for use in keyboards today.
+This page describes the support for AVR processors in QMK. AVR processors include the atmega32u4, atmega32u2, at90usb1286, and other processors from Atmel Corporation. AVR processors are 8-bit MCUs that are designed to be easy to work with. The most common AVR processors in keyboards have on-board USB and plenty of GPIO for supporting large keyboard matrices. They are the most popular MCU for use in keyboards today.
 
 If you have not yet you should read the [Keyboard Guidelines](hardware_keyboard_guidelines.md) to get a sense of how keyboards fit into QMK.
 
diff --git a/docs/hardware_keyboard_guidelines.md b/docs/hardware_keyboard_guidelines.md
index be55356b17..6df86fb0fb 100644
--- a/docs/hardware_keyboard_guidelines.md
+++ b/docs/hardware_keyboard_guidelines.md
@@ -87,6 +87,7 @@ The `config.h` files can also be placed in sub-folders, and the order in which t
     * `keyboards/top_folder/sub_1/sub_2/config.h`
       * `keyboards/top_folder/sub_1/sub_2/sub_3/config.h`
         * `keyboards/top_folder/sub_1/sub_2/sub_3/sub_4/config.h`
+          * [`.build/objs_<keyboard>/src/info_config.h`](data_driven_config.md#add-code-to-generate-it) see [Data Driven Configuration](data_driven_config.md)
           * `users/a_user_folder/config.h`
           * `keyboards/top_folder/keymaps/a_keymap/config.h`
         * `keyboards/top_folder/sub_1/sub_2/sub_3/sub_4/post_config.h`
diff --git a/docs/ja/cli_commands.md b/docs/ja/cli_commands.md
index 35937dbbcb..8a661d56ee 100644
--- a/docs/ja/cli_commands.md
+++ b/docs/ja/cli_commands.md
@@ -59,7 +59,7 @@ $ qmk compile -km 66_iso
 ```
 $ cd ~/qmk_firmware/keyboards/gh60/satan/keymaps/colemak
 $ qmk compile
-Ψ Compiling keymap with make make gh60/satan:colemak
+Ψ Compiling keymap with make gh60/satan:colemak
 ...
 ```
 
diff --git a/docs/keycodes_us_ansi_shifted.md b/docs/keycodes_us_ansi_shifted.md
index 85dd61759f..e9749b7b17 100644
--- a/docs/keycodes_us_ansi_shifted.md
+++ b/docs/keycodes_us_ansi_shifted.md
@@ -8,7 +8,7 @@ Unfortunately, these keycodes cannot be used in Mod-Taps or Layer-Taps, since an
 
 Additionally, you may run into issues when using Remote Desktop Connection on Windows. Because these codes send shift very fast, Remote Desktop may miss the codes.
 
-To fix this, open Remote Desktop Connection, click on "Show Options", open the the "Local Resources" tab. In the keyboard section, change the drop down to "On this Computer". This will fix the issue, and allow the characters to work correctly.
+To fix this, open Remote Desktop Connection, click on "Show Options", open the "Local Resources" tab. In the keyboard section, change the drop down to "On this Computer". This will fix the issue, and allow the characters to work correctly.
 
 ## Keycodes
 
diff --git a/docs/mod_tap.md b/docs/mod_tap.md
index dc11b0dea9..ca3a2752c7 100644
--- a/docs/mod_tap.md
+++ b/docs/mod_tap.md
@@ -58,7 +58,7 @@ Currently, the `kc` argument of `MT()` is limited to the [Basic Keycode set](key
 Expanding this would be complicated, at best. Moving to a 32-bit keycode would solve a lot of this, but would double the amount of space that the keymap matrix uses. And it could potentially cause issues, too. If you need to apply modifiers to your tapped keycode, [Tap Dance](feature_tap_dance.md#example-5-using-tap-dance-for-advanced-mod-tap-and-layer-tap-keys) can be used to accomplish this.
 
 You may also run into issues when using Remote Desktop Connection on Windows. Because these keycodes send key events faster than a human, Remote Desktop could miss them.
-To fix this, open Remote Desktop Connection, click on "Show Options", open the the "Local Resources" tab, and in the keyboard section, change the drop down to "On this Computer". This will fix the issue, and allow the characters to work correctly.
+To fix this, open Remote Desktop Connection, click on "Show Options", open the "Local Resources" tab, and in the keyboard section, change the drop down to "On this Computer". This will fix the issue, and allow the characters to work correctly.
 It can also be mitigated by increasing [`TAP_CODE_DELAY`](config_options.md#behaviors-that-can-be-configured).
 
 ## Intercepting Mod-Taps
diff --git a/docs/other_eclipse.md b/docs/other_eclipse.md
index 58ab7e295d..de8cdf9b8c 100644
--- a/docs/other_eclipse.md
+++ b/docs/other_eclipse.md
@@ -74,7 +74,7 @@ Once both plugins are installed, restart Eclipse as prompted.
 
 ## Build Your Keyboard
 
-We will now change the default make target of the the project from `all` to the
+We will now change the default make target of the project from `all` to the
 specific keyboard and keymap combination we are working on,
 e.g. `kinesis/kint36:stapelberg`. This way, project-wide actions like cleaning
 and building the project will complete quickly, instead of taking a long time or
diff --git a/docs/other_vscode.md b/docs/other_vscode.md
index 6af0a6f7b4..aac46c1829 100644
--- a/docs/other_vscode.md
+++ b/docs/other_vscode.md
@@ -15,7 +15,7 @@ The purpose of this page is to document how to set up VS Code for developing QMK
 This guide covers how to configure everything needed on Windows and Ubuntu 18.04
 
 # Set up VS Code
-Before starting, you will want to make sure that you have all of the build tools set up, and QMK Firmware cloned. Head to the the [Newbs Getting Started Guide](newbs_getting_started.md) to get things set up, if you haven't already.
+Before starting, you will want to make sure that you have all of the build tools set up, and QMK Firmware cloned. Head to the [Newbs Getting Started Guide](newbs_getting_started.md) to get things set up, if you haven't already.
 
 ## Windows
 
diff --git a/docs/pr_checklist.md b/docs/pr_checklist.md
index 1bd6200b82..e4564746b4 100644
--- a/docs/pr_checklist.md
+++ b/docs/pr_checklist.md
@@ -8,7 +8,7 @@ If there are any inconsistencies with these recommendations, you're best off [cr
 
 - PR should be submitted using a non-`master` branch on the source repository
     - this does not mean you target a different branch for your PR, rather that you're not working out of your own master branch
-    - if submitter _does_ use their own `master` branch, they'll be given a link to the ["how to git"](https://docs.qmk.fm/#/newbs_git_using_your_master_branch) page after merging -- (end of this document will contain the contents of the message)
+    - if submitter _does_ use their own `master` branch, they'll be given a link to the ["how to git"](newbs_git_using_your_master_branch.md) page after merging -- (end of this document will contain the contents of the message)
 - newly-added directories and filenames must be lowercase
     - this rule may be relaxed if upstream sources originally had uppercase characters (e.g. LUFA, ChibiOS, or imported files from other repositories etc.)
     - if there is valid justification (i.e. consistency with existing core files etc.) this can be relaxed
@@ -76,9 +76,9 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard
 - `<keyboard>.c`
     - empty `xxxx_xxxx_kb()` or other weak-defined default implemented functions removed
     - commented-out functions removed too
-    - `matrix_init_board()` etc. migrated to `keyboard_pre_init_kb()`, see: [keyboard_pre_init*](https://docs.qmk.fm/#/custom_quantum_functions?id=keyboard_pre_init_-function-documentation)
-    - prefer `CUSTOM_MATRIX = lite` if custom matrix used, allows for standard debounce, see [custom matrix 'lite'](https://docs.qmk.fm/#/custom_matrix?id=lite)
-    - prefer LED indicator [Configuration Options](https://docs.qmk.fm/#/feature_led_indicators?id=configuration-options) to custom `led_update_*()` implementations where possible
+    - `matrix_init_board()` etc. migrated to `keyboard_pre_init_kb()`, see: [keyboard_pre_init*](custom_quantum_functions.md?id=keyboard_pre_init_-function-documentation)
+    - prefer `CUSTOM_MATRIX = lite` if custom matrix used, allows for standard debounce, see [custom matrix 'lite'](custom_matrix.md?id=lite)
+    - prefer LED indicator [Configuration Options](feature_led_indicators.md?id=configuration-options) to custom `led_update_*()` implementations where possible
 - `<keyboard>.h`
     - `#include "quantum.h"` appears at the top
     - `LAYOUT` macros should use standard definitions if applicable
@@ -111,13 +111,13 @@ Also, specific to ChibiOS:
         - example: For an STM32L082KZ, given the similarity to an STM32L073RZ, you can use `BOARD = ST_NUCLEO64_L073RZ` in rules.mk
     - QMK is migrating to not having custom board definitions if at all possible, due to the ongoing maintenance burden when upgrading ChibiOS
 - New board definitions must not be embedded in a keyboard PR
-    - See _Core PRs_ below for the procedure for adding a new board to QMK
+    - See [Core PRs](#core-pr) below for the procedure for adding a new board to QMK
 - if a board definition is unavoidable, `board.c` must have a standard `__early_init()` (as per normal ChibiOS board defs) and an empty `boardInit()`:
-    - see Arm/ChibiOS [early initialization](https://docs.qmk.fm/#/platformdev_chibios_earlyinit?id=board-init)
+    - see Arm/ChibiOS [early initialization](platformdev_chibios_earlyinit.md?id=board-init)
     - `__early_init()` should be replaced by either `early_hardware_init_pre()` or `early_hardware_init_post()` as appropriate
     - `boardInit()` should be migrated to `board_init()`
 
-## Core PRs
+## Core PRs :id=core-pr
 
 - must now target `develop` branch, which will subsequently be merged back to `master` on the breaking changes timeline
 - any new boards adding support for new hardware now requires a corresponding test board under `keyboards/handwired/onekey`
diff --git a/docs/squeezing_avr.md b/docs/squeezing_avr.md
index e4d8d7c146..4a147e0c66 100644
--- a/docs/squeezing_avr.md
+++ b/docs/squeezing_avr.md
@@ -147,6 +147,7 @@ For RGB Matrix, these need to be explicitly enabled as well. To disable any that
 #undef ENABLE_RGB_MATRIX_HUE_PENDULUM
 #undef ENABLE_RGB_MATRIX_HUE_WAVE
 #undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+#undef ENABLE_RGB_MATRIX_PIXEL_FLOW
 #undef ENABLE_RGB_MATRIX_PIXEL_RAIN
 
 #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
diff --git a/docs/zh-cn/cli_commands.md b/docs/zh-cn/cli_commands.md
index 08d1cc7e79..ed36ed975b 100644
--- a/docs/zh-cn/cli_commands.md
+++ b/docs/zh-cn/cli_commands.md
@@ -59,7 +59,7 @@ $ qmk compile -km 66_iso
 ```
 $ cd ~/qmk_firmware/keyboards/gh60/satan/keymaps/colemak
 $ qmk compile
-Ψ Compiling keymap with make make gh60/satan:colemak
+Ψ Compiling keymap with make gh60/satan:colemak
 ...
 ```
 
diff --git a/drivers/bluetooth/bluefruit_le.cpp b/drivers/bluetooth/bluefruit_le.cpp
index 86581a1a48..19310767cf 100644
--- a/drivers/bluetooth/bluefruit_le.cpp
+++ b/drivers/bluetooth/bluefruit_le.cpp
@@ -29,7 +29,7 @@
 #endif
 
 #ifndef BLUEFRUIT_LE_SCK_DIVISOR
-#    define BLUEFRUIT_LE_SCK_DIVISOR 2  // 4MHz SCK/8MHz CPU, calculated for Feather 32U4 BLE
+#    define BLUEFRUIT_LE_SCK_DIVISOR 2 // 4MHz SCK/8MHz CPU, calculated for Feather 32U4 BLE
 #endif
 
 #define SAMPLE_BATTERY
@@ -77,10 +77,10 @@ struct sdep_msg {
 // information here.
 
 enum queue_type {
-    QTKeyReport,  // 1-byte modifier + 6-byte key report
-    QTConsumer,   // 16-bit key code
+    QTKeyReport, // 1-byte modifier + 6-byte key report
+    QTConsumer,  // 16-bit key code
 #ifdef MOUSE_ENABLE
-    QTMouseMove,  // 4-byte mouse report
+    QTMouseMove, // 4-byte mouse report
 #endif
 };
 
@@ -115,8 +115,8 @@ enum sdep_type {
     SdepResponse      = 0x20,
     SdepAlert         = 0x40,
     SdepError         = 0x80,
-    SdepSlaveNotReady = 0xFE,  // Try again later
-    SdepSlaveOverflow = 0xFF,  // You read more data than is available
+    SdepSlaveNotReady = 0xFE, // Try again later
+    SdepSlaveOverflow = 0xFF, // You read more data than is available
 };
 
 enum ble_cmd {
@@ -306,13 +306,15 @@ static bool ble_init(void) {
     wait_ms(10);
     writePinHigh(BLUEFRUIT_LE_RST_PIN);
 
-    wait_ms(1000);  // Give it a second to initialize
+    wait_ms(1000); // Give it a second to initialize
 
     state.initialized = true;
     return state.initialized;
 }
 
-static inline uint8_t min(uint8_t a, uint8_t b) { return a < b ? a : b; }
+static inline uint8_t min(uint8_t a, uint8_t b) {
+    return a < b ? a : b;
+}
 
 static bool read_response(char *resp, uint16_t resplen, bool verbose) {
     char *dest = resp;
@@ -424,7 +426,9 @@ bool at_command_P(const char *cmd, char *resp, uint16_t resplen, bool verbose) {
     return at_command(cmdbuf, resp, resplen, verbose);
 }
 
-bool bluefruit_le_is_connected(void) { return state.is_connected; }
+bool bluefruit_le_is_connected(void) {
+    return state.is_connected;
+}
 
 bool bluefruit_le_enable_keyboard(void) {
     char resbuf[128];
@@ -671,7 +675,9 @@ void bluefruit_le_send_mouse_move(int8_t x, int8_t y, int8_t scroll, int8_t pan,
 }
 #endif
 
-uint32_t bluefruit_le_read_battery_voltage(void) { return state.vbat; }
+uint32_t bluefruit_le_read_battery_voltage(void) {
+    return state.vbat;
+}
 
 bool bluefruit_le_set_mode_leds(bool on) {
     if (!state.configured) {
diff --git a/drivers/bluetooth/outputselect.c b/drivers/bluetooth/outputselect.c
index cdd2e64cfd..b986ba274e 100644
--- a/drivers/bluetooth/outputselect.c
+++ b/drivers/bluetooth/outputselect.c
@@ -13,10 +13,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "outputselect.h"
-
-#if defined(PROTOCOL_LUFA)
-#    include "lufa.h"
-#endif
+#include "usb_util.h"
 
 #ifdef BLUETOOTH_BLUEFRUIT_LE
 #    include "bluefruit_le.h"
@@ -39,18 +36,12 @@ void set_output(uint8_t output) {
  */
 __attribute__((weak)) void set_output_user(uint8_t output) {}
 
-static bool is_usb_configured(void) {
-#if defined(PROTOCOL_LUFA)
-    return USB_DeviceState == DEVICE_STATE_Configured;
-#endif
-}
-
 /** \brief Auto Detect Output
  *
  * FIXME: Needs doc
  */
 uint8_t auto_detect_output(void) {
-    if (is_usb_configured()) {
+    if (usb_connected_state()) {
         return OUTPUT_USB;
     }
 
@@ -61,7 +52,7 @@ uint8_t auto_detect_output(void) {
 #endif
 
 #ifdef BLUETOOTH_ENABLE
-    return OUTPUT_BLUETOOTH;  // should check if BT is connected here
+    return OUTPUT_BLUETOOTH; // should check if BT is connected here
 #endif
 
     return OUTPUT_NONE;
diff --git a/drivers/bluetooth/rn42.c b/drivers/bluetooth/rn42.c
index 2ef40bb7e0..5d497cda20 100644
--- a/drivers/bluetooth/rn42.c
+++ b/drivers/bluetooth/rn42.c
@@ -61,7 +61,9 @@ static inline uint16_t rn42_consumer_usage_to_bitmap(uint16_t usage) {
     }
 }
 
-void rn42_init(void) { uart_init(RN42_BAUD_RATE); }
+void rn42_init(void) {
+    uart_init(RN42_BAUD_RATE);
+}
 
 void rn42_send_keyboard(report_keyboard_t *report) {
     uart_write(0xFD);
@@ -81,8 +83,8 @@ void rn42_send_mouse(report_mouse_t *report) {
     uart_write(report->buttons);
     uart_write(report->x);
     uart_write(report->y);
-    uart_write(report->v);  // should try sending the wheel v here
-    uart_write(report->h);  // should try sending the wheel h here
+    uart_write(report->v); // should try sending the wheel v here
+    uart_write(report->h); // should try sending the wheel h here
     uart_write(0x00);
 }
 
diff --git a/drivers/eeprom/eeprom_driver.c b/drivers/eeprom/eeprom_driver.c
index 6ce47faf7d..885cf21981 100644
--- a/drivers/eeprom/eeprom_driver.c
+++ b/drivers/eeprom/eeprom_driver.c
@@ -37,11 +37,17 @@ uint32_t eeprom_read_dword(const uint32_t *addr) {
     return ret;
 }
 
-void eeprom_write_byte(uint8_t *addr, uint8_t value) { eeprom_write_block(&value, addr, 1); }
+void eeprom_write_byte(uint8_t *addr, uint8_t value) {
+    eeprom_write_block(&value, addr, 1);
+}
 
-void eeprom_write_word(uint16_t *addr, uint16_t value) { eeprom_write_block(&value, addr, 2); }
+void eeprom_write_word(uint16_t *addr, uint16_t value) {
+    eeprom_write_block(&value, addr, 2);
+}
 
-void eeprom_write_dword(uint32_t *addr, uint32_t value) { eeprom_write_block(&value, addr, 4); }
+void eeprom_write_dword(uint32_t *addr, uint32_t value) {
+    eeprom_write_block(&value, addr, 4);
+}
 
 void eeprom_update_block(const void *buf, void *addr, size_t len) {
     uint8_t read_buf[len];
diff --git a/drivers/eeprom/eeprom_i2c.c b/drivers/eeprom/eeprom_i2c.c
index 8e80ff544f..a74a010415 100644
--- a/drivers/eeprom/eeprom_i2c.c
+++ b/drivers/eeprom/eeprom_i2c.c
@@ -43,7 +43,7 @@
 #if defined(CONSOLE_ENABLE) && defined(DEBUG_EEPROM_OUTPUT)
 #    include "timer.h"
 #    include "debug.h"
-#endif  // DEBUG_EEPROM_OUTPUT
+#endif // DEBUG_EEPROM_OUTPUT
 
 static inline void fill_target_address(uint8_t *buffer, const void *addr) {
     uintptr_t p = (uintptr_t)addr;
@@ -91,7 +91,7 @@ void eeprom_read_block(void *buf, const void *addr, size_t len) {
         dprintf(" %02X", (int)(((uint8_t *)buf)[i]));
     }
     dprintf("\n");
-#endif  // DEBUG_EEPROM_OUTPUT
+#endif // DEBUG_EEPROM_OUTPUT
 }
 
 void eeprom_write_block(const void *buf, void *addr, size_t len) {
@@ -122,7 +122,7 @@ void eeprom_write_block(const void *buf, void *addr, size_t len) {
             dprintf(" %02X", (int)(read_buf[i]));
         }
         dprintf("\n");
-#endif  // DEBUG_EEPROM_OUTPUT
+#endif // DEBUG_EEPROM_OUTPUT
 
         i2c_transmit(EXTERNAL_EEPROM_I2C_ADDRESS((uintptr_t)addr), complete_packet, EXTERNAL_EEPROM_ADDRESS_SIZE + write_length, 100);
         wait_ms(EXTERNAL_EEPROM_WRITE_TIME);
diff --git a/drivers/eeprom/eeprom_spi.c b/drivers/eeprom/eeprom_spi.c
index e273090854..25955498c4 100644
--- a/drivers/eeprom/eeprom_spi.c
+++ b/drivers/eeprom/eeprom_spi.c
@@ -52,7 +52,9 @@
 #    define EXTERNAL_EEPROM_SPI_TIMEOUT 100
 #endif
 
-static bool spi_eeprom_start(void) { return spi_start(EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN, EXTERNAL_EEPROM_SPI_LSBFIRST, EXTERNAL_EEPROM_SPI_MODE, EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR); }
+static bool spi_eeprom_start(void) {
+    return spi_start(EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN, EXTERNAL_EEPROM_SPI_LSBFIRST, EXTERNAL_EEPROM_SPI_MODE, EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR);
+}
 
 static spi_status_t spi_eeprom_wait_while_busy(int timeout) {
     uint32_t     deadline = timer_read32() + timeout;
@@ -80,7 +82,9 @@ static void spi_eeprom_transmit_address(uintptr_t addr) {
 
 //----------------------------------------------------------------------------------------------------------------------
 
-void eeprom_driver_init(void) { spi_init(); }
+void eeprom_driver_init(void) {
+    spi_init();
+}
 
 void eeprom_driver_erase(void) {
 #if defined(CONSOLE_ENABLE) && defined(DEBUG_EEPROM_OUTPUT)
@@ -135,7 +139,7 @@ void eeprom_read_block(void *buf, const void *addr, size_t len) {
         dprintf(" %02X", (int)(((uint8_t *)buf)[i]));
     }
     dprintf("\n");
-#endif  // DEBUG_EEPROM_OUTPUT
+#endif // DEBUG_EEPROM_OUTPUT
 
     spi_stop();
 }
@@ -192,7 +196,7 @@ void eeprom_write_block(const void *buf, void *addr, size_t len) {
             dprintf(" %02X", (int)(uint8_t)(read_buf[i]));
         }
         dprintf("\n");
-#endif  // DEBUG_EEPROM_OUTPUT
+#endif // DEBUG_EEPROM_OUTPUT
 
         spi_write(CMD_WRITE);
         spi_eeprom_transmit_address(target_addr);
diff --git a/drivers/eeprom/eeprom_transient.c b/drivers/eeprom/eeprom_transient.c
index b4c78c6f40..9dc4289c27 100644
--- a/drivers/eeprom/eeprom_transient.c
+++ b/drivers/eeprom/eeprom_transient.c
@@ -30,9 +30,13 @@ size_t clamp_length(intptr_t offset, size_t len) {
     return len;
 }
 
-void eeprom_driver_init(void) { eeprom_driver_erase(); }
+void eeprom_driver_init(void) {
+    eeprom_driver_erase();
+}
 
-void eeprom_driver_erase(void) { memset(transientBuffer, 0x00, TRANSIENT_EEPROM_SIZE); }
+void eeprom_driver_erase(void) {
+    memset(transientBuffer, 0x00, TRANSIENT_EEPROM_SIZE);
+}
 
 void eeprom_read_block(void *buf, const void *addr, size_t len) {
     intptr_t offset = (intptr_t)addr;
diff --git a/drivers/eeprom/eeprom_transient.h b/drivers/eeprom/eeprom_transient.h
index d06189b246..687b8619fe 100644
--- a/drivers/eeprom/eeprom_transient.h
+++ b/drivers/eeprom/eeprom_transient.h
@@ -21,5 +21,5 @@
 */
 #ifndef TRANSIENT_EEPROM_SIZE
 #    include "eeconfig.h"
-#    define TRANSIENT_EEPROM_SIZE (((EECONFIG_SIZE + 3) / 4) * 4)  // based off eeconfig's current usage, aligned to 4-byte sizes, to deal with LTO
+#    define TRANSIENT_EEPROM_SIZE (((EECONFIG_SIZE + 3) / 4) * 4) // based off eeconfig's current usage, aligned to 4-byte sizes, to deal with LTO
 #endif
diff --git a/drivers/flash/flash_spi.c b/drivers/flash/flash_spi.c
new file mode 100644
index 0000000000..f4cbf65159
--- /dev/null
+++ b/drivers/flash/flash_spi.c
@@ -0,0 +1,376 @@
+/*
+Copyright (C) 2021 Westberry Technology (ChangZhou) Corp., Ltd
+
+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 <string.h>
+
+#include "util.h"
+#include "wait.h"
+#include "debug.h"
+#include "timer.h"
+#include "flash_spi.h"
+#include "spi_master.h"
+
+/*
+    The time-out time of spi flash transmission.
+*/
+#ifndef EXTERNAL_FLASH_SPI_TIMEOUT
+#    define EXTERNAL_FLASH_SPI_TIMEOUT 1000
+#endif
+
+/* ID comands */
+#define FLASH_CMD_RDID 0x9F /* RDID (Read Identification) */
+#define FLASH_CMD_RES 0xAB  /* RES (Read Electronic ID) */
+#define FLASH_CMD_REMS 0x90 /* REMS (Read Electronic & Device ID) */
+
+/* register comands */
+#define FLASH_CMD_WRSR 0x01 /* WRSR (Write Status register) */
+#define FLASH_CMD_RDSR 0x05 /* RDSR (Read Status register) */
+
+/* READ comands */
+#define FLASH_CMD_READ 0x03     /* READ (1 x I/O) */
+#define FLASH_CMD_FASTREAD 0x0B /* FAST READ (Fast read data) */
+#define FLASH_CMD_DREAD 0x3B    /* DREAD (1In/2 Out fast read) */
+
+/* Program comands */
+#define FLASH_CMD_WREN 0x06 /* WREN (Write Enable) */
+#define FLASH_CMD_WRDI 0x04 /* WRDI (Write Disable) */
+#define FLASH_CMD_PP 0x02   /* PP (page program) */
+
+/* Erase comands */
+#define FLASH_CMD_SE 0x20 /* SE (Sector Erase) */
+#define FLASH_CMD_BE 0xD8 /* BE (Block Erase) */
+#define FLASH_CMD_CE 0x60 /* CE (Chip Erase) hex code: 60 or C7 */
+
+/* Mode setting comands */
+#define FLASH_CMD_DP 0xB9  /* DP (Deep Power Down) */
+#define FLASH_CMD_RDP 0xAB /* RDP (Release form Deep Power Down) */
+
+/* Status register */
+#define FLASH_FLAG_WIP 0x01 /* Write in progress bit */
+#define FLASH_FLAG_WEL 0x02 /* Write enable latch bit */
+
+// #define DEBUG_FLASH_SPI_OUTPUT
+
+static bool spi_flash_start(void) {
+    return spi_start(EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN, EXTERNAL_FLASH_SPI_LSBFIRST, EXTERNAL_FLASH_SPI_MODE, EXTERNAL_FLASH_SPI_CLOCK_DIVISOR);
+}
+
+static flash_status_t spi_flash_wait_while_busy(void) {
+    uint32_t       deadline = timer_read32() + EXTERNAL_FLASH_SPI_TIMEOUT;
+    flash_status_t response = FLASH_STATUS_SUCCESS;
+    uint8_t        retval;
+
+    do {
+        bool res = spi_flash_start();
+        if (!res) {
+            dprint("Failed to start SPI! [spi flash wait while busy]\n");
+            return FLASH_STATUS_ERROR;
+        }
+
+        spi_write(FLASH_CMD_RDSR);
+
+        retval = (uint8_t)spi_read();
+
+        spi_stop();
+
+        if (timer_read32() >= deadline) {
+            response = FLASH_STATUS_TIMEOUT;
+            break;
+        }
+    } while (retval & FLASH_FLAG_WIP);
+
+    return response;
+}
+
+static flash_status_t spi_flash_write_enable(void) {
+    bool res = spi_flash_start();
+    if (!res) {
+        dprint("Failed to start SPI! [spi flash write enable]\n");
+        return FLASH_STATUS_ERROR;
+    }
+
+    spi_write(FLASH_CMD_WREN);
+
+    spi_stop();
+
+    return FLASH_STATUS_SUCCESS;
+}
+
+static flash_status_t spi_flash_write_disable(void) {
+    bool res = spi_flash_start();
+    if (!res) {
+        dprint("Failed to start SPI! [spi flash write disable]\n");
+        return FLASH_STATUS_ERROR;
+    }
+
+    spi_write(FLASH_CMD_WRDI);
+
+    spi_stop();
+
+    return FLASH_STATUS_SUCCESS;
+}
+
+/* This function is used for read transfer, write transfer and erase transfer. */
+static flash_status_t spi_flash_transaction(uint8_t cmd, uint32_t addr, uint8_t *data, size_t len) {
+    flash_status_t response = FLASH_STATUS_SUCCESS;
+    uint8_t        buffer[EXTERNAL_FLASH_ADDRESS_SIZE + 1];
+
+    buffer[0] = cmd;
+    for (int i = 0; i < EXTERNAL_FLASH_ADDRESS_SIZE; ++i) {
+        buffer[EXTERNAL_FLASH_ADDRESS_SIZE - i] = addr & 0xFF;
+        addr >>= 8;
+    }
+
+    bool res = spi_flash_start();
+    if (!res) {
+        dprint("Failed to start SPI! [spi flash transmit]\n");
+        return FLASH_STATUS_ERROR;
+    }
+
+    response = spi_transmit(buffer, sizeof(buffer));
+
+    if ((!response) && (data != NULL)) {
+        switch (cmd) {
+            case FLASH_CMD_READ:
+                response = spi_receive(data, len);
+                break;
+            case FLASH_CMD_PP:
+                response = spi_transmit(data, len);
+                break;
+            default:
+                response = FLASH_STATUS_ERROR;
+                break;
+        }
+    }
+
+    spi_stop();
+
+    return response;
+}
+
+void flash_init(void) {
+    spi_init();
+}
+
+flash_status_t flash_erase_chip(void) {
+    flash_status_t response = FLASH_STATUS_SUCCESS;
+
+    /* Wait for the write-in-progress bit to be cleared. */
+    response = spi_flash_wait_while_busy();
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to check WIP flag! [spi flash erase chip]\n");
+        return response;
+    }
+
+    /* Enable writes. */
+    response = spi_flash_write_enable();
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to write-enable! [spi flash erase chip]\n");
+        return response;
+    }
+
+    /* Erase Chip. */
+    bool res = spi_flash_start();
+    if (!res) {
+        dprint("Failed to start SPI! [spi flash erase chip]\n");
+        return FLASH_STATUS_ERROR;
+    }
+    spi_write(FLASH_CMD_CE);
+    spi_stop();
+
+    /* Wait for the write-in-progress bit to be cleared.*/
+    response = spi_flash_wait_while_busy();
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to check WIP flag! [spi flash erase chip]\n");
+        return response;
+    }
+
+    return response;
+}
+
+flash_status_t flash_erase_sector(uint32_t addr) {
+    flash_status_t response = FLASH_STATUS_SUCCESS;
+
+    /* Check that the address exceeds the limit. */
+    if ((addr + (EXTERNAL_FLASH_SECTOR_SIZE)) >= (EXTERNAL_FLASH_SIZE) || ((addr % (EXTERNAL_FLASH_SECTOR_SIZE)) != 0)) {
+        dprintf("Flash erase sector address over limit! [addr:0x%x]\n", (uint32_t)addr);
+        return FLASH_STATUS_ERROR;
+    }
+
+    /* Wait for the write-in-progress bit to be cleared. */
+    response = spi_flash_wait_while_busy();
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to check WIP flag! [spi flash erase sector]\n");
+        return response;
+    }
+
+    /* Enable writes. */
+    response = spi_flash_write_enable();
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to write-enable! [spi flash erase sector]\n");
+        return response;
+    }
+
+    /* Erase Sector. */
+    response = spi_flash_transaction(FLASH_CMD_SE, addr, NULL, 0);
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to erase sector! [spi flash erase sector]\n");
+        return response;
+    }
+
+    /* Wait for the write-in-progress bit to be cleared.*/
+    response = spi_flash_wait_while_busy();
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to check WIP flag! [spi flash erase sector]\n");
+        return response;
+    }
+
+    return response;
+}
+
+flash_status_t flash_erase_block(uint32_t addr) {
+    flash_status_t response = FLASH_STATUS_SUCCESS;
+
+    /* Check that the address exceeds the limit. */
+    if ((addr + (EXTERNAL_FLASH_BLOCK_SIZE)) >= (EXTERNAL_FLASH_SIZE) || ((addr % (EXTERNAL_FLASH_BLOCK_SIZE)) != 0)) {
+        dprintf("Flash erase block address over limit! [addr:0x%x]\n", (uint32_t)addr);
+        return FLASH_STATUS_ERROR;
+    }
+
+    /* Wait for the write-in-progress bit to be cleared. */
+    response = spi_flash_wait_while_busy();
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to check WIP flag! [spi flash erase block]\n");
+        return response;
+    }
+
+    /* Enable writes. */
+    response = spi_flash_write_enable();
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to write-enable! [spi flash erase block]\n");
+        return response;
+    }
+
+    /* Erase Block. */
+    response = spi_flash_transaction(FLASH_CMD_BE, addr, NULL, 0);
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to erase block! [spi flash erase block]\n");
+        return response;
+    }
+
+    /* Wait for the write-in-progress bit to be cleared.*/
+    response = spi_flash_wait_while_busy();
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to check WIP flag! [spi flash erase block]\n");
+        return response;
+    }
+
+    return response;
+}
+
+flash_status_t flash_read_block(uint32_t addr, void *buf, size_t len) {
+    flash_status_t response = FLASH_STATUS_SUCCESS;
+    uint8_t *      read_buf = (uint8_t *)buf;
+
+    /* Wait for the write-in-progress bit to be cleared. */
+    response = spi_flash_wait_while_busy();
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to check WIP flag! [spi flash read block]\n");
+        memset(read_buf, 0, len);
+        return response;
+    }
+
+    /* Perform read. */
+    response = spi_flash_transaction(FLASH_CMD_READ, addr, read_buf, len);
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to read block! [spi flash read block]\n");
+        memset(read_buf, 0, len);
+        return response;
+    }
+
+#if defined(CONSOLE_ENABLE) && defined(DEBUG_FLASH_SPI_OUTPUT)
+    dprintf("[SPI FLASH R] 0x%08lX: ", addr);
+    for (size_t i = 0; i < len; ++i) {
+        dprintf(" %02X", (int)(((uint8_t *)read_buf)[i]));
+    }
+    dprintf("\n");
+#endif // DEBUG_FLASH_SPI_OUTPUT
+
+    return response;
+}
+
+flash_status_t flash_write_block(uint32_t addr, const void *buf, size_t len) {
+    flash_status_t response  = FLASH_STATUS_SUCCESS;
+    uint8_t *      write_buf = (uint8_t *)buf;
+
+    while (len > 0) {
+        uint32_t page_offset  = addr % EXTERNAL_FLASH_PAGE_SIZE;
+        size_t   write_length = EXTERNAL_FLASH_PAGE_SIZE - page_offset;
+        if (write_length > len) {
+            write_length = len;
+        }
+
+        /* Wait for the write-in-progress bit to be cleared. */
+        response = spi_flash_wait_while_busy();
+        if (response != FLASH_STATUS_SUCCESS) {
+            dprint("Failed to check WIP flag! [spi flash write block]\n");
+            return response;
+        }
+
+        /* Enable writes. */
+        response = spi_flash_write_enable();
+        if (response != FLASH_STATUS_SUCCESS) {
+            dprint("Failed to write-enable! [spi flash write block]\n");
+            return response;
+        }
+
+#if defined(CONSOLE_ENABLE) && defined(DEBUG_FLASH_SPI_OUTPUT)
+        dprintf("[SPI FLASH W] 0x%08lX: ", addr);
+        for (size_t i = 0; i < write_length; i++) {
+            dprintf(" %02X", (int)(uint8_t)(write_buf[i]));
+        }
+        dprintf("\n");
+#endif // DEBUG_FLASH_SPI_OUTPUT
+
+        /* Perform the write. */
+        response = spi_flash_transaction(FLASH_CMD_PP, addr, write_buf, write_length);
+        if (response != FLASH_STATUS_SUCCESS) {
+            dprint("Failed to write block! [spi flash write block]\n");
+            return response;
+        }
+
+        write_buf += write_length;
+        addr += write_length;
+        len -= write_length;
+    }
+
+    /* Wait for the write-in-progress bit to be cleared. */
+    response = spi_flash_wait_while_busy();
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to check WIP flag! [spi flash write block]\n");
+        return response;
+    }
+
+    /* Disable writes. */
+    response = spi_flash_write_disable();
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to write-disable! [spi flash write block]\n");
+        return response;
+    }
+
+    return response;
+}
diff --git a/drivers/flash/flash_spi.h b/drivers/flash/flash_spi.h
new file mode 100644
index 0000000000..abe95e955e
--- /dev/null
+++ b/drivers/flash/flash_spi.h
@@ -0,0 +1,136 @@
+/*
+Copyright (C) 2021 Westberry Technology (ChangZhou) Corp., Ltd
+
+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
+
+/* All the following default configurations are based on MX25L4006E Nor FLASH. */
+
+/*
+    The slave select pin of the FLASH.
+    This needs to be a normal GPIO pin_t value, such as B14.
+*/
+#ifndef EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN
+#    error "No chip select pin defined -- missing EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN"
+#endif
+
+/*
+    The clock divisor for SPI to ensure that the MCU is within the
+    specifications of the FLASH chip. Generally this will be PCLK divided by
+    the intended divisor -- check your clock settings and the datasheet of
+    your FLASH.
+*/
+#ifndef EXTERNAL_FLASH_SPI_CLOCK_DIVISOR
+#    ifdef __AVR__
+#        define EXTERNAL_FLASH_SPI_CLOCK_DIVISOR 4
+#    else
+#        define EXTERNAL_FLASH_SPI_CLOCK_DIVISOR 8
+#    endif
+#endif
+
+/*
+    The SPI mode to communicate with the FLASH.
+*/
+#ifndef EXTERNAL_FLASH_SPI_MODE
+#    define EXTERNAL_FLASH_SPI_MODE 0
+#endif
+
+/*
+    Whether or not the SPI communication between the MCU and FLASH should be
+    LSB-first.
+*/
+#ifndef EXTERNAL_FLASH_SPI_LSBFIRST
+#    define EXTERNAL_FLASH_SPI_LSBFIRST false
+#endif
+
+/*
+    The Flash address size in bytes, as specified in datasheet.
+*/
+#ifndef EXTERNAL_FLASH_ADDRESS_SIZE
+#    define EXTERNAL_FLASH_ADDRESS_SIZE 3
+#endif
+
+/*
+    The page size of the FLASH in bytes, as specified in the datasheet.
+*/
+#ifndef EXTERNAL_FLASH_PAGE_SIZE
+#    define EXTERNAL_FLASH_PAGE_SIZE 256
+#endif
+
+/*
+    The sector size of the FLASH in bytes, as specified in the datasheet.
+*/
+#ifndef EXTERNAL_FLASH_SECTOR_SIZE
+#    define EXTERNAL_FLASH_SECTOR_SIZE (4 * 1024)
+#endif
+
+/*
+    The block size of the FLASH in bytes, as specified in the datasheet.
+*/
+#ifndef EXTERNAL_FLASH_BLOCK_SIZE
+#    define EXTERNAL_FLASH_BLOCK_SIZE (64 * 1024)
+#endif
+
+/*
+    The total size of the FLASH in bytes, as specified in the datasheet.
+*/
+#ifndef EXTERNAL_FLASH_SIZE
+#    define EXTERNAL_FLASH_SIZE (512 * 1024)
+#endif
+
+/*
+    The block count of the FLASH, calculated by total FLASH size and block size.
+*/
+#define EXTERNAL_FLASH_BLOCK_COUNT ((EXTERNAL_FLASH_SIZE) / (EXTERNAL_FLASH_BLOCK_SIZE))
+
+/*
+    The sector count of the FLASH, calculated by total FLASH size and sector size.
+*/
+#define EXTERNAL_FLASH_SECTOR_COUNT ((EXTERNAL_FLASH_SIZE) / (EXTERNAL_FLASH_SECTOR_SIZE))
+
+/*
+    The page count of the FLASH, calculated by total FLASH size and page size.
+*/
+#define EXTERNAL_FLASH_PAGE_COUNT ((EXTERNAL_FLASH_SIZE) / (EXTERNAL_FLASH_PAGE_SIZE))
+
+typedef int16_t flash_status_t;
+
+#define FLASH_STATUS_SUCCESS (0)
+#define FLASH_STATUS_ERROR (-1)
+#define FLASH_STATUS_TIMEOUT (-2)
+#define FLASH_STATUS_BAD_ADDRESS (-3)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+
+void flash_init(void);
+
+flash_status_t flash_erase_chip(void);
+
+flash_status_t flash_erase_block(uint32_t addr);
+
+flash_status_t flash_erase_sector(uint32_t addr);
+
+flash_status_t flash_read_block(uint32_t addr, void *buf, size_t len);
+
+flash_status_t flash_write_block(uint32_t addr, const void *buf, size_t len);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/keyboards/viktus/sp111/mcp23018.c b/drivers/gpio/mcp23018.c
similarity index 69%
rename from keyboards/viktus/sp111/mcp23018.c
rename to drivers/gpio/mcp23018.c
index f1d8e568d2..41cbfe087e 100644
--- a/keyboards/viktus/sp111/mcp23018.c
+++ b/drivers/gpio/mcp23018.c
@@ -1,18 +1,6 @@
-/* Copyright 2020 zvecr<git@zvecr.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2022 zvecr<git@zvecr.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include "mcp23018.h"
 #include "i2c_master.h"
 #include "wait.h"
@@ -22,11 +10,11 @@
 #define TIMEOUT 100
 
 enum {
-    CMD_IODIRA = 0x00,  // i/o direction register
+    CMD_IODIRA = 0x00, // i/o direction register
     CMD_IODIRB = 0x01,
-    CMD_GPPUA  = 0x0C,  // GPIO pull-up resistor register
+    CMD_GPPUA  = 0x0C, // GPIO pull-up resistor register
     CMD_GPPUB  = 0x0D,
-    CMD_GPIOA  = 0x12,  // general purpose i/o port register (write modifies OLAT)
+    CMD_GPIOA  = 0x12, // general purpose i/o port register (write modifies OLAT)
     CMD_GPIOB  = 0x13,
 };
 
@@ -40,7 +28,7 @@ void mcp23018_init(uint8_t addr) {
     }
 }
 
-bool mcp23018_set_config(uint8_t slave_addr, uint8_t port, uint8_t conf) {
+bool mcp23018_set_config(uint8_t slave_addr, mcp23018_port_t port, uint8_t conf) {
     uint8_t addr         = SLAVE_TO_ADDR(slave_addr);
     uint8_t cmdDirection = port ? CMD_IODIRB : CMD_IODIRA;
     uint8_t cmdPullup    = port ? CMD_GPPUB : CMD_GPPUA;
@@ -60,7 +48,7 @@ bool mcp23018_set_config(uint8_t slave_addr, uint8_t port, uint8_t conf) {
     return true;
 }
 
-bool mcp23018_set_output(uint8_t slave_addr, uint8_t port, uint8_t conf) {
+bool mcp23018_set_output(uint8_t slave_addr, mcp23018_port_t port, uint8_t conf) {
     uint8_t addr = SLAVE_TO_ADDR(slave_addr);
     uint8_t cmd  = port ? CMD_GPIOB : CMD_GPIOA;
 
@@ -86,7 +74,7 @@ bool mcp23018_set_output_all(uint8_t slave_addr, uint8_t confA, uint8_t confB) {
     return true;
 }
 
-bool mcp23018_readPins(uint8_t slave_addr, uint8_t port, uint8_t* out) {
+bool mcp23018_readPins(uint8_t slave_addr, mcp23018_port_t port, uint8_t* out) {
     uint8_t addr = SLAVE_TO_ADDR(slave_addr);
     uint8_t cmd  = port ? CMD_GPIOB : CMD_GPIOA;
 
diff --git a/drivers/gpio/mcp23018.h b/drivers/gpio/mcp23018.h
new file mode 100644
index 0000000000..e7c2730dd1
--- /dev/null
+++ b/drivers/gpio/mcp23018.h
@@ -0,0 +1,65 @@
+// Copyright 2022 zvecr<git@zvecr.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+
+/**
+ * Port ID
+ */
+typedef enum {
+    mcp23018_PORTA,
+    mcp23018_PORTB,
+} mcp23018_port_t;
+
+/**
+ * Helpers for set_config
+ */
+enum {
+    ALL_OUTPUT = 0,
+    ALL_INPUT  = 0xFF,
+};
+
+/**
+ * Helpers for set_output
+ */
+enum {
+    ALL_LOW  = 0,
+    ALL_HIGH = 0xFF,
+};
+
+/**
+ * Init expander and any other dependent drivers
+ */
+void mcp23018_init(uint8_t slave_addr);
+
+/**
+ * Configure input/output to a given port
+ */
+bool mcp23018_set_config(uint8_t slave_addr, mcp23018_port_t port, uint8_t conf);
+
+/**
+ * Write high/low to a given port
+ */
+bool mcp23018_set_output(uint8_t slave_addr, mcp23018_port_t port, uint8_t conf);
+
+/**
+ * Write high/low to both ports sequentially
+ *
+ *  - slightly faster than multiple set_output
+ */
+bool mcp23018_set_output_all(uint8_t slave_addr, uint8_t confA, uint8_t confB);
+
+/**
+ * Read state of a given port
+ */
+bool mcp23018_readPins(uint8_t slave_addr, mcp23018_port_t port, uint8_t* ret);
+
+/**
+ * Read state of both ports sequentially
+ *
+ *  - slightly faster than multiple readPins
+ */
+bool mcp23018_readPins_all(uint8_t slave_addr, uint16_t* ret);
diff --git a/drivers/gpio/pca9555.c b/drivers/gpio/pca9555.c
index 02b5abbdde..adcd040083 100644
--- a/drivers/gpio/pca9555.c
+++ b/drivers/gpio/pca9555.c
@@ -1,18 +1,6 @@
-/* Copyright 2019
- *
- * 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/>.
- */
+// Copyright 2020 zvecr<git@zvecr.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include "i2c_master.h"
 #include "pca9555.h"
 
@@ -45,39 +33,59 @@ void pca9555_init(uint8_t slave_addr) {
     // i2c_stop();
 }
 
-void pca9555_set_config(uint8_t slave_addr, uint8_t port, uint8_t conf) {
+bool pca9555_set_config(uint8_t slave_addr, pca9555_port_t port, uint8_t conf) {
     uint8_t addr = SLAVE_TO_ADDR(slave_addr);
     uint8_t cmd  = port ? CMD_CONFIG_1 : CMD_CONFIG_0;
 
     i2c_status_t ret = i2c_writeReg(addr, cmd, &conf, sizeof(conf), TIMEOUT);
     if (ret != I2C_STATUS_SUCCESS) {
         print("pca9555_set_config::FAILED\n");
+        return false;
     }
+
+    return true;
 }
 
-void pca9555_set_output(uint8_t slave_addr, uint8_t port, uint8_t conf) {
+bool pca9555_set_output(uint8_t slave_addr, pca9555_port_t port, uint8_t conf) {
     uint8_t addr = SLAVE_TO_ADDR(slave_addr);
     uint8_t cmd  = port ? CMD_OUTPUT_1 : CMD_OUTPUT_0;
 
     i2c_status_t ret = i2c_writeReg(addr, cmd, &conf, sizeof(conf), TIMEOUT);
     if (ret != I2C_STATUS_SUCCESS) {
         print("pca9555_set_output::FAILED\n");
+        return false;
     }
+
+    return true;
 }
 
-uint8_t pca9555_readPins(uint8_t slave_addr, uint8_t port) {
+bool pca9555_set_output_all(uint8_t slave_addr, uint8_t confA, uint8_t confB) {
+    uint8_t addr    = SLAVE_TO_ADDR(slave_addr);
+    uint8_t conf[2] = {confA, confB};
+
+    i2c_status_t ret = i2c_writeReg(addr, CMD_OUTPUT_0, &conf[0], sizeof(conf), TIMEOUT);
+    if (ret != I2C_STATUS_SUCCESS) {
+        dprintf("pca9555_set_output::FAILED::%u\n", ret);
+        return false;
+    }
+
+    return true;
+}
+
+bool pca9555_readPins(uint8_t slave_addr, pca9555_port_t port, uint8_t* out) {
     uint8_t addr = SLAVE_TO_ADDR(slave_addr);
     uint8_t cmd  = port ? CMD_INPUT_1 : CMD_INPUT_0;
 
-    uint8_t      data = 0;
-    i2c_status_t ret  = i2c_readReg(addr, cmd, &data, sizeof(data), TIMEOUT);
+    i2c_status_t ret = i2c_readReg(addr, cmd, out, sizeof(uint8_t), TIMEOUT);
     if (ret != I2C_STATUS_SUCCESS) {
         print("pca9555_readPins::FAILED\n");
+        return false;
     }
-    return data;
+
+    return true;
 }
 
-uint16_t pca9555_readAllPins(uint8_t slave_addr) {
+bool pca9555_readPins_all(uint8_t slave_addr, uint16_t* out) {
     uint8_t addr = SLAVE_TO_ADDR(slave_addr);
 
     typedef union {
@@ -85,11 +93,14 @@ uint16_t pca9555_readAllPins(uint8_t slave_addr) {
         uint16_t u16;
     } data16;
 
-    data16 data;
+    data16 data = {.u16 = 0};
 
     i2c_status_t ret = i2c_readReg(addr, CMD_INPUT_0, &data.u8[0], sizeof(data), TIMEOUT);
     if (ret != I2C_STATUS_SUCCESS) {
-        print("pca9555_readAllPins::FAILED\n");
+        print("pca9555_readPins_all::FAILED\n");
+        return false;
     }
-    return data.u16;
+
+    *out = data.u16;
+    return true;
 }
diff --git a/drivers/gpio/pca9555.h b/drivers/gpio/pca9555.h
index 3341ec3eb5..6362ab68ae 100644
--- a/drivers/gpio/pca9555.h
+++ b/drivers/gpio/pca9555.h
@@ -1,20 +1,11 @@
-/* Copyright 2019
- *
- * 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/>.
- */
+// Copyright 2020 zvecr<git@zvecr.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #pragma once
 
+#include <stdint.h>
+#include <stdbool.h>
+
 /*
             PCA9555
          ,----------.
@@ -38,20 +29,60 @@
          `----------'
 */
 
-#define PCA9555_PORT0 0
-#define PCA9555_PORT1 1
+/**
+ * Port ID
+ */
+typedef enum {
+    PCA9555_PORT0,
+    PCA9555_PORT1,
+} pca9555_port_t;
 
-#define ALL_OUTPUT 0
-#define ALL_INPUT 0xFF
-#define ALL_LOW 0
-#define ALL_HIGH 0xFF
+/**
+ * Helpers for set_config
+ */
+enum {
+    ALL_OUTPUT = 0,
+    ALL_INPUT  = 0xFF,
+};
 
+/**
+ * Helpers for set_output
+ */
+enum {
+    ALL_LOW  = 0,
+    ALL_HIGH = 0xFF,
+};
+
+/**
+ * Init expander and any other dependent drivers
+ */
 void pca9555_init(uint8_t slave_addr);
 
-void pca9555_set_config(uint8_t slave_addr, uint8_t port, uint8_t conf);
+/**
+ * Configure input/output to a given port
+ */
+bool pca9555_set_config(uint8_t slave_addr, pca9555_port_t port, uint8_t conf);
 
-void pca9555_set_output(uint8_t slave_addr, uint8_t port, uint8_t conf);
+/**
+ * Write high/low to a given port
+ */
+bool pca9555_set_output(uint8_t slave_addr, pca9555_port_t port, uint8_t conf);
 
-uint8_t pca9555_readPins(uint8_t slave_addr, uint8_t port);
+/**
+ * Write high/low to both ports sequentially
+ *
+ *  - slightly faster than multiple set_output
+ */
+bool pca9555_set_output_all(uint8_t slave_addr, uint8_t confA, uint8_t confB);
 
-uint16_t pca9555_readAllPins(uint8_t slave_addr);
+/**
+ * Read state of a given port
+ */
+bool pca9555_readPins(uint8_t slave_addr, pca9555_port_t port, uint8_t* ret);
+
+/**
+ * Read state of both ports sequentially
+ *
+ *  - slightly faster than multiple readPins
+ */
+bool pca9555_readPins_all(uint8_t slave_addr, uint16_t* ret);
diff --git a/drivers/gpio/sn74x138.c b/drivers/gpio/sn74x138.c
new file mode 100644
index 0000000000..222e5db56c
--- /dev/null
+++ b/drivers/gpio/sn74x138.c
@@ -0,0 +1,65 @@
+/* Copyright 2022
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "sn74x138.h"
+#include "gpio.h"
+
+#define ADDRESS_PIN_COUNT 3
+
+#ifndef SN74X138_ADDRESS_PINS
+#    error sn74x138: no address pins defined!
+#endif
+
+static const pin_t address_pins[ADDRESS_PIN_COUNT] = SN74X138_ADDRESS_PINS;
+
+void sn74x138_init(void) {
+    for (int i = 0; i < ADDRESS_PIN_COUNT; i++) {
+        setPinOutput(address_pins[i]);
+        writePinLow(address_pins[i]);
+    }
+
+#if defined(SN74X138_E1_PIN)
+    setPinOutput(SN74X138_E1_PIN);
+    writePinHigh(SN74X138_E1_PIN);
+#endif
+
+#if defined(SN74X138_E2_PIN)
+    setPinOutput(SN74X138_E2_PIN);
+    writePinHigh(SN74X138_E2_PIN);
+#endif
+#if defined(SN74X138_E3_PIN)
+    setPinOutput(SN74X138_E3_PIN);
+    writePinLow(SN74X138_E3_PIN);
+#endif
+}
+
+void sn74x138_set_enabled(bool enabled) {
+#if defined(SN74X138_E1_PIN)
+    writePin(SN74X138_E1_PIN, !enabled);
+#endif
+#if defined(SN74X138_E2_PIN)
+    writePin(SN74X138_E2_PIN, !enabled);
+#endif
+#if defined(SN74X138_E3_PIN)
+    writePin(SN74X138_E3_PIN, enabled);
+#endif
+}
+
+void sn74x138_set_addr(uint8_t address) {
+    for (int i = 0; i < ADDRESS_PIN_COUNT; i++) {
+        writePin(address_pins[i], address & (1 << i));
+    }
+}
diff --git a/drivers/gpio/sn74x138.h b/drivers/gpio/sn74x138.h
new file mode 100644
index 0000000000..6f1f20e618
--- /dev/null
+++ b/drivers/gpio/sn74x138.h
@@ -0,0 +1,48 @@
+/* Copyright 2022
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+
+/**
+ * Driver for 74x138 3-to-8 decoder/demultiplexer with inverting outputs
+ * https://assets.nexperia.com/documents/data-sheet/74HC_HCT138.pdf
+ */
+
+/**
+ * Initialize the address and output enable pins.
+ */
+void sn74x138_init(void);
+
+/**
+ * Set the enabled state.
+ *
+ * When enabled is true, pulls the E1 and E2 pins low, and the E3 pin high.
+ *
+ * \param enabled The enable state to set.
+ */
+void sn74x138_set_enabled(bool enabled);
+
+/**
+ * Set the output pin address.
+ *
+ * The selected output pin will be pulled low, while the remaining output pins will be high.
+ *
+ * \param address The address to set, from 0 to 7.
+ */
+void sn74x138_set_addr(uint8_t address);
diff --git a/drivers/haptic/DRV2605L.c b/drivers/haptic/DRV2605L.c
index 5de2b354c9..5a1d2ca0af 100644
--- a/drivers/haptic/DRV2605L.c
+++ b/drivers/haptic/DRV2605L.c
@@ -106,12 +106,14 @@ void DRV_init(void) {
 
 void DRV_rtp_init(void) {
     DRV_write(DRV_GO, 0x00);
-    DRV_write(DRV_RTP_INPUT, 20);  // 20 is the lowest value I've found where haptics can still be felt.
+    DRV_write(DRV_RTP_INPUT, 20); // 20 is the lowest value I've found where haptics can still be felt.
     DRV_write(DRV_MODE, 0x05);
     DRV_write(DRV_GO, 0x01);
 }
 
-void DRV_amplitude(uint8_t amplitude) { DRV_write(DRV_RTP_INPUT, amplitude); }
+void DRV_amplitude(uint8_t amplitude) {
+    DRV_write(DRV_RTP_INPUT, amplitude);
+}
 
 void DRV_pulse(uint8_t sequence) {
     DRV_write(DRV_GO, 0x00);
diff --git a/drivers/haptic/solenoid.c b/drivers/haptic/solenoid.c
index 7a09940f78..14d868bffe 100644
--- a/drivers/haptic/solenoid.c
+++ b/drivers/haptic/solenoid.c
@@ -28,13 +28,21 @@ uint8_t  solenoid_dwell   = SOLENOID_DEFAULT_DWELL;
 
 extern haptic_config_t haptic_config;
 
-void solenoid_buzz_on(void) { haptic_set_buzz(1); }
+void solenoid_buzz_on(void) {
+    haptic_set_buzz(1);
+}
 
-void solenoid_buzz_off(void) { haptic_set_buzz(0); }
+void solenoid_buzz_off(void) {
+    haptic_set_buzz(0);
+}
 
-void solenoid_set_buzz(int buzz) { haptic_set_buzz(buzz); }
+void solenoid_set_buzz(int buzz) {
+    haptic_set_buzz(buzz);
+}
 
-void solenoid_set_dwell(uint8_t dwell) { solenoid_dwell = dwell; }
+void solenoid_set_dwell(uint8_t dwell) {
+    solenoid_dwell = dwell;
+}
 
 void solenoid_stop(void) {
     SOLENOID_PIN_WRITE_INACTIVE();
@@ -89,4 +97,6 @@ void solenoid_setup(void) {
     }
 }
 
-void solenoid_shutdown(void) { SOLENOID_PIN_WRITE_INACTIVE(); }
+void solenoid_shutdown(void) {
+    SOLENOID_PIN_WRITE_INACTIVE();
+}
diff --git a/drivers/lcd/st7565.c b/drivers/lcd/st7565.c
index 49b13c00f1..47ee02804b 100644
--- a/drivers/lcd/st7565.c
+++ b/drivers/lcd/st7565.c
@@ -39,7 +39,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Addressing Setting Commands
 #define PAM_SETCOLUMN_LSB 0x00
 #define PAM_SETCOLUMN_MSB 0x10
-#define PAM_PAGE_ADDR 0xB0  // 0xb0 -- 0xb7
+#define PAM_PAGE_ADDR 0xB0 // 0xb0 -- 0xb7
 
 // Hardware Configuration Commands
 #define DISPLAY_START_LINE 0x40
@@ -138,7 +138,9 @@ bool st7565_init(display_rotation_t rotation) {
     return true;
 }
 
-__attribute__((weak)) display_rotation_t st7565_init_user(display_rotation_t rotation) { return rotation; }
+__attribute__((weak)) display_rotation_t st7565_init_user(display_rotation_t rotation) {
+    return rotation;
+}
 
 void st7565_clear(void) {
     memset(st7565_buffer, 0, sizeof(st7565_buffer));
@@ -212,7 +214,8 @@ void st7565_advance_page(bool clearPageRemainder) {
         remaining = remaining / ST7565_FONT_WIDTH;
 
         // Write empty character until next line
-        while (remaining--) st7565_write_char(' ', false);
+        while (remaining--)
+            st7565_write_char(' ', false);
     } else {
         // Next page index out of bounds?
         if (index + remaining >= ST7565_MATRIX_SIZE) {
@@ -263,7 +266,7 @@ void st7565_write_char(const char data, bool invert) {
     _Static_assert(sizeof(font) >= ((ST7565_FONT_END + 1 - ST7565_FONT_START) * ST7565_FONT_WIDTH), "ST7565_FONT_END references outside array");
 
     // set the reder buffer data
-    uint8_t cast_data = (uint8_t)data;  // font based on unsigned type for index
+    uint8_t cast_data = (uint8_t)data; // font based on unsigned type for index
     if (cast_data < ST7565_FONT_START || cast_data > ST7565_FONT_END) {
         memset(st7565_cursor, 0x00, ST7565_FONT_WIDTH);
     } else {
@@ -389,7 +392,7 @@ void st7565_write_raw_P(const char *data, uint16_t size) {
         st7565_dirty |= ((ST7565_BLOCK_TYPE)1 << (i / ST7565_BLOCK_SIZE));
     }
 }
-#endif  // defined(__AVR__)
+#endif // defined(__AVR__)
 
 bool st7565_on(void) {
     if (!st7565_initialized) {
@@ -429,7 +432,9 @@ bool st7565_off(void) {
 
 __attribute__((weak)) void st7565_off_user(void) {}
 
-bool st7565_is_on(void) { return st7565_active; }
+bool st7565_is_on(void) {
+    return st7565_active;
+}
 
 bool st7565_invert(bool invert) {
     if (!st7565_initialized) {
@@ -445,9 +450,13 @@ bool st7565_invert(bool invert) {
     return st7565_inverted;
 }
 
-uint8_t st7565_max_chars(void) { return ST7565_DISPLAY_WIDTH / ST7565_FONT_WIDTH; }
+uint8_t st7565_max_chars(void) {
+    return ST7565_DISPLAY_WIDTH / ST7565_FONT_WIDTH;
+}
 
-uint8_t st7565_max_lines(void) { return ST7565_DISPLAY_HEIGHT / ST7565_FONT_HEIGHT; }
+uint8_t st7565_max_lines(void) {
+    return ST7565_DISPLAY_HEIGHT / ST7565_FONT_HEIGHT;
+}
 
 void st7565_task(void) {
     if (!st7565_initialized) {
diff --git a/drivers/lcd/st7565.h b/drivers/lcd/st7565.h
index d453dbe6da..0e42c8765b 100644
--- a/drivers/lcd/st7565.h
+++ b/drivers/lcd/st7565.h
@@ -29,16 +29,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define ST7565_DISPLAY_HEIGHT 32
 #endif
 #ifndef ST7565_MATRIX_SIZE
-#    define ST7565_MATRIX_SIZE (ST7565_DISPLAY_HEIGHT / 8 * ST7565_DISPLAY_WIDTH)  // 1024 (compile time mathed)
+#    define ST7565_MATRIX_SIZE (ST7565_DISPLAY_HEIGHT / 8 * ST7565_DISPLAY_WIDTH) // 1024 (compile time mathed)
 #endif
 #ifndef ST7565_BLOCK_TYPE
 #    define ST7565_BLOCK_TYPE uint16_t
 #endif
 #ifndef ST7565_BLOCK_COUNT
-#    define ST7565_BLOCK_COUNT (sizeof(ST7565_BLOCK_TYPE) * 8)  // 32 (compile time mathed)
+#    define ST7565_BLOCK_COUNT (sizeof(ST7565_BLOCK_TYPE) * 8) // 32 (compile time mathed)
 #endif
 #ifndef ST7565_BLOCK_SIZE
-#    define ST7565_BLOCK_SIZE (ST7565_MATRIX_SIZE / ST7565_BLOCK_COUNT)  // 32 (compile time mathed)
+#    define ST7565_BLOCK_SIZE (ST7565_MATRIX_SIZE / ST7565_BLOCK_COUNT) // 32 (compile time mathed)
 #endif
 
 // the column address corresponding to the first column in the display hardware
@@ -174,7 +174,7 @@ void st7565_write_raw_P(const char *data, uint16_t size);
 #    define st7565_write_P(data, invert) st7565_write(data, invert)
 #    define st7565_write_ln_P(data, invert) st7565_write_ln(data, invert)
 #    define st7565_write_raw_P(data, size) st7565_write_raw(data, size)
-#endif  // defined(__AVR__)
+#endif // defined(__AVR__)
 
 // Can be used to manually turn on the screen if it is off
 // Returns true if the screen was on or turns on
diff --git a/drivers/led/apa102.c b/drivers/led/apa102.c
index 00e7eb4505..f291948975 100644
--- a/drivers/led/apa102.c
+++ b/drivers/led/apa102.c
@@ -20,15 +20,15 @@
 
 #ifndef APA102_NOPS
 #    if defined(__AVR__)
-#        define APA102_NOPS 0  // AVR at 16 MHz already spends 62.5 ns per clock, so no extra delay is needed
+#        define APA102_NOPS 0 // AVR at 16 MHz already spends 62.5 ns per clock, so no extra delay is needed
 #    elif defined(PROTOCOL_CHIBIOS)
 
 #        include "hal.h"
 #        if defined(STM32F0XX) || defined(STM32F1XX) || defined(STM32F3XX) || defined(STM32F4XX) || defined(STM32L0XX) || defined(GD32VF103)
-#            define APA102_NOPS (100 / (1000000000L / (CPU_CLOCK / 4)))  // This calculates how many loops of 4 nops to run to delay 100 ns
+#            define APA102_NOPS (100 / (1000000000L / (CPU_CLOCK / 4))) // This calculates how many loops of 4 nops to run to delay 100 ns
 #        else
 #            error("APA102_NOPS configuration required")
-#            define APA102_NOPS 0  // this just pleases the compile so the above error is easier to spot
+#            define APA102_NOPS 0 // this just pleases the compile so the above error is easier to spot
 #        endif
 #    endif
 #endif
@@ -72,7 +72,9 @@ void apa102_setleds(LED_TYPE *start_led, uint16_t num_leds) {
 }
 
 // Overwrite the default rgblight_call_driver to use apa102 driver
-void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds) { apa102_setleds(start_led, num_leds); }
+void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds) {
+    apa102_setleds(start_led, num_leds);
+}
 
 void static apa102_init(void) {
     setPinOutput(RGB_DI_PIN);
diff --git a/drivers/led/aw20216.c b/drivers/led/aw20216.c
index 2c7ff8f088..59389cdcd6 100644
--- a/drivers/led/aw20216.c
+++ b/drivers/led/aw20216.c
@@ -23,17 +23,17 @@
  */
 #define AWINIC_ID 0b1010 << 4
 
-#define AW_PAGE_FUNCTION 0x00 << 1    // PG0, Function registers
-#define AW_PAGE_PWM 0x01 << 1         // PG1, LED PWM control
-#define AW_PAGE_SCALING 0x02 << 1     // PG2, LED current scaling control
-#define AW_PAGE_PATCHOICE 0x03 << 1   // PG3, Pattern choice?
-#define AW_PAGE_PWMSCALING 0x04 << 1  // PG4, LED PWM + Scaling control?
+#define AW_PAGE_FUNCTION 0x00 << 1   // PG0, Function registers
+#define AW_PAGE_PWM 0x01 << 1        // PG1, LED PWM control
+#define AW_PAGE_SCALING 0x02 << 1    // PG2, LED current scaling control
+#define AW_PAGE_PATCHOICE 0x03 << 1  // PG3, Pattern choice?
+#define AW_PAGE_PWMSCALING 0x04 << 1 // PG4, LED PWM + Scaling control?
 
 #define AW_WRITE 0
 #define AW_READ 1
 
-#define AW_REG_CONFIGURATION 0x00  // PG0
-#define AW_REG_GLOBALCURRENT 0x01  // PG0
+#define AW_REG_CONFIGURATION 0x00 // PG0
+#define AW_REG_GLOBALCURRENT 0x01 // PG0
 
 // Default value of AW_REG_CONFIGURATION
 // D7:D4 = 1011, SWSEL (SW1~SW12 active)
diff --git a/drivers/led/issi/is31fl3731-simple.c b/drivers/led/issi/is31fl3731-simple.c
index f51e2e38af..3abe9ea337 100644
--- a/drivers/led/issi/is31fl3731-simple.c
+++ b/drivers/led/issi/is31fl3731-simple.c
@@ -42,13 +42,13 @@
 #define ISSI_REG_PICTUREFRAME 0x01
 
 // Not defined in the datasheet -- See AN for IC
-#define ISSI_REG_GHOST_IMAGE_PREVENTION 0xC2  // Set bit 4 to enable de-ghosting
+#define ISSI_REG_GHOST_IMAGE_PREVENTION 0xC2 // Set bit 4 to enable de-ghosting
 
 #define ISSI_REG_SHUTDOWN 0x0A
 #define ISSI_REG_AUDIOSYNC 0x06
 
 #define ISSI_COMMANDREGISTER 0xFD
-#define ISSI_BANK_FUNCTIONREG 0x0B  // helpfully called 'page nine'
+#define ISSI_BANK_FUNCTIONREG 0x0B // helpfully called 'page nine'
 
 #ifndef ISSI_TIMEOUT
 #    define ISSI_TIMEOUT 100
@@ -148,7 +148,7 @@ void IS31FL3731_init(uint8_t addr) {
 
     // enable software shutdown
     IS31FL3731_write_register(addr, ISSI_REG_SHUTDOWN, 0x00);
-#ifdef ISSI_3731_DEGHOST  // set to enable de-ghosting of the array
+#ifdef ISSI_3731_DEGHOST // set to enable de-ghosting of the array
     IS31FL3731_write_register(addr, ISSI_REG_GHOST_IMAGE_PREVENTION, 0x10);
 #endif
 
diff --git a/drivers/led/issi/is31fl3731.c b/drivers/led/issi/is31fl3731.c
index e6190a6b90..9c6c29f081 100644
--- a/drivers/led/issi/is31fl3731.c
+++ b/drivers/led/issi/is31fl3731.c
@@ -41,13 +41,13 @@
 #define ISSI_REG_PICTUREFRAME 0x01
 
 // Not defined in the datasheet -- See AN for IC
-#define ISSI_REG_GHOST_IMAGE_PREVENTION 0xC2  // Set bit 4 to enable de-ghosting
+#define ISSI_REG_GHOST_IMAGE_PREVENTION 0xC2 // Set bit 4 to enable de-ghosting
 
 #define ISSI_REG_SHUTDOWN 0x0A
 #define ISSI_REG_AUDIOSYNC 0x06
 
 #define ISSI_COMMANDREGISTER 0xFD
-#define ISSI_BANK_FUNCTIONREG 0x0B  // helpfully called 'page nine'
+#define ISSI_BANK_FUNCTIONREG 0x0B // helpfully called 'page nine'
 
 #ifndef ISSI_TIMEOUT
 #    define ISSI_TIMEOUT 100
@@ -136,7 +136,7 @@ void IS31FL3731_init(uint8_t addr) {
 
     // enable software shutdown
     IS31FL3731_write_register(addr, ISSI_REG_SHUTDOWN, 0x00);
-#ifdef ISSI_3731_DEGHOST  // set to enable de-ghosting of the array
+#ifdef ISSI_3731_DEGHOST // set to enable de-ghosting of the array
     IS31FL3731_write_register(addr, ISSI_REG_GHOST_IMAGE_PREVENTION, 0x10);
 #endif
 
diff --git a/drivers/led/issi/is31fl3733-simple.c b/drivers/led/issi/is31fl3733-simple.c
index 777895bf89..af006f756d 100644
--- a/drivers/led/issi/is31fl3733-simple.c
+++ b/drivers/led/issi/is31fl3733-simple.c
@@ -39,16 +39,16 @@
 #define ISSI_INTERRUPTMASKREGISTER 0xF0
 #define ISSI_INTERRUPTSTATUSREGISTER 0xF1
 
-#define ISSI_PAGE_LEDCONTROL 0x00  // PG0
-#define ISSI_PAGE_PWM 0x01         // PG1
-#define ISSI_PAGE_AUTOBREATH 0x02  // PG2
-#define ISSI_PAGE_FUNCTION 0x03    // PG3
+#define ISSI_PAGE_LEDCONTROL 0x00 // PG0
+#define ISSI_PAGE_PWM 0x01        // PG1
+#define ISSI_PAGE_AUTOBREATH 0x02 // PG2
+#define ISSI_PAGE_FUNCTION 0x03   // PG3
 
-#define ISSI_REG_CONFIGURATION 0x00  // PG3
-#define ISSI_REG_GLOBALCURRENT 0x01  // PG3
-#define ISSI_REG_RESET 0x11          // PG3
-#define ISSI_REG_SWPULLUP 0x0F       // PG3
-#define ISSI_REG_CSPULLUP 0x10       // PG3
+#define ISSI_REG_CONFIGURATION 0x00 // PG3
+#define ISSI_REG_GLOBALCURRENT 0x01 // PG3
+#define ISSI_REG_RESET 0x11         // PG3
+#define ISSI_REG_SWPULLUP 0x0F      // PG3
+#define ISSI_REG_CSPULLUP 0x10      // PG3
 
 #ifndef ISSI_TIMEOUT
 #    define ISSI_TIMEOUT 100
@@ -59,7 +59,7 @@
 #endif
 
 #ifndef ISSI_PWM_FREQUENCY
-#    define ISSI_PWM_FREQUENCY 0b000  // PFS - IS31FL3733B only
+#    define ISSI_PWM_FREQUENCY 0b000 // PFS - IS31FL3733B only
 #endif
 
 #ifndef ISSI_SWPULLUP
diff --git a/drivers/led/issi/is31fl3733-simple.h b/drivers/led/issi/is31fl3733-simple.h
index f071db5e40..f5253e3101 100644
--- a/drivers/led/issi/is31fl3733-simple.h
+++ b/drivers/led/issi/is31fl3733-simple.h
@@ -47,13 +47,13 @@ void IS31FL3733_set_led_control_register(uint8_t index, bool value);
 void IS31FL3733_update_pwm_buffers(uint8_t addr, uint8_t index);
 void IS31FL3733_update_led_control_registers(uint8_t addr, uint8_t index);
 
-#define PUR_0R 0x00    // No PUR resistor
-#define PUR_05KR 0x02  // 0.5k Ohm resistor in t_NOL
-#define PUR_3KR 0x03   // 3.0k Ohm resistor on all the time
-#define PUR_4KR 0x04   // 4.0k Ohm resistor on all the time
-#define PUR_8KR 0x05   // 8.0k Ohm resistor on all the time
-#define PUR_16KR 0x06  // 16k Ohm resistor on all the time
-#define PUR_32KR 0x07  // 32k Ohm resistor in t_NOL
+#define PUR_0R 0x00   // No PUR resistor
+#define PUR_05KR 0x02 // 0.5k Ohm resistor in t_NOL
+#define PUR_3KR 0x03  // 3.0k Ohm resistor on all the time
+#define PUR_4KR 0x04  // 4.0k Ohm resistor on all the time
+#define PUR_8KR 0x05  // 8.0k Ohm resistor on all the time
+#define PUR_16KR 0x06 // 16k Ohm resistor on all the time
+#define PUR_32KR 0x07 // 32k Ohm resistor in t_NOL
 
 #define A_1 0x00
 #define A_2 0x01
diff --git a/drivers/led/issi/is31fl3733.c b/drivers/led/issi/is31fl3733.c
index 696491d070..a2fdaa90fa 100644
--- a/drivers/led/issi/is31fl3733.c
+++ b/drivers/led/issi/is31fl3733.c
@@ -38,16 +38,16 @@
 #define ISSI_INTERRUPTMASKREGISTER 0xF0
 #define ISSI_INTERRUPTSTATUSREGISTER 0xF1
 
-#define ISSI_PAGE_LEDCONTROL 0x00  // PG0
-#define ISSI_PAGE_PWM 0x01         // PG1
-#define ISSI_PAGE_AUTOBREATH 0x02  // PG2
-#define ISSI_PAGE_FUNCTION 0x03    // PG3
+#define ISSI_PAGE_LEDCONTROL 0x00 // PG0
+#define ISSI_PAGE_PWM 0x01        // PG1
+#define ISSI_PAGE_AUTOBREATH 0x02 // PG2
+#define ISSI_PAGE_FUNCTION 0x03   // PG3
 
-#define ISSI_REG_CONFIGURATION 0x00  // PG3
-#define ISSI_REG_GLOBALCURRENT 0x01  // PG3
-#define ISSI_REG_RESET 0x11          // PG3
-#define ISSI_REG_SWPULLUP 0x0F       // PG3
-#define ISSI_REG_CSPULLUP 0x10       // PG3
+#define ISSI_REG_CONFIGURATION 0x00 // PG3
+#define ISSI_REG_GLOBALCURRENT 0x01 // PG3
+#define ISSI_REG_RESET 0x11         // PG3
+#define ISSI_REG_SWPULLUP 0x0F      // PG3
+#define ISSI_REG_CSPULLUP 0x10      // PG3
 
 #ifndef ISSI_TIMEOUT
 #    define ISSI_TIMEOUT 100
@@ -58,7 +58,7 @@
 #endif
 
 #ifndef ISSI_PWM_FREQUENCY
-#    define ISSI_PWM_FREQUENCY 0b000  // PFS - IS31FL3733B only
+#    define ISSI_PWM_FREQUENCY 0b000 // PFS - IS31FL3733B only
 #endif
 
 #ifndef ISSI_SWPULLUP
diff --git a/drivers/led/issi/is31fl3733.h b/drivers/led/issi/is31fl3733.h
index c5d62fed85..7653dd17c0 100644
--- a/drivers/led/issi/is31fl3733.h
+++ b/drivers/led/issi/is31fl3733.h
@@ -48,13 +48,13 @@ void IS31FL3733_set_led_control_register(uint8_t index, bool red, bool green, bo
 void IS31FL3733_update_pwm_buffers(uint8_t addr, uint8_t index);
 void IS31FL3733_update_led_control_registers(uint8_t addr, uint8_t index);
 
-#define PUR_0R 0x00    // No PUR resistor
-#define PUR_05KR 0x02  // 0.5k Ohm resistor in t_NOL
-#define PUR_3KR 0x03   // 3.0k Ohm resistor on all the time
-#define PUR_4KR 0x04   // 4.0k Ohm resistor on all the time
-#define PUR_8KR 0x05   // 8.0k Ohm resistor on all the time
-#define PUR_16KR 0x06  // 16k Ohm resistor on all the time
-#define PUR_32KR 0x07  // 32k Ohm resistor in t_NOL
+#define PUR_0R 0x00   // No PUR resistor
+#define PUR_05KR 0x02 // 0.5k Ohm resistor in t_NOL
+#define PUR_3KR 0x03  // 3.0k Ohm resistor on all the time
+#define PUR_4KR 0x04  // 4.0k Ohm resistor on all the time
+#define PUR_8KR 0x05  // 8.0k Ohm resistor on all the time
+#define PUR_16KR 0x06 // 16k Ohm resistor on all the time
+#define PUR_32KR 0x07 // 32k Ohm resistor in t_NOL
 
 #define A_1 0x00
 #define A_2 0x01
diff --git a/drivers/led/issi/is31fl3736.c b/drivers/led/issi/is31fl3736.c
index c9a871118d..7752a3f6cb 100644
--- a/drivers/led/issi/is31fl3736.c
+++ b/drivers/led/issi/is31fl3736.c
@@ -36,16 +36,16 @@
 #define ISSI_INTERRUPTMASKREGISTER 0xF0
 #define ISSI_INTERRUPTSTATUSREGISTER 0xF1
 
-#define ISSI_PAGE_LEDCONTROL 0x00  // PG0
-#define ISSI_PAGE_PWM 0x01         // PG1
-#define ISSI_PAGE_AUTOBREATH 0x02  // PG2
-#define ISSI_PAGE_FUNCTION 0x03    // PG3
+#define ISSI_PAGE_LEDCONTROL 0x00 // PG0
+#define ISSI_PAGE_PWM 0x01        // PG1
+#define ISSI_PAGE_AUTOBREATH 0x02 // PG2
+#define ISSI_PAGE_FUNCTION 0x03   // PG3
 
-#define ISSI_REG_CONFIGURATION 0x00  // PG3
-#define ISSI_REG_GLOBALCURRENT 0x01  // PG3
-#define ISSI_REG_RESET 0x11          // PG3
-#define ISSI_REG_SWPULLUP 0x0F       // PG3
-#define ISSI_REG_CSPULLUP 0x10       // PG3
+#define ISSI_REG_CONFIGURATION 0x00 // PG3
+#define ISSI_REG_GLOBALCURRENT 0x01 // PG3
+#define ISSI_REG_RESET 0x11         // PG3
+#define ISSI_REG_SWPULLUP 0x0F      // PG3
+#define ISSI_REG_CSPULLUP 0x10      // PG3
 
 #ifndef ISSI_TIMEOUT
 #    define ISSI_TIMEOUT 100
diff --git a/drivers/led/issi/is31fl3736.h b/drivers/led/issi/is31fl3736.h
index 9fbe1cc577..f126034615 100644
--- a/drivers/led/issi/is31fl3736.h
+++ b/drivers/led/issi/is31fl3736.h
@@ -61,14 +61,14 @@ void IS31FL3736_mono_set_led_control_register(uint8_t index, bool enabled);
 void IS31FL3736_update_pwm_buffers(uint8_t addr1, uint8_t addr2);
 void IS31FL3736_update_led_control_registers(uint8_t addr1, uint8_t addr2);
 
-#define PUR_0R 0x00    // No PUR resistor
-#define PUR_05KR 0x01  // 0.5k Ohm resistor
-#define PUR_1KR 0x02   // 1.0k Ohm resistor
-#define PUR_2KR 0x03   // 2.0k Ohm resistor
-#define PUR_4KR 0x04   // 4.0k Ohm resistor
-#define PUR_8KR 0x05   // 8.0k Ohm resistor
-#define PUR_16KR 0x06  // 16k Ohm resistor
-#define PUR_32KR 0x07  // 32k Ohm resistor
+#define PUR_0R 0x00   // No PUR resistor
+#define PUR_05KR 0x01 // 0.5k Ohm resistor
+#define PUR_1KR 0x02  // 1.0k Ohm resistor
+#define PUR_2KR 0x03  // 2.0k Ohm resistor
+#define PUR_4KR 0x04  // 4.0k Ohm resistor
+#define PUR_8KR 0x05  // 8.0k Ohm resistor
+#define PUR_16KR 0x06 // 16k Ohm resistor
+#define PUR_32KR 0x07 // 32k Ohm resistor
 
 #define A_1 0x00
 #define A_2 0x02
diff --git a/drivers/led/issi/is31fl3737.c b/drivers/led/issi/is31fl3737.c
index 0722e18869..9f2a13de45 100644
--- a/drivers/led/issi/is31fl3737.c
+++ b/drivers/led/issi/is31fl3737.c
@@ -38,16 +38,16 @@
 #define ISSI_INTERRUPTMASKREGISTER 0xF0
 #define ISSI_INTERRUPTSTATUSREGISTER 0xF1
 
-#define ISSI_PAGE_LEDCONTROL 0x00  // PG0
-#define ISSI_PAGE_PWM 0x01         // PG1
-#define ISSI_PAGE_AUTOBREATH 0x02  // PG2
-#define ISSI_PAGE_FUNCTION 0x03    // PG3
+#define ISSI_PAGE_LEDCONTROL 0x00 // PG0
+#define ISSI_PAGE_PWM 0x01        // PG1
+#define ISSI_PAGE_AUTOBREATH 0x02 // PG2
+#define ISSI_PAGE_FUNCTION 0x03   // PG3
 
-#define ISSI_REG_CONFIGURATION 0x00  // PG3
-#define ISSI_REG_GLOBALCURRENT 0x01  // PG3
-#define ISSI_REG_RESET 0x11          // PG3
-#define ISSI_REG_SWPULLUP 0x0F       // PG3
-#define ISSI_REG_CSPULLUP 0x10       // PG3
+#define ISSI_REG_CONFIGURATION 0x00 // PG3
+#define ISSI_REG_GLOBALCURRENT 0x01 // PG3
+#define ISSI_REG_RESET 0x11         // PG3
+#define ISSI_REG_SWPULLUP 0x0F      // PG3
+#define ISSI_REG_CSPULLUP 0x10      // PG3
 
 #ifndef ISSI_TIMEOUT
 #    define ISSI_TIMEOUT 100
diff --git a/drivers/led/issi/is31fl3737.h b/drivers/led/issi/is31fl3737.h
index 31b1a22267..ddb70a9df5 100644
--- a/drivers/led/issi/is31fl3737.h
+++ b/drivers/led/issi/is31fl3737.h
@@ -48,14 +48,14 @@ void IS31FL3737_set_led_control_register(uint8_t index, bool red, bool green, bo
 void IS31FL3737_update_pwm_buffers(uint8_t addr1, uint8_t addr2);
 void IS31FL3737_update_led_control_registers(uint8_t addr1, uint8_t addr2);
 
-#define PUR_0R 0x00    // No PUR resistor
-#define PUR_05KR 0x01  // 0.5k Ohm resistor in t_NOL
-#define PUR_1KR 0x02   // 1.0k Ohm resistor in t_NOL
-#define PUR_2KR 0x03   // 2.0k Ohm resistor in t_NOL
-#define PUR_4KR 0x04   // 4.0k Ohm resistor in t_NOL
-#define PUR_8KR 0x05   // 8.0k Ohm resistor in t_NOL
-#define PUR_16KR 0x06  // 16k Ohm resistor in t_NOL
-#define PUR_32KR 0x07  // 32k Ohm resistor in t_NOL
+#define PUR_0R 0x00   // No PUR resistor
+#define PUR_05KR 0x01 // 0.5k Ohm resistor in t_NOL
+#define PUR_1KR 0x02  // 1.0k Ohm resistor in t_NOL
+#define PUR_2KR 0x03  // 2.0k Ohm resistor in t_NOL
+#define PUR_4KR 0x04  // 4.0k Ohm resistor in t_NOL
+#define PUR_8KR 0x05  // 8.0k Ohm resistor in t_NOL
+#define PUR_16KR 0x06 // 16k Ohm resistor in t_NOL
+#define PUR_32KR 0x07 // 32k Ohm resistor in t_NOL
 
 #define A_1 0x00
 #define A_2 0x01
diff --git a/drivers/led/issi/is31fl3741.c b/drivers/led/issi/is31fl3741.c
index 8d347a5e60..393b0179b5 100644
--- a/drivers/led/issi/is31fl3741.c
+++ b/drivers/led/issi/is31fl3741.c
@@ -42,16 +42,16 @@
 #define ISSI_INTERRUPTSTATUSREGISTER 0xF1
 #define ISSI_IDREGISTER 0xFC
 
-#define ISSI_PAGE_PWM0 0x00       // PG0
-#define ISSI_PAGE_PWM1 0x01       // PG1
-#define ISSI_PAGE_SCALING_0 0x02  // PG2
-#define ISSI_PAGE_SCALING_1 0x03  // PG3
-#define ISSI_PAGE_FUNCTION 0x04   // PG4
+#define ISSI_PAGE_PWM0 0x00      // PG0
+#define ISSI_PAGE_PWM1 0x01      // PG1
+#define ISSI_PAGE_SCALING_0 0x02 // PG2
+#define ISSI_PAGE_SCALING_1 0x03 // PG3
+#define ISSI_PAGE_FUNCTION 0x04  // PG4
 
-#define ISSI_REG_CONFIGURATION 0x00  // PG4
-#define ISSI_REG_GLOBALCURRENT 0x01  // PG4
-#define ISSI_REG_PULLDOWNUP 0x02     // PG4
-#define ISSI_REG_RESET 0x3F          // PG4
+#define ISSI_REG_CONFIGURATION 0x00 // PG4
+#define ISSI_REG_GLOBALCURRENT 0x01 // PG4
+#define ISSI_REG_PULLDOWNUP 0x02    // PG4
+#define ISSI_REG_RESET 0x3F         // PG4
 
 #ifndef ISSI_TIMEOUT
 #    define ISSI_TIMEOUT 100
diff --git a/drivers/led/issi/is31fl3741.h b/drivers/led/issi/is31fl3741.h
index 8154f8be70..3bdb23bd2d 100644
--- a/drivers/led/issi/is31fl3741.h
+++ b/drivers/led/issi/is31fl3741.h
@@ -51,14 +51,14 @@ void IS31FL3741_set_scaling_registers(const is31_led *pled, uint8_t red, uint8_t
 
 void IS31FL3741_set_pwm_buffer(const is31_led *pled, uint8_t red, uint8_t green, uint8_t blue);
 
-#define PUR_0R 0x00    // No PUR resistor
-#define PUR_05KR 0x01  // 0.5k Ohm resistor
-#define PUR_1KR 0x02   // 1.0k Ohm resistor
-#define PUR_2KR 0x03   // 2.0k Ohm resistor
-#define PUR_4KR 0x04   // 4.0k Ohm resistor
-#define PUR_8KR 0x05   // 8.0k Ohm resistor
-#define PUR_16KR 0x06  // 16k Ohm resistor
-#define PUR_32KR 0x07  // 32k Ohm resistor
+#define PUR_0R 0x00   // No PUR resistor
+#define PUR_05KR 0x01 // 0.5k Ohm resistor
+#define PUR_1KR 0x02  // 1.0k Ohm resistor
+#define PUR_2KR 0x03  // 2.0k Ohm resistor
+#define PUR_4KR 0x04  // 4.0k Ohm resistor
+#define PUR_8KR 0x05  // 8.0k Ohm resistor
+#define PUR_16KR 0x06 // 16k Ohm resistor
+#define PUR_32KR 0x07 // 32k Ohm resistor
 
 #define CS1_SW1 0x00
 #define CS2_SW1 0x01
diff --git a/drivers/led/issi/is31fl3742.h b/drivers/led/issi/is31fl3742.h
new file mode 100644
index 0000000000..c96f12d0f1
--- /dev/null
+++ b/drivers/led/issi/is31fl3742.h
@@ -0,0 +1,299 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2018 Jack Humbert
+ * Copyright 2018 Yiancar
+ * Copyright 2020 MelGeek
+ * Copyright 2021 MasterSpoon
+ *
+ * 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
+
+// This is a 7-bit address, that gets left-shifted and bit 0
+// set to 0 for write, 1 for read (as per I2C protocol)
+// The address will vary depending on your wiring:
+// 00 <-> GND
+// 01 <-> SCL
+// 10 <-> SDA
+// 11 <-> VCC
+// ADDR represents A1:A0 of the 7-bit address.
+// The result is: 0b01100(ADDR)
+#ifndef DRIVER_ADDR_1
+#    define DRIVER_ADDR_1 0b0110000
+#endif
+
+// Command Registers
+#define ISSI_COMMANDREGISTER_WRITELOCK 0xFE
+#define ISSI_COMMANDREGISTER 0xFD
+#define ISSI_IDREGISTER 0xFC
+#define ISSI_REGISTER_UNLOCK 0xC5
+
+// Response Registers
+#define ISSI_PAGE_PWM 0x00
+#define ISSI_PAGE_SCALING 0x02
+#define ISSI_PAGE_FUNCTION 0x04
+
+// Registers under Function Register
+#define ISSI_REG_CONFIGURATION 0x00
+#define ISSI_REG_GLOBALCURRENT 0x01
+#define ISSI_REG_PULLDOWNUP 0x02
+#define ISSI_REG_SSR 0x41
+#define ISSI_REG_RESET 0x3F
+#define ISSI_REG_PWM_SET 0x36
+
+// Set defaults for Function Registers
+#ifndef ISSI_CONFIGURATION
+#    define ISSI_CONFIGURATION 0x31
+#endif
+#ifndef ISSI_GLOBALCURRENT
+#    define ISSI_GLOBALCURRENT 0xFF
+#endif
+#ifndef ISSI_PULLDOWNUP
+#    define ISSI_PULLDOWNUP 0x55
+#endif
+#ifndef ISSI_PWM_SET
+#    define ISSI_PWM_SET 0x00
+#endif
+
+// Set defaults for Spread Spectrum Register
+#ifndef ISSI_SSR_1
+#    define ISSI_SSR_1 0x00
+#endif
+#ifndef ISSI_SSR_2
+#    define ISSI_SSR_2 0x00
+#endif
+#ifndef ISSI_SSR_3
+#    define ISSI_SSR_3 0x00
+#endif
+#ifndef ISSI_SSR_4
+#    define ISSI_SSR_4 0x00
+#endif
+
+// Set defaults for Scaling registers
+#ifndef ISSI_SCAL_RED
+#    define ISSI_SCAL_RED 0xFF
+#endif
+#ifndef ISSI_SCAL_BLUE
+#    define ISSI_SCAL_BLUE 0xFF
+#endif
+#ifndef ISSI_SCAL_GREEN
+#    define ISSI_SCAL_GREEN 0xFF
+#endif
+#define ISSI_SCAL_RED_OFF 0x00
+#define ISSI_SCAL_GREEN_OFF 0x00
+#define ISSI_SCAL_BLUE_OFF 0x00
+
+#ifndef ISSI_SCAL_LED
+#    define ISSI_SCAL_LED 0xFF
+#endif
+#define ISSI_SCAL_LED_OFF 0x00
+
+// Set buffer sizes
+#define ISSI_MAX_LEDS 180
+#define ISSI_SCALING_SIZE 180
+#define ISSI_PWM_TRF_SIZE 18
+#define ISSI_SCALING_TRF_SIZE 18
+
+// Location of 1st bit for PWM and Scaling registers
+#define ISSI_PWM_REG_1ST 0x00
+#define ISSI_SCL_REG_1ST 0x00
+
+// Map CS SW locations to order in PWM / Scaling buffers
+// This matches the ORDER in the Datasheet Register not the POSITION
+// It will always count from 0x00 to (ISSI_MAX_LEDS - 1)
+#define CS1_SW1 0x00
+#define CS2_SW1 0x01
+#define CS3_SW1 0x02
+#define CS4_SW1 0x03
+#define CS5_SW1 0x04
+#define CS6_SW1 0x05
+#define CS7_SW1 0x06
+#define CS8_SW1 0x07
+#define CS9_SW1 0x08
+#define CS10_SW1 0x09
+#define CS11_SW1 0x0A
+#define CS12_SW1 0x0B
+#define CS13_SW1 0x0C
+#define CS14_SW1 0x0D
+#define CS15_SW1 0x0E
+#define CS16_SW1 0x0F
+#define CS17_SW1 0x10
+#define CS18_SW1 0x11
+#define CS19_SW1 0x12
+#define CS20_SW1 0x13
+#define CS21_SW1 0x14
+#define CS22_SW1 0x15
+#define CS23_SW1 0x16
+#define CS24_SW1 0x17
+#define CS25_SW1 0x18
+#define CS26_SW1 0x19
+#define CS27_SW1 0x1A
+#define CS28_SW1 0x1B
+#define CS29_SW1 0x1C
+#define CS30_SW1 0x1D
+
+#define CS1_SW2 0x1E
+#define CS2_SW2 0x1F
+#define CS3_SW2 0x20
+#define CS4_SW2 0x21
+#define CS5_SW2 0x22
+#define CS6_SW2 0x23
+#define CS7_SW2 0x24
+#define CS8_SW2 0x25
+#define CS9_SW2 0x26
+#define CS10_SW2 0x27
+#define CS11_SW2 0x28
+#define CS12_SW2 0x29
+#define CS13_SW2 0x2A
+#define CS14_SW2 0x2B
+#define CS15_SW2 0x2C
+#define CS16_SW2 0x2D
+#define CS17_SW2 0x2E
+#define CS18_SW2 0x2F
+#define CS19_SW2 0x30
+#define CS20_SW2 0x31
+#define CS21_SW2 0x32
+#define CS22_SW2 0x33
+#define CS23_SW2 0x34
+#define CS24_SW2 0x35
+#define CS25_SW2 0x36
+#define CS26_SW2 0x37
+#define CS27_SW2 0x38
+#define CS28_SW2 0x39
+#define CS29_SW2 0x3A
+#define CS30_SW2 0x3B
+
+#define CS1_SW3 0x3C
+#define CS2_SW3 0x3D
+#define CS3_SW3 0x3E
+#define CS4_SW3 0x3F
+#define CS5_SW3 0x40
+#define CS6_SW3 0x41
+#define CS7_SW3 0x42
+#define CS8_SW3 0x43
+#define CS9_SW3 0x44
+#define CS10_SW3 0x45
+#define CS11_SW3 0x46
+#define CS12_SW3 0x47
+#define CS13_SW3 0x48
+#define CS14_SW3 0x49
+#define CS15_SW3 0x4A
+#define CS16_SW3 0x4B
+#define CS17_SW3 0x4C
+#define CS18_SW3 0x4D
+#define CS19_SW3 0x4E
+#define CS20_SW3 0x4F
+#define CS21_SW3 0x50
+#define CS22_SW3 0x51
+#define CS23_SW3 0x52
+#define CS24_SW3 0x53
+#define CS25_SW3 0x54
+#define CS26_SW3 0x55
+#define CS27_SW3 0x56
+#define CS28_SW3 0x57
+#define CS29_SW3 0x58
+#define CS30_SW3 0x59
+
+#define CS1_SW4 0x5A
+#define CS2_SW4 0x5B
+#define CS3_SW4 0x5C
+#define CS4_SW4 0x5D
+#define CS5_SW4 0x5E
+#define CS6_SW4 0x5F
+#define CS7_SW4 0x60
+#define CS8_SW4 0x61
+#define CS9_SW4 0x62
+#define CS10_SW4 0x63
+#define CS11_SW4 0x64
+#define CS12_SW4 0x65
+#define CS13_SW4 0x66
+#define CS14_SW4 0x67
+#define CS15_SW4 0x68
+#define CS16_SW4 0x69
+#define CS17_SW4 0x6A
+#define CS18_SW4 0x6B
+#define CS19_SW4 0x6C
+#define CS20_SW4 0x6D
+#define CS21_SW4 0x6E
+#define CS22_SW4 0x6F
+#define CS23_SW4 0x70
+#define CS24_SW4 0x71
+#define CS25_SW4 0x72
+#define CS26_SW4 0x73
+#define CS27_SW4 0x74
+#define CS28_SW4 0x75
+#define CS29_SW4 0x76
+#define CS30_SW4 0x77
+
+#define CS1_SW5 0x78
+#define CS2_SW5 0x79
+#define CS3_SW5 0x7A
+#define CS4_SW5 0x7B
+#define CS5_SW5 0x7C
+#define CS6_SW5 0x7D
+#define CS7_SW5 0x7E
+#define CS8_SW5 0x7F
+#define CS9_SW5 0x80
+#define CS10_SW5 0x81
+#define CS11_SW5 0x82
+#define CS12_SW5 0x83
+#define CS13_SW5 0x84
+#define CS14_SW5 0x85
+#define CS15_SW5 0x86
+#define CS16_SW5 0x87
+#define CS17_SW5 0x88
+#define CS18_SW5 0x89
+#define CS19_SW5 0x8A
+#define CS20_SW5 0x8B
+#define CS21_SW5 0x8C
+#define CS22_SW5 0x8D
+#define CS23_SW5 0x8E
+#define CS24_SW5 0x8F
+#define CS25_SW5 0x90
+#define CS26_SW5 0x91
+#define CS27_SW5 0x92
+#define CS28_SW5 0x93
+#define CS29_SW5 0x94
+#define CS30_SW5 0x95
+
+#define CS1_SW6 0x96
+#define CS2_SW6 0x97
+#define CS3_SW6 0x98
+#define CS4_SW6 0x99
+#define CS5_SW6 0x9A
+#define CS6_SW6 0x9B
+#define CS7_SW6 0x9C
+#define CS8_SW6 0x9D
+#define CS9_SW6 0x9E
+#define CS10_SW6 0x9F
+#define CS11_SW6 0xA0
+#define CS12_SW6 0xA1
+#define CS13_SW6 0xA2
+#define CS14_SW6 0xA3
+#define CS15_SW6 0xA4
+#define CS16_SW6 0xA5
+#define CS17_SW6 0xA6
+#define CS18_SW6 0xA7
+#define CS19_SW6 0xA8
+#define CS20_SW6 0xA9
+#define CS21_SW6 0xAA
+#define CS22_SW6 0xAB
+#define CS23_SW6 0xAC
+#define CS24_SW6 0xAD
+#define CS25_SW6 0xAE
+#define CS26_SW6 0xAF
+#define CS27_SW6 0xB0
+#define CS28_SW6 0xB1
+#define CS29_SW6 0xB2
+#define CS30_SW6 0xB3
diff --git a/drivers/led/issi/is31fl3743.h b/drivers/led/issi/is31fl3743.h
new file mode 100644
index 0000000000..d8fcd79096
--- /dev/null
+++ b/drivers/led/issi/is31fl3743.h
@@ -0,0 +1,327 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2018 Jack Humbert
+ * Copyright 2018 Yiancar
+ * Copyright 2020 MelGeek
+ * Copyright 2021 MasterSpoon
+ *
+ * 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
+
+// This is a 7-bit address, that gets left-shifted and bit 0
+// set to 0 for write, 1 for read (as per I2C protocol)
+// The address will vary depending on your wiring:
+// 00 <-> GND
+// 01 <-> SCL
+// 10 <-> SDA
+// 11 <-> VCC
+// ADDR1 represents A1:A0 of the 7-bit address.
+// ADDR2 represents A3:A2 of the 7-bit address.
+// The result is: 0b010(ADDR2)(ADDR1)
+#ifndef DRIVER_ADDR_1
+#    define DRIVER_ADDR_1 0b0100000
+#endif
+
+// Set defaults for Spread Spectrum Register
+#ifndef ISSI_SSR_1
+#    if DRIVER_COUNT == 1
+#        define ISSI_SSR_1 0x00
+#    else
+#        define ISSI_SSR_1 0xC0
+#    endif
+#endif
+#ifndef ISSI_SSR_2
+#    define ISSI_SSR_2 0x80
+#endif
+#ifndef ISSI_SSR_3
+#    define ISSI_SSR_3 0x80
+#endif
+#ifndef ISSI_SSR_4
+#    define ISSI_SSR_4 0x80
+#endif
+
+// Command Registers
+#define ISSI_COMMANDREGISTER_WRITELOCK 0xFE
+#define ISSI_COMMANDREGISTER 0xFD
+#define ISSI_IDREGISTER 0xFC
+#define ISSI_REGISTER_UNLOCK 0xC5
+
+// Response Registers
+#define ISSI_PAGE_PWM 0x00
+#define ISSI_PAGE_SCALING 0x01
+#define ISSI_PAGE_FUNCTION 0x02
+
+// Registers under Function Register
+#define ISSI_REG_CONFIGURATION 0x00
+#define ISSI_REG_GLOBALCURRENT 0x01
+#define ISSI_REG_PULLDOWNUP 0x02
+#define ISSI_REG_TEMP 0x24
+#define ISSI_REG_SSR 0x25
+#define ISSI_REG_RESET 0x2F
+
+// Set defaults for Function Registers
+#ifndef ISSI_CONFIGURATION
+#    define ISSI_CONFIGURATION 0x01
+#endif
+#ifndef ISSI_GLOBALCURRENT
+#    define ISSI_GLOBALCURRENT 0xFF
+#endif
+#ifndef ISSI_PULLDOWNUP
+#    define ISSI_PULLDOWNUP 0x33
+#endif
+#ifndef ISSI_TEMP
+#    define ISSI_TEMP 0x00
+#endif
+
+// Set defaults for Scaling registers
+#ifndef ISSI_SCAL_RED
+#    define ISSI_SCAL_RED 0xFF
+#endif
+#ifndef ISSI_SCAL_BLUE
+#    define ISSI_SCAL_BLUE 0xFF
+#endif
+#ifndef ISSI_SCAL_GREEN
+#    define ISSI_SCAL_GREEN 0xFF
+#endif
+#define ISSI_SCAL_RED_OFF 0x00
+#define ISSI_SCAL_GREEN_OFF 0x00
+#define ISSI_SCAL_BLUE_OFF 0x00
+
+#ifndef ISSI_SCAL_LED
+#    define ISSI_SCAL_LED 0xFF
+#endif
+#define ISSI_SCAL_LED_OFF 0x00
+
+// Set buffer sizes
+#define ISSI_MAX_LEDS 198
+#define ISSI_SCALING_SIZE 198
+#define ISSI_PWM_TRF_SIZE 18
+#define ISSI_SCALING_TRF_SIZE 18
+
+// Location of 1st bit for PWM and Scaling registers
+#define ISSI_PWM_REG_1ST 0x01
+#define ISSI_SCL_REG_1ST 0x01
+
+// Map CS SW locations to order in PWM / Scaling buffers
+// This matches the ORDER in the Datasheet Register not the POSITION
+// It will always count from 0x00 to (ISSI_MAX_LEDS - 1)
+#define CS1_SW1 0x00
+#define CS2_SW1 0x01
+#define CS3_SW1 0x02
+#define CS4_SW1 0x03
+#define CS5_SW1 0x04
+#define CS6_SW1 0x05
+#define CS7_SW1 0x06
+#define CS8_SW1 0x07
+#define CS9_SW1 0x08
+#define CS10_SW1 0x09
+#define CS11_SW1 0x0A
+#define CS12_SW1 0x0B
+#define CS13_SW1 0x0C
+#define CS14_SW1 0x0D
+#define CS15_SW1 0x0E
+#define CS16_SW1 0x0F
+#define CS17_SW1 0x10
+#define CS18_SW1 0x11
+
+#define CS1_SW2 0x12
+#define CS2_SW2 0x13
+#define CS3_SW2 0x14
+#define CS4_SW2 0x15
+#define CS5_SW2 0x16
+#define CS6_SW2 0x17
+#define CS7_SW2 0x18
+#define CS8_SW2 0x19
+#define CS9_SW2 0x1A
+#define CS10_SW2 0x1B
+#define CS11_SW2 0x1C
+#define CS12_SW2 0x1D
+#define CS13_SW2 0x1E
+#define CS14_SW2 0x1F
+#define CS15_SW2 0x20
+#define CS16_SW2 0x21
+#define CS17_SW2 0x22
+#define CS18_SW2 0x23
+
+#define CS1_SW3 0x24
+#define CS2_SW3 0x25
+#define CS3_SW3 0x26
+#define CS4_SW3 0x27
+#define CS5_SW3 0x28
+#define CS6_SW3 0x29
+#define CS7_SW3 0x2A
+#define CS8_SW3 0x2B
+#define CS9_SW3 0x2C
+#define CS10_SW3 0x2D
+#define CS11_SW3 0x2E
+#define CS12_SW3 0x2F
+#define CS13_SW3 0x30
+#define CS14_SW3 0x31
+#define CS15_SW3 0x32
+#define CS16_SW3 0x33
+#define CS17_SW3 0x34
+#define CS18_SW3 0x35
+
+#define CS1_SW4 0x36
+#define CS2_SW4 0x37
+#define CS3_SW4 0x38
+#define CS4_SW4 0x39
+#define CS5_SW4 0x3A
+#define CS6_SW4 0x3B
+#define CS7_SW4 0x3C
+#define CS8_SW4 0x3D
+#define CS9_SW4 0x3E
+#define CS10_SW4 0x3F
+#define CS11_SW4 0x40
+#define CS12_SW4 0x41
+#define CS13_SW4 0x42
+#define CS14_SW4 0x43
+#define CS15_SW4 0x44
+#define CS16_SW4 0x45
+#define CS17_SW4 0x46
+#define CS18_SW4 0x47
+
+#define CS1_SW5 0x48
+#define CS2_SW5 0x49
+#define CS3_SW5 0x4A
+#define CS4_SW5 0x4B
+#define CS5_SW5 0x4C
+#define CS6_SW5 0x4D
+#define CS7_SW5 0x4E
+#define CS8_SW5 0x4F
+#define CS9_SW5 0x50
+#define CS10_SW5 0x51
+#define CS11_SW5 0x52
+#define CS12_SW5 0x53
+#define CS13_SW5 0x54
+#define CS14_SW5 0x55
+#define CS15_SW5 0x56
+#define CS16_SW5 0x57
+#define CS17_SW5 0x58
+#define CS18_SW5 0x59
+
+#define CS1_SW6 0x5A
+#define CS2_SW6 0x5B
+#define CS3_SW6 0x5C
+#define CS4_SW6 0x5D
+#define CS5_SW6 0x5E
+#define CS6_SW6 0x5F
+#define CS7_SW6 0x60
+#define CS8_SW6 0x61
+#define CS9_SW6 0x62
+#define CS10_SW6 0x63
+#define CS11_SW6 0x64
+#define CS12_SW6 0x65
+#define CS13_SW6 0x66
+#define CS14_SW6 0x67
+#define CS15_SW6 0x68
+#define CS16_SW6 0x69
+#define CS17_SW6 0x6A
+#define CS18_SW6 0x6B
+
+#define CS1_SW7 0x6C
+#define CS2_SW7 0x6D
+#define CS3_SW7 0x6E
+#define CS4_SW7 0x6F
+#define CS5_SW7 0x70
+#define CS6_SW7 0x71
+#define CS7_SW7 0x72
+#define CS8_SW7 0x73
+#define CS9_SW7 0x74
+#define CS10_SW7 0x75
+#define CS11_SW7 0x76
+#define CS12_SW7 0x77
+#define CS13_SW7 0x78
+#define CS14_SW7 0x79
+#define CS15_SW7 0x7A
+#define CS16_SW7 0x7B
+#define CS17_SW7 0x7C
+#define CS18_SW7 0x7D
+
+#define CS1_SW8 0x7E
+#define CS2_SW8 0x7F
+#define CS3_SW8 0x80
+#define CS4_SW8 0x81
+#define CS5_SW8 0x82
+#define CS6_SW8 0x83
+#define CS7_SW8 0x84
+#define CS8_SW8 0x85
+#define CS9_SW8 0x86
+#define CS10_SW8 0x87
+#define CS11_SW8 0x88
+#define CS12_SW8 0x89
+#define CS13_SW8 0x8A
+#define CS14_SW8 0x8B
+#define CS15_SW8 0x8C
+#define CS16_SW8 0x8D
+#define CS17_SW8 0x8E
+#define CS18_SW8 0x8F
+
+#define CS1_SW9 0x90
+#define CS2_SW9 0x91
+#define CS3_SW9 0x92
+#define CS4_SW9 0x93
+#define CS5_SW9 0x94
+#define CS6_SW9 0x95
+#define CS7_SW9 0x96
+#define CS8_SW9 0x97
+#define CS9_SW9 0x98
+#define CS10_SW9 0x99
+#define CS11_SW9 0x9A
+#define CS12_SW9 0x9B
+#define CS13_SW9 0x9C
+#define CS14_SW9 0x9D
+#define CS15_SW9 0x9E
+#define CS16_SW9 0x9F
+#define CS17_SW9 0xA0
+#define CS18_SW9 0xA1
+
+#define CS1_SW10 0xA2
+#define CS2_SW10 0xA3
+#define CS3_SW10 0xA4
+#define CS4_SW10 0xA5
+#define CS5_SW10 0xA6
+#define CS6_SW10 0xA7
+#define CS7_SW10 0xA8
+#define CS8_SW10 0xA9
+#define CS9_SW10 0xAA
+#define CS10_SW10 0xAB
+#define CS11_SW10 0xAC
+#define CS12_SW10 0xAD
+#define CS13_SW10 0xAE
+#define CS14_SW10 0xAF
+#define CS15_SW10 0xB0
+#define CS16_SW10 0xB1
+#define CS17_SW10 0xB2
+#define CS18_SW10 0xB3
+
+#define CS1_SW11 0xB4
+#define CS2_SW11 0xB5
+#define CS3_SW11 0xB6
+#define CS4_SW11 0xB7
+#define CS5_SW11 0xB8
+#define CS6_SW11 0xB9
+#define CS7_SW11 0xBA
+#define CS8_SW11 0xBB
+#define CS9_SW11 0xBC
+#define CS10_SW11 0xBD
+#define CS11_SW11 0xBE
+#define CS12_SW11 0xBF
+#define CS13_SW11 0xC0
+#define CS14_SW11 0xC1
+#define CS15_SW11 0xC2
+#define CS16_SW11 0xC3
+#define CS17_SW11 0xC4
+#define CS18_SW11 0xC5
diff --git a/drivers/led/issi/is31fl3745.h b/drivers/led/issi/is31fl3745.h
new file mode 100644
index 0000000000..ca5dd4a986
--- /dev/null
+++ b/drivers/led/issi/is31fl3745.h
@@ -0,0 +1,270 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2018 Jack Humbert
+ * Copyright 2018 Yiancar
+ * Copyright 2020 MelGeek
+ * Copyright 2021 MasterSpoon
+ *
+ * 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
+
+// This is a 7-bit address, that gets left-shifted and bit 0
+// set to 0 for write, 1 for read (as per I2C protocol)
+// The address will vary depending on your wiring:
+// 00 <-> GND
+// 01 <-> SCL
+// 10 <-> SDA
+// 11 <-> VCC
+// ADDR1 represents A1:A0 of the 7-bit address.
+// ADDR2 represents A3:A2 of the 7-bit address.
+// The result is: 0b010(ADDR2)(ADDR1)
+#ifndef DRIVER_ADDR_1
+#    define DRIVER_ADDR_1 0b0100000
+#endif
+
+// Set defaults for Spread Spectrum Register
+#ifndef ISSI_SSR_1
+#    if DRIVER_COUNT == 1
+#        define ISSI_SSR_1 0x00
+#    else
+#        define ISSI_SSR_1 0xC0
+#    endif
+#endif
+#ifndef ISSI_SSR_2
+#    define ISSI_SSR_2 0x80
+#endif
+#ifndef ISSI_SSR_3
+#    define ISSI_SSR_3 0x80
+#endif
+#ifndef ISSI_SSR_4
+#    define ISSI_SSR_4 0x80
+#endif
+
+// Command Registers
+#define ISSI_COMMANDREGISTER_WRITELOCK 0xFE
+#define ISSI_COMMANDREGISTER 0xFD
+#define ISSI_IDREGISTER 0xFC
+#define ISSI_REGISTER_UNLOCK 0xC5
+
+// Response Registers
+#define ISSI_PAGE_PWM 0x00
+#define ISSI_PAGE_SCALING 0x01
+#define ISSI_PAGE_FUNCTION 0x02
+
+// Registers under Function Register
+#define ISSI_REG_CONFIGURATION 0x00
+#define ISSI_REG_GLOBALCURRENT 0x01
+#define ISSI_REG_PULLDOWNUP 0x02
+#define ISSI_REG_TEMP 0x24
+#define ISSI_REG_SSR 0x25
+#define ISSI_REG_RESET 0x2F
+
+// Set defaults for Function Registers
+#ifndef ISSI_CONFIGURATION
+#    define ISSI_CONFIGURATION 0x31
+#endif
+#ifndef ISSI_GLOBALCURRENT
+#    define ISSI_GLOBALCURRENT 0xFF
+#endif
+#ifndef ISSI_PULLDOWNUP
+#    define ISSI_PULLDOWNUP 0x33
+#endif
+#ifndef ISSI_TEMP
+#    define ISSI_TEMP 0x00
+#endif
+
+// Set defaults for Scaling registers
+#ifndef ISSI_SCAL_RED
+#    define ISSI_SCAL_RED 0xFF
+#endif
+#ifndef ISSI_SCAL_BLUE
+#    define ISSI_SCAL_BLUE 0xFF
+#endif
+#ifndef ISSI_SCAL_GREEN
+#    define ISSI_SCAL_GREEN 0xFF
+#endif
+#define ISSI_SCAL_RED_OFF 0x00
+#define ISSI_SCAL_GREEN_OFF 0x00
+#define ISSI_SCAL_BLUE_OFF 0x00
+
+#ifndef ISSI_SCAL_LED
+#    define ISSI_SCAL_LED 0xFF
+#endif
+#define ISSI_SCAL_LED_OFF 0x00
+
+// Set buffer sizes
+#define ISSI_MAX_LEDS 144
+#define ISSI_SCALING_SIZE 144
+#define ISSI_PWM_TRF_SIZE 18
+#define ISSI_SCALING_TRF_SIZE 18
+
+// Location of 1st bit for PWM and Scaling registers
+#define ISSI_PWM_REG_1ST 0x01
+#define ISSI_SCL_REG_1ST 0x01
+
+// Map CS SW locations to order in PWM / Scaling buffers
+// This matches the ORDER in the Datasheet Register not the POSITION
+// It will always count from 0x00 to (ISSI_MAX_LEDS - 1)
+#define CS1_SW1 0x00
+#define CS2_SW1 0x01
+#define CS3_SW1 0x02
+#define CS4_SW1 0x03
+#define CS5_SW1 0x04
+#define CS6_SW1 0x05
+#define CS7_SW1 0x06
+#define CS8_SW1 0x07
+#define CS9_SW1 0x08
+#define CS10_SW1 0x09
+#define CS11_SW1 0x0A
+#define CS12_SW1 0x0B
+#define CS13_SW1 0x0C
+#define CS14_SW1 0x0D
+#define CS15_SW1 0x0E
+#define CS16_SW1 0x0F
+#define CS17_SW1 0x10
+#define CS18_SW1 0x11
+
+#define CS1_SW2 0x12
+#define CS2_SW2 0x13
+#define CS3_SW2 0x14
+#define CS4_SW2 0x15
+#define CS5_SW2 0x16
+#define CS6_SW2 0x17
+#define CS7_SW2 0x18
+#define CS8_SW2 0x19
+#define CS9_SW2 0x1A
+#define CS10_SW2 0x1B
+#define CS11_SW2 0x1C
+#define CS12_SW2 0x1D
+#define CS13_SW2 0x1E
+#define CS14_SW2 0x1F
+#define CS15_SW2 0x20
+#define CS16_SW2 0x21
+#define CS17_SW2 0x22
+#define CS18_SW2 0x23
+
+#define CS1_SW3 0x24
+#define CS2_SW3 0x25
+#define CS3_SW3 0x26
+#define CS4_SW3 0x27
+#define CS5_SW3 0x28
+#define CS6_SW3 0x29
+#define CS7_SW3 0x2A
+#define CS8_SW3 0x2B
+#define CS9_SW3 0x2C
+#define CS10_SW3 0x2D
+#define CS11_SW3 0x2E
+#define CS12_SW3 0x2F
+#define CS13_SW3 0x30
+#define CS14_SW3 0x31
+#define CS15_SW3 0x32
+#define CS16_SW3 0x33
+#define CS17_SW3 0x34
+#define CS18_SW3 0x35
+
+#define CS1_SW4 0x36
+#define CS2_SW4 0x37
+#define CS3_SW4 0x38
+#define CS4_SW4 0x39
+#define CS5_SW4 0x3A
+#define CS6_SW4 0x3B
+#define CS7_SW4 0x3C
+#define CS8_SW4 0x3D
+#define CS9_SW4 0x3E
+#define CS10_SW4 0x3F
+#define CS11_SW4 0x40
+#define CS12_SW4 0x41
+#define CS13_SW4 0x42
+#define CS14_SW4 0x43
+#define CS15_SW4 0x44
+#define CS16_SW4 0x45
+#define CS17_SW4 0x46
+#define CS18_SW4 0x47
+
+#define CS1_SW5 0x48
+#define CS2_SW5 0x49
+#define CS3_SW5 0x4A
+#define CS4_SW5 0x4B
+#define CS5_SW5 0x4C
+#define CS6_SW5 0x4D
+#define CS7_SW5 0x4E
+#define CS8_SW5 0x4F
+#define CS9_SW5 0x50
+#define CS10_SW5 0x51
+#define CS11_SW5 0x52
+#define CS12_SW5 0x53
+#define CS13_SW5 0x54
+#define CS14_SW5 0x55
+#define CS15_SW5 0x56
+#define CS16_SW5 0x57
+#define CS17_SW5 0x58
+#define CS18_SW5 0x59
+
+#define CS1_SW6 0x5A
+#define CS2_SW6 0x5B
+#define CS3_SW6 0x5C
+#define CS4_SW6 0x5D
+#define CS5_SW6 0x5E
+#define CS6_SW6 0x5F
+#define CS7_SW6 0x60
+#define CS8_SW6 0x61
+#define CS9_SW6 0x62
+#define CS10_SW6 0x63
+#define CS11_SW6 0x64
+#define CS12_SW6 0x65
+#define CS13_SW6 0x66
+#define CS14_SW6 0x67
+#define CS15_SW6 0x68
+#define CS16_SW6 0x69
+#define CS17_SW6 0x6A
+#define CS18_SW6 0x6B
+
+#define CS1_SW7 0x6C
+#define CS2_SW7 0x6D
+#define CS3_SW7 0x6E
+#define CS4_SW7 0x6F
+#define CS5_SW7 0x70
+#define CS6_SW7 0x71
+#define CS7_SW7 0x72
+#define CS8_SW7 0x73
+#define CS9_SW7 0x74
+#define CS10_SW7 0x75
+#define CS11_SW7 0x76
+#define CS12_SW7 0x77
+#define CS13_SW7 0x78
+#define CS14_SW7 0x79
+#define CS15_SW7 0x7A
+#define CS16_SW7 0x7B
+#define CS17_SW7 0x7C
+#define CS18_SW7 0x7D
+
+#define CS1_SW8 0x7E
+#define CS2_SW8 0x7F
+#define CS3_SW8 0x80
+#define CS4_SW8 0x81
+#define CS5_SW8 0x82
+#define CS6_SW8 0x83
+#define CS7_SW8 0x84
+#define CS8_SW8 0x85
+#define CS9_SW8 0x86
+#define CS10_SW8 0x87
+#define CS11_SW8 0x88
+#define CS12_SW8 0x89
+#define CS13_SW8 0x8A
+#define CS14_SW8 0x8B
+#define CS15_SW8 0x8C
+#define CS16_SW8 0x8D
+#define CS17_SW8 0x8E
+#define CS18_SW8 0x8F
diff --git a/drivers/led/issi/is31fl3746.h b/drivers/led/issi/is31fl3746.h
new file mode 100644
index 0000000000..f89f281533
--- /dev/null
+++ b/drivers/led/issi/is31fl3746.h
@@ -0,0 +1,198 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2018 Jack Humbert
+ * Copyright 2018 Yiancar
+ * Copyright 2020 MelGeek
+ * Copyright 2021 MasterSpoon
+ *
+ * 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
+
+// This is a 7-bit address, that gets left-shifted and bit 0
+// set to 0 for write, 1 for read (as per I2C protocol)
+// The address will vary depending on your wiring:
+// 00 <-> GND
+// 01 <-> SCL
+// 10 <-> SDA
+// 11 <-> VCC
+// ADDR1 represents A1:A0 of the 7-bit address.
+// ADDR2 represents A3:A2 of the 7-bit address.
+// The result is: 0b110(ADDR2)(ADDR1)
+#ifndef DRIVER_ADDR_1
+#    define DRIVER_ADDR_1 0b1100000
+#endif
+
+// Set defaults for Spread Spectrum Register
+#ifndef ISSI_SSR_1
+#    define ISSI_SSR_1 0x00
+#endif
+#ifndef ISSI_SSR_2
+#    define ISSI_SSR_2 0x00
+#endif
+#ifndef ISSI_SSR_3
+#    define ISSI_SSR_3 0x00
+#endif
+#ifndef ISSI_SSR_4
+#    define ISSI_SSR_4 0x00
+#endif
+
+// Command Registers
+#define ISSI_COMMANDREGISTER_WRITELOCK 0xFE
+#define ISSI_COMMANDREGISTER 0xFD
+#define ISSI_IDREGISTER 0xFC
+#define ISSI_REGISTER_UNLOCK 0xC5
+
+// Response Registers
+#define ISSI_PAGE_PWM 0x00
+#define ISSI_PAGE_SCALING 0x01
+#define ISSI_PAGE_FUNCTION 0x01
+
+// Registers under Function Register
+#define ISSI_REG_CONFIGURATION 0x50
+#define ISSI_REG_GLOBALCURRENT 0x51
+#define ISSI_REG_PULLDOWNUP 0x52
+#define ISSI_REG_TEMP 0x5F
+#define ISSI_REG_SSR 0x60
+#define ISSI_REG_RESET 0x8F
+#define ISSI_REG_PWM_ENABLE 0xE0
+#define ISSI_REG_PWM_SET 0xE2
+
+// Set defaults for Function Registers
+#ifndef ISSI_CONFIGURATION
+#    define ISSI_CONFIGURATION 0x01
+#endif
+#ifndef ISSI_GLOBALCURRENT
+#    define ISSI_GLOBALCURRENT 0xFF
+#endif
+#ifndef ISSI_PULLDOWNUP
+#    define ISSI_PULLDOWNUP 0x33
+#endif
+#ifndef ISSI_TEMP
+#    define ISSI_TEMP 0x00
+#endif
+#ifndef ISSI_PWM_ENABLE
+#    define ISSI_PWM_ENABLE 0x00
+#endif
+#ifndef ISSI_PWM_SET
+#    define ISSI_PWM_SET 0x00
+#endif
+
+// Set defaults for Scaling registers
+#ifndef ISSI_SCAL_RED
+#    define ISSI_SCAL_RED 0xFF
+#endif
+#ifndef ISSI_SCAL_BLUE
+#    define ISSI_SCAL_BLUE 0xFF
+#endif
+#ifndef ISSI_SCAL_GREEN
+#    define ISSI_SCAL_GREEN 0xFF
+#endif
+#define ISSI_SCAL_RED_OFF 0x00
+#define ISSI_SCAL_GREEN_OFF 0x00
+#define ISSI_SCAL_BLUE_OFF 0x00
+
+#ifndef ISSI_SCAL_LED
+#    define ISSI_SCAL_LED 0xFF
+#endif
+#define ISSI_SCAL_LED_OFF 0x00
+
+// Set buffer sizes
+#define ISSI_MAX_LEDS 72
+#define ISSI_SCALING_SIZE 72
+#define ISSI_PWM_TRF_SIZE 18
+#define ISSI_SCALING_TRF_SIZE 18
+
+// Location of 1st bit for PWM and Scaling registers
+#define ISSI_PWM_REG_1ST 0x01
+#define ISSI_SCL_REG_1ST 0x01
+
+// Map CS SW locations to order in PWM / Scaling buffers
+// This matches the ORDER in the Datasheet Register not the POSITION
+// It will always count from 0x00 to (ISSI_MAX_LEDS - 1)
+#define CS1_SW1 0x00
+#define CS2_SW1 0x01
+#define CS3_SW1 0x02
+#define CS4_SW1 0x03
+#define CS5_SW1 0x04
+#define CS6_SW1 0x05
+#define CS7_SW1 0x06
+#define CS8_SW1 0x07
+#define CS9_SW1 0x08
+#define CS10_SW1 0x09
+#define CS11_SW1 0x0A
+#define CS12_SW1 0x0B
+#define CS13_SW1 0x0C
+#define CS14_SW1 0x0D
+#define CS15_SW1 0x0E
+#define CS16_SW1 0x0F
+#define CS17_SW1 0x10
+#define CS18_SW1 0x11
+
+#define CS1_SW2 0x12
+#define CS2_SW2 0x13
+#define CS3_SW2 0x14
+#define CS4_SW2 0x15
+#define CS5_SW2 0x16
+#define CS6_SW2 0x17
+#define CS7_SW2 0x18
+#define CS8_SW2 0x19
+#define CS9_SW2 0x1A
+#define CS10_SW2 0x1B
+#define CS11_SW2 0x1C
+#define CS12_SW2 0x1D
+#define CS13_SW2 0x1E
+#define CS14_SW2 0x1F
+#define CS15_SW2 0x20
+#define CS16_SW2 0x21
+#define CS17_SW2 0x22
+#define CS18_SW2 0x23
+
+#define CS1_SW3 0x24
+#define CS2_SW3 0x25
+#define CS3_SW3 0x26
+#define CS4_SW3 0x27
+#define CS5_SW3 0x28
+#define CS6_SW3 0x29
+#define CS7_SW3 0x2A
+#define CS8_SW3 0x2B
+#define CS9_SW3 0x2C
+#define CS10_SW3 0x2D
+#define CS11_SW3 0x2E
+#define CS12_SW3 0x2F
+#define CS13_SW3 0x30
+#define CS14_SW3 0x31
+#define CS15_SW3 0x32
+#define CS16_SW3 0x33
+#define CS17_SW3 0x34
+#define CS18_SW3 0x35
+
+#define CS1_SW4 0x36
+#define CS2_SW4 0x37
+#define CS3_SW4 0x38
+#define CS4_SW4 0x39
+#define CS5_SW4 0x3A
+#define CS6_SW4 0x3B
+#define CS7_SW4 0x3C
+#define CS8_SW4 0x3D
+#define CS9_SW4 0x3E
+#define CS10_SW4 0x3F
+#define CS11_SW4 0x40
+#define CS12_SW4 0x41
+#define CS13_SW4 0x42
+#define CS14_SW4 0x43
+#define CS15_SW4 0x44
+#define CS16_SW4 0x45
+#define CS17_SW4 0x46
+#define CS18_SW4 0x47
diff --git a/drivers/led/issi/is31flcommon.c b/drivers/led/issi/is31flcommon.c
new file mode 100644
index 0000000000..9f4b2123ff
--- /dev/null
+++ b/drivers/led/issi/is31flcommon.c
@@ -0,0 +1,230 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2018 Jack Humbert
+ * Copyright 2018 Yiancar
+ * Copyright 2020 MelGeek
+ * Copyright 2021 MasterSpoon
+ *
+ * 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 "is31flcommon.h"
+#include "i2c_master.h"
+#include "wait.h"
+#include <string.h>
+
+// Set defaults for Timeout and Persistence
+#ifndef ISSI_TIMEOUT
+#    define ISSI_TIMEOUT 100
+#endif
+#ifndef ISSI_PERSISTENCE
+#    define ISSI_PERSISTENCE 0
+#endif
+
+// Transfer buffer for TWITransmitData()
+uint8_t g_twi_transfer_buffer[20];
+
+// These buffers match the PWM & scaling registers.
+// Storing them like this is optimal for I2C transfers to the registers.
+uint8_t g_pwm_buffer[DRIVER_COUNT][ISSI_MAX_LEDS];
+bool    g_pwm_buffer_update_required[DRIVER_COUNT] = {false};
+
+uint8_t g_scaling_buffer[DRIVER_COUNT][ISSI_SCALING_SIZE];
+bool    g_scaling_buffer_update_required[DRIVER_COUNT] = {false};
+
+// For writing of single register entry
+void IS31FL_write_single_register(uint8_t addr, uint8_t reg, uint8_t data) {
+    // Set register address and register data ready to write
+    g_twi_transfer_buffer[0] = reg;
+    g_twi_transfer_buffer[1] = data;
+
+#if ISSI_PERSISTENCE > 0
+    for (uint8_t i = 0; i < ISSI_PERSISTENCE; i++) {
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, ISSI_TIMEOUT) == 0) break;
+    }
+#else
+    i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, ISSI_TIMEOUT);
+#endif
+}
+
+// For writing of mulitple register entries to make use of address auto increment
+// Once the controller has been called and we have written the first bit of data
+// the controller will move to the next register meaning we can write sequential blocks.
+bool IS31FL_write_multi_registers(uint8_t addr, uint8_t *source_buffer, uint8_t buffer_size, uint8_t transfer_size, uint8_t start_reg_addr) {
+    // Split the buffer into chunks to transfer
+    for (int i = 0; i < buffer_size; i += transfer_size) {
+        // Set the first entry of transfer buffer to the first register we want to write
+        g_twi_transfer_buffer[0] = i + start_reg_addr;
+        // Copy the section of our source buffer into the transfer buffer after first register address
+        memcpy(g_twi_transfer_buffer + 1, source_buffer + i, transfer_size);
+
+#if ISSI_PERSISTENCE > 0
+        for (uint8_t i = 0; i < ISSI_PERSISTENCE; i++) {
+            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, transfer_size + 1, ISSI_TIMEOUT) != 0) {
+                return false;
+            }
+        }
+#else
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, transfer_size + 1, ISSI_TIMEOUT) != 0) {
+            return false;
+        }
+#endif
+    }
+    return true;
+}
+
+void IS31FL_unlock_register(uint8_t addr, uint8_t page) {
+    // unlock the command register and select Page to write
+    IS31FL_write_single_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, ISSI_REGISTER_UNLOCK);
+    IS31FL_write_single_register(addr, ISSI_COMMANDREGISTER, page);
+}
+
+void IS31FL_common_init(uint8_t addr, uint8_t ssr) {
+    // Setup phase, need to take out of software shutdown and configure
+    // ISSI_SSR_x is passed to allow Master / Slave setting where applicable
+
+    // Unlock the command register & select Function Register
+    IS31FL_unlock_register(addr, ISSI_PAGE_FUNCTION);
+    // Set Configuration Register to remove Software shutdown
+    IS31FL_write_single_register(addr, ISSI_REG_CONFIGURATION, ISSI_CONFIGURATION);
+    // Set Golbal Current Control Register
+    IS31FL_write_single_register(addr, ISSI_REG_GLOBALCURRENT, ISSI_GLOBALCURRENT);
+    // Set Pull up & Down for SWx CSy
+    IS31FL_write_single_register(addr, ISSI_REG_PULLDOWNUP, ISSI_PULLDOWNUP);
+// Set Tempature Status
+#ifdef ISSI_REG_TEMP
+    IS31FL_write_single_register(addr, ISSI_REG_TEMP, ISSI_TEMP);
+#endif
+    // Set Spread Spectrum Register, passed through as sets SYNC function
+    IS31FL_write_single_register(addr, ISSI_REG_SSR, ssr);
+// Set PWM Frequency Enable Register if applicable
+#ifdef ISSI_REG_PWM_ENABLE
+    IS31FL_write_single_register(addr, ISSI_REG_PWM_ENABLE, ISSI_PWM_ENABLE);
+#endif
+// Set PWM Frequency Register if applicable
+#ifdef ISSI_REG_PWM_SET
+    IS31FL_write_single_register(addr, ISSI_REG_PWM_SET, ISSI_PWM_SET);
+#endif
+
+    // Wait 10ms to ensure the device has woken up.
+    wait_ms(10);
+}
+
+void IS31FL_common_update_pwm_register(uint8_t addr, uint8_t index) {
+    if (g_pwm_buffer_update_required[index]) {
+        // Queue up the correct page
+        IS31FL_unlock_register(addr, ISSI_PAGE_PWM);
+        // Hand off the update to IS31FL_write_multi_registers
+        IS31FL_write_multi_registers(addr, g_pwm_buffer[index], ISSI_MAX_LEDS, ISSI_PWM_TRF_SIZE, ISSI_PWM_REG_1ST);
+        // Update flags that pwm_buffer has been updated
+        g_pwm_buffer_update_required[index] = false;
+    }
+}
+
+#ifdef ISSI_MANUAL_SCALING
+void IS31FL_set_manual_scaling_buffer(void) {
+    for (int i = 0; i < ISSI_MANUAL_SCALING; i++) {
+        is31_led scale = g_is31_scaling[i];
+        if (scale.driver >= 0 && scale.driver < DRIVER_LED_TOTAL) {
+            is31_led led = g_is31_leds[scale.driver];
+
+#    ifdef RGB_MATRIX_ENABLE
+            g_scaling_buffer[led.driver][led.r] = scale.r;
+            g_scaling_buffer[led.driver][led.g] = scale.g;
+            g_scaling_buffer[led.driver][led.b] = scale.b;
+#    elif defined(LED_MATRIX_ENABLE)
+            g_scaling_buffer[led.driver][led.v] = scale.v;
+#    endif
+            g_scaling_buffer_update_required[led.driver] = true;
+        }
+    }
+}
+#endif
+
+void IS31FL_common_update_scaling_register(uint8_t addr, uint8_t index) {
+    if (g_scaling_buffer_update_required[index]) {
+        // Queue up the correct page
+        IS31FL_unlock_register(addr, ISSI_PAGE_SCALING);
+        // Hand off the update to IS31FL_write_multi_registers
+        IS31FL_write_multi_registers(addr, g_scaling_buffer[index], ISSI_SCALING_SIZE, ISSI_SCALING_TRF_SIZE, ISSI_SCL_REG_1ST);
+        // Update flags that scaling_buffer has been updated
+        g_scaling_buffer_update_required[index] = false;
+    }
+}
+
+#ifdef RGB_MATRIX_ENABLE
+// Colour is set by adjusting PWM register
+void IS31FL_RGB_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
+    if (index >= 0 && index < DRIVER_LED_TOTAL) {
+        is31_led led = g_is31_leds[index];
+
+        g_pwm_buffer[led.driver][led.r]          = red;
+        g_pwm_buffer[led.driver][led.g]          = green;
+        g_pwm_buffer[led.driver][led.b]          = blue;
+        g_pwm_buffer_update_required[led.driver] = true;
+    }
+}
+
+void IS31FL_RGB_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
+    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+        IS31FL_RGB_set_color(i, red, green, blue);
+    }
+}
+
+// Setup Scaling register that decides the peak current of each LED
+void IS31FL_RGB_set_scaling_buffer(uint8_t index, bool red, bool green, bool blue) {
+    is31_led led = g_is31_leds[index];
+    if (red) {
+        g_scaling_buffer[led.driver][led.r] = ISSI_SCAL_RED;
+    } else {
+        g_scaling_buffer[led.driver][led.r] = ISSI_SCAL_RED_OFF;
+    }
+    if (green) {
+        g_scaling_buffer[led.driver][led.g] = ISSI_SCAL_GREEN;
+    } else {
+        g_scaling_buffer[led.driver][led.g] = ISSI_SCAL_GREEN_OFF;
+    }
+    if (blue) {
+        g_scaling_buffer[led.driver][led.b] = ISSI_SCAL_BLUE;
+    } else {
+        g_scaling_buffer[led.driver][led.b] = ISSI_SCAL_BLUE_OFF;
+    }
+    g_scaling_buffer_update_required[led.driver] = true;
+}
+
+#elif defined(LED_MATRIX_ENABLE)
+// LED Matrix Specific scripts
+void IS31FL_simple_set_scaling_buffer(uint8_t index, bool value) {
+    is31_led led = g_is31_leds[index];
+    if (value) {
+        g_scaling_buffer[led.driver][led.v] = ISSI_SCAL_LED;
+    } else {
+        g_scaling_buffer[led.driver][led.v] = ISSI_SCAL_LED_OFF;
+    }
+    g_scaling_buffer_update_required[led.driver] = true;
+}
+
+void IS31FL_simple_set_brightness(int index, uint8_t value) {
+    if (index >= 0 && index < DRIVER_LED_TOTAL) {
+        is31_led led = g_is31_leds[index];
+        g_pwm_buffer[led.driver][led.v] = value;
+        g_pwm_buffer_update_required[led.driver] = true;
+    }
+}
+
+void IS31FL_simple_set_brigntness_all(uint8_t value) {
+    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+        IS31FL_simple_set_brightness(i, value);
+    }
+}
+#endif
diff --git a/drivers/led/issi/is31flcommon.h b/drivers/led/issi/is31flcommon.h
new file mode 100644
index 0000000000..77e9665e32
--- /dev/null
+++ b/drivers/led/issi/is31flcommon.h
@@ -0,0 +1,78 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2018 Jack Humbert
+ * Copyright 2018 Yiancar
+ * Copyright 2020 MelGeek
+ * Copyright 2021 MasterSpoon
+ *
+ * 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 <stdint.h>
+#include <stdbool.h>
+#include "progmem.h"
+
+// Which variant header file to use
+#ifdef IS31FL3742A
+#    include "is31fl3742.h"
+#elif defined(IS31FL3743A)
+#    include "is31fl3743.h"
+#elif defined(IS31FL3745)
+#    include "is31fl3745.h"
+#elif defined(IS31FL3746A)
+#    include "is31fl3746.h"
+#endif
+
+#ifdef RGB_MATRIX_ENABLE
+typedef struct is31_led {
+    uint8_t driver;
+    uint8_t r;
+    uint8_t g;
+    uint8_t b;
+} __attribute__((packed)) is31_led;
+
+#elif defined(LED_MATRIX_ENABLE)
+typedef struct is31_led {
+    uint8_t driver;
+    uint8_t v;
+} __attribute__((packed)) is31_led;
+#endif
+
+#ifdef ISSI_MANUAL_SCALING
+extern const is31_led __flash g_is31_scaling[];
+void                          IS31FL_set_manual_scaling_buffer(void);
+#endif
+
+extern const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL];
+
+void IS31FL_write_single_register(uint8_t addr, uint8_t reg, uint8_t data);
+bool IS31FL_write_multi_registers(uint8_t addr, uint8_t *source_buffer, uint8_t buffer_size, uint8_t transfer_size, uint8_t start_reg_addr);
+void IS31FL_unlock_register(uint8_t addr, uint8_t page);
+void IS31FL_common_init(uint8_t addr, uint8_t ssr);
+
+void IS31FL_common_update_pwm_register(uint8_t addr, uint8_t index);
+void IS31FL_common_update_scaling_register(uint8_t addr, uint8_t index);
+
+#ifdef RGB_MATRIX_ENABLE
+// RGB Matrix Specific scripts
+void IS31FL_RGB_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
+void IS31FL_RGB_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
+void IS31FL_RGB_set_scaling_buffer(uint8_t index, bool red, bool green, bool blue);
+#elif defined(LED_MATRIX_ENABLE)
+// LED Matrix Specific scripts
+void IS31FL_simple_set_scaling_buffer(uint8_t index, bool value);
+void IS31FL_simple_set_brightness(int index, uint8_t value);
+void IS31FL_simple_set_brigntness_all(uint8_t value);
+#endif
diff --git a/drivers/oled/oled_driver.h b/drivers/oled/oled_driver.h
index 3b56d370dc..918b837f07 100644
--- a/drivers/oled/oled_driver.h
+++ b/drivers/oled/oled_driver.h
@@ -34,16 +34,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        define OLED_DISPLAY_HEIGHT 64
 #    endif
 #    ifndef OLED_MATRIX_SIZE
-#        define OLED_MATRIX_SIZE (OLED_DISPLAY_HEIGHT / 8 * OLED_DISPLAY_WIDTH)  // 1024 (compile time mathed)
+#        define OLED_MATRIX_SIZE (OLED_DISPLAY_HEIGHT / 8 * OLED_DISPLAY_WIDTH) // 1024 (compile time mathed)
 #    endif
 #    ifndef OLED_BLOCK_TYPE
 #        define OLED_BLOCK_TYPE uint16_t
 #    endif
 #    ifndef OLED_BLOCK_COUNT
-#        define OLED_BLOCK_COUNT (sizeof(OLED_BLOCK_TYPE) * 8)  // 32 (compile time mathed)
+#        define OLED_BLOCK_COUNT (sizeof(OLED_BLOCK_TYPE) * 8) // 32 (compile time mathed)
 #    endif
 #    ifndef OLED_BLOCK_SIZE
-#        define OLED_BLOCK_SIZE (OLED_MATRIX_SIZE / OLED_BLOCK_COUNT)  // 32 (compile time mathed)
+#        define OLED_BLOCK_SIZE (OLED_MATRIX_SIZE / OLED_BLOCK_COUNT) // 32 (compile time mathed)
 #    endif
 #    ifndef OLED_COM_PINS
 #        define OLED_COM_PINS COM_PINS_ALT
@@ -68,7 +68,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // If OLED_BLOCK_TYPE is uint8_t, these tables would look like:
 // #define OLED_SOURCE_MAP { 0, 8, 16, 24, 32, 40, 48, 56, 64, 72, 80, 88, 96, 104, 112, 120 }
 // #define OLED_TARGET_MAP { 56, 120, 48, 112, 40, 104, 32, 96, 24, 88, 16, 80, 8, 72, 0, 64 }
-#else  // defined(OLED_DISPLAY_128X64)
+#else // defined(OLED_DISPLAY_128X64)
 // Default 128x32
 #    ifndef OLED_DISPLAY_WIDTH
 #        define OLED_DISPLAY_WIDTH 128
@@ -77,16 +77,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        define OLED_DISPLAY_HEIGHT 32
 #    endif
 #    ifndef OLED_MATRIX_SIZE
-#        define OLED_MATRIX_SIZE (OLED_DISPLAY_HEIGHT / 8 * OLED_DISPLAY_WIDTH)  // 512 (compile time mathed)
+#        define OLED_MATRIX_SIZE (OLED_DISPLAY_HEIGHT / 8 * OLED_DISPLAY_WIDTH) // 512 (compile time mathed)
 #    endif
 #    ifndef OLED_BLOCK_TYPE
-#        define OLED_BLOCK_TYPE uint16_t  // Type to use for segmenting the oled display for smart rendering, use unsigned types only
+#        define OLED_BLOCK_TYPE uint16_t // Type to use for segmenting the oled display for smart rendering, use unsigned types only
 #    endif
 #    ifndef OLED_BLOCK_COUNT
-#        define OLED_BLOCK_COUNT (sizeof(OLED_BLOCK_TYPE) * 8)  // 16 (compile time mathed)
+#        define OLED_BLOCK_COUNT (sizeof(OLED_BLOCK_TYPE) * 8) // 16 (compile time mathed)
 #    endif
 #    ifndef OLED_BLOCK_SIZE
-#        define OLED_BLOCK_SIZE (OLED_MATRIX_SIZE / OLED_BLOCK_COUNT)  // 32 (compile time mathed)
+#        define OLED_BLOCK_SIZE (OLED_MATRIX_SIZE / OLED_BLOCK_COUNT) // 32 (compile time mathed)
 #    endif
 #    ifndef OLED_COM_PINS
 #        define OLED_COM_PINS COM_PINS_SEQ
@@ -105,7 +105,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // If OLED_BLOCK_TYPE is uint8_t, these tables would look like:
 // #define OLED_SOURCE_MAP { 0, 8, 16, 24, 32, 40, 48, 56 }
 // #define OLED_TARGET_MAP { 48, 32, 16, 0, 56, 40, 24, 8 }
-#endif  // defined(OLED_DISPLAY_CUSTOM)
+#endif // defined(OLED_DISPLAY_CUSTOM)
 
 #if !defined(OLED_IC)
 #    define OLED_IC OLED_IC_SSD1306
@@ -180,7 +180,7 @@ typedef enum {
     OLED_ROTATION_0   = 0,
     OLED_ROTATION_90  = 1,
     OLED_ROTATION_180 = 2,
-    OLED_ROTATION_270 = 3,  // OLED_ROTATION_90 | OLED_ROTATION_180
+    OLED_ROTATION_270 = 3, // OLED_ROTATION_90 | OLED_ROTATION_180
 } oled_rotation_t;
 
 // Initialize the oled display, rotating the rendered output based on the define passed in.
@@ -262,7 +262,7 @@ void oled_write_raw_P(const char *data, uint16_t size);
 #    define oled_write_P(data, invert) oled_write(data, invert)
 #    define oled_write_ln_P(data, invert) oled_write(data, invert)
 #    define oled_write_raw_P(data, size) oled_write_raw(data, size)
-#endif  // defined(__AVR__)
+#endif // defined(__AVR__)
 
 // Can be used to manually turn on the screen if it is off
 // Returns true if the screen was on or turns on
diff --git a/drivers/oled/ssd1306_sh1106.c b/drivers/oled/ssd1306_sh1106.c
index d9bd3c14bd..30cfeb5648 100644
--- a/drivers/oled/ssd1306_sh1106.c
+++ b/drivers/oled/ssd1306_sh1106.c
@@ -53,7 +53,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define PAGE_ADDR 0x22
 #define PAM_SETCOLUMN_LSB 0x00
 #define PAM_SETCOLUMN_MSB 0x10
-#define PAM_PAGE_ADDR 0xB0  // 0xb0 -- 0xb7
+#define PAM_PAGE_ADDR 0xB0 // 0xb0 -- 0xb7
 
 // Hardware Configuration Commands
 #define DISPLAY_START_LINE 0x40
@@ -97,9 +97,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define I2C_DATA 0x40
 #if defined(__AVR__)
 #    define I2C_TRANSMIT_P(data) i2c_transmit_P((OLED_DISPLAY_ADDRESS << 1), &data[0], sizeof(data), OLED_I2C_TIMEOUT)
-#else  // defined(__AVR__)
+#else // defined(__AVR__)
 #    define I2C_TRANSMIT_P(data) i2c_transmit((OLED_DISPLAY_ADDRESS << 1), &data[0], sizeof(data), OLED_I2C_TIMEOUT)
-#endif  // defined(__AVR__)
+#endif // defined(__AVR__)
 #define I2C_TRANSMIT(data) i2c_transmit((OLED_DISPLAY_ADDRESS << 1), &data[0], sizeof(data), OLED_I2C_TIMEOUT)
 #define I2C_WRITE_REG(mode, data, size) i2c_writeReg((OLED_DISPLAY_ADDRESS << 1), mode, data, size, OLED_I2C_TIMEOUT)
 
@@ -119,7 +119,7 @@ bool            oled_inverted       = false;
 uint8_t         oled_brightness     = OLED_BRIGHTNESS;
 oled_rotation_t oled_rotation       = 0;
 uint8_t         oled_rotation_width = 0;
-uint8_t         oled_scroll_speed   = 0;  // this holds the speed after being remapped to ssd1306 internal values
+uint8_t         oled_scroll_speed   = 0; // this holds the speed after being remapped to ssd1306 internal values
 uint8_t         oled_scroll_start   = 0;
 uint8_t         oled_scroll_end     = 7;
 #if OLED_TIMEOUT > 0
@@ -190,7 +190,7 @@ bool oled_init(oled_rotation_t rotation) {
 #if (OLED_IC != OLED_IC_SH1106)
         // MEMORY_MODE is unsupported on SH1106 (Page Addressing only)
         MEMORY_MODE,
-        0x00,  // Horizontal addressing mode
+        0x00, // Horizontal addressing mode
 #endif
     };
     if (I2C_TRANSMIT_P(display_setup1) != I2C_STATUS_SUCCESS) {
@@ -232,8 +232,12 @@ bool oled_init(oled_rotation_t rotation) {
     return true;
 }
 
-__attribute__((weak)) oled_rotation_t oled_init_kb(oled_rotation_t rotation) { return rotation; }
-__attribute__((weak)) oled_rotation_t oled_init_user(oled_rotation_t rotation) { return rotation; }
+__attribute__((weak)) oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+    return rotation;
+}
+__attribute__((weak)) oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    return rotation;
+}
 
 void oled_clear(void) {
     memset(oled_buffer, 0, sizeof(oled_buffer));
@@ -306,9 +310,9 @@ void oled_render(void) {
     // Set column & page position
     static uint8_t display_start[] = {I2C_CMD, COLUMN_ADDR, 0, OLED_DISPLAY_WIDTH - 1, PAGE_ADDR, 0, OLED_DISPLAY_HEIGHT / 8 - 1};
     if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) {
-        calc_bounds(update_start, &display_start[1]);  // Offset from I2C_CMD byte at the start
+        calc_bounds(update_start, &display_start[1]); // Offset from I2C_CMD byte at the start
     } else {
-        calc_bounds_90(update_start, &display_start[1]);  // Offset from I2C_CMD byte at the start
+        calc_bounds_90(update_start, &display_start[1]); // Offset from I2C_CMD byte at the start
     }
 
     // Send column & page position
@@ -368,7 +372,8 @@ void oled_advance_page(bool clearPageRemainder) {
         remaining = remaining / OLED_FONT_WIDTH;
 
         // Write empty character until next line
-        while (remaining--) oled_write_char(' ', false);
+        while (remaining--)
+            oled_write_char(' ', false);
     } else {
         // Next page index out of bounds?
         if (index + remaining >= OLED_MATRIX_SIZE) {
@@ -419,7 +424,7 @@ void oled_write_char(const char data, bool invert) {
     _Static_assert(sizeof(font) >= ((OLED_FONT_END + 1 - OLED_FONT_START) * OLED_FONT_WIDTH), "OLED_FONT_END references outside array");
 
     // set the reder buffer data
-    uint8_t cast_data = (uint8_t)data;  // font based on unsigned type for index
+    uint8_t cast_data = (uint8_t)data; // font based on unsigned type for index
     if (cast_data < OLED_FONT_START || cast_data > OLED_FONT_END) {
         memset(oled_cursor, 0x00, OLED_FONT_WIDTH);
     } else {
@@ -545,7 +550,7 @@ void oled_write_raw_P(const char *data, uint16_t size) {
         oled_dirty |= ((OLED_BLOCK_TYPE)1 << (i / OLED_BLOCK_SIZE));
     }
 }
-#endif  // defined(__AVR__)
+#endif // defined(__AVR__)
 
 bool oled_on(void) {
     if (!oled_initialized) {
@@ -595,7 +600,9 @@ bool oled_off(void) {
     return !oled_active;
 }
 
-bool is_oled_on(void) { return oled_active; }
+bool is_oled_on(void) {
+    return oled_active;
+}
 
 uint8_t oled_set_brightness(uint8_t level) {
     if (!oled_initialized) {
@@ -613,7 +620,9 @@ uint8_t oled_set_brightness(uint8_t level) {
     return oled_brightness;
 }
 
-uint8_t oled_get_brightness(void) { return oled_brightness; }
+uint8_t oled_get_brightness(void) {
+    return oled_brightness;
+}
 
 // Set the specific 8 lines rows of the screen to scroll.
 // 0 is the default for start, and 7 for end, which is the entire
@@ -693,7 +702,9 @@ bool oled_scroll_off(void) {
     return !oled_scrolling;
 }
 
-bool is_oled_scrolling(void) { return oled_scrolling; }
+bool is_oled_scrolling(void) {
+    return oled_scrolling;
+}
 
 bool oled_invert(bool invert) {
     if (!oled_initialized) {
@@ -777,5 +788,9 @@ void oled_task(void) {
 #endif
 }
 
-__attribute__((weak)) bool oled_task_kb(void) { return oled_task_user(); }
-__attribute__((weak)) bool oled_task_user(void) { return true; }
+__attribute__((weak)) bool oled_task_kb(void) {
+    return oled_task_user();
+}
+__attribute__((weak)) bool oled_task_user(void) {
+    return true;
+}
diff --git a/drivers/ps2/ps2_busywait.c b/drivers/ps2/ps2_busywait.c
index 983194eea8..c5a0183bb7 100644
--- a/drivers/ps2/ps2_busywait.c
+++ b/drivers/ps2/ps2_busywait.c
@@ -71,12 +71,12 @@ uint8_t ps2_host_send(uint8_t data) {
 
     /* terminate a transmission if we have */
     inhibit();
-    wait_us(100);  // 100us [4]p.13, [5]p.50
+    wait_us(100); // 100us [4]p.13, [5]p.50
 
     /* 'Request to Send' and Start bit */
     data_lo();
     clock_hi();
-    WAIT(clock_lo, 10000, 10);  // 10ms [5]p.50
+    WAIT(clock_lo, 10000, 10); // 10ms [5]p.50
 
     /* Data bit */
     for (uint8_t i = 0; i < 8; i++) {
@@ -143,7 +143,7 @@ uint8_t ps2_host_recv(void) {
     idle();
 
     /* start bit [1] */
-    WAIT(clock_lo, 100, 1);  // TODO: this is enough?
+    WAIT(clock_lo, 100, 1); // TODO: this is enough?
     WAIT(data_lo, 1, 2);
     WAIT(clock_hi, 50, 3);
 
diff --git a/drivers/ps2/ps2_interrupt.c b/drivers/ps2/ps2_interrupt.c
index 70debd02f7..c49b4f8b75 100644
--- a/drivers/ps2/ps2_interrupt.c
+++ b/drivers/ps2/ps2_interrupt.c
@@ -43,7 +43,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #if defined(__AVR__)
 #    include <avr/interrupt.h>
-#elif defined(PROTOCOL_CHIBIOS)  // TODO: or STM32 ?
+#elif defined(PROTOCOL_CHIBIOS) // TODO: or STM32 ?
 // chibiOS headers
 #    include "ch.h"
 #    include "hal.h"
@@ -71,7 +71,9 @@ static inline void    pbuf_clear(void);
 
 #if defined(PROTOCOL_CHIBIOS)
 void ps2_interrupt_service_routine(void);
-void palCallback(void *arg) { ps2_interrupt_service_routine(); }
+void palCallback(void *arg) {
+    ps2_interrupt_service_routine();
+}
 
 #    define PS2_INT_INIT()                                 \
         { palSetLineMode(PS2_CLOCK_PIN, PAL_MODE_INPUT); } \
@@ -85,7 +87,7 @@ void palCallback(void *arg) { ps2_interrupt_service_routine(); }
 #    define PS2_INT_OFF()                       \
         { palDisableLineEvent(PS2_CLOCK_PIN); } \
         while (0)
-#endif  // PROTOCOL_CHIBIOS
+#endif // PROTOCOL_CHIBIOS
 
 void ps2_host_init(void) {
     idle();
@@ -103,12 +105,12 @@ uint8_t ps2_host_send(uint8_t data) {
 
     /* terminate a transmission if we have */
     inhibit();
-    wait_us(100);  // 100us [4]p.13, [5]p.50
+    wait_us(100); // 100us [4]p.13, [5]p.50
 
     /* 'Request to Send' and Start bit */
     data_lo();
     clock_hi();
-    WAIT(clock_lo, 10000, 10);  // 10ms [5]p.50
+    WAIT(clock_lo, 10000, 10); // 10ms [5]p.50
 
     /* Data bit[2-9] */
     for (uint8_t i = 0; i < 8; i++) {
@@ -244,7 +246,9 @@ RETURN:
 }
 
 #if defined(__AVR__)
-ISR(PS2_INT_VECT) { ps2_interrupt_service_routine(); }
+ISR(PS2_INT_VECT) {
+    ps2_interrupt_service_routine();
+}
 #endif
 
 /* send LED state to keyboard */
diff --git a/drivers/ps2/ps2_mouse.c b/drivers/ps2/ps2_mouse.c
index 8a6668b410..ccb0a929ae 100644
--- a/drivers/ps2/ps2_mouse.c
+++ b/drivers/ps2/ps2_mouse.c
@@ -42,7 +42,7 @@ static inline void ps2_mouse_scroll_button_task(report_mouse_t *mouse_report);
 void ps2_mouse_init(void) {
     ps2_host_init();
 
-    wait_ms(PS2_MOUSE_INIT_DELAY);  // wait for powering up
+    wait_ms(PS2_MOUSE_INIT_DELAY); // wait for powering up
 
     PS2_MOUSE_SEND(PS2_MOUSE_RESET, "ps2_mouse_init: sending reset");
 
@@ -113,9 +113,13 @@ void ps2_mouse_task(void) {
     ps2_mouse_clear_report(&mouse_report);
 }
 
-void ps2_mouse_disable_data_reporting(void) { PS2_MOUSE_SEND(PS2_MOUSE_DISABLE_DATA_REPORTING, "ps2 mouse disable data reporting"); }
+void ps2_mouse_disable_data_reporting(void) {
+    PS2_MOUSE_SEND(PS2_MOUSE_DISABLE_DATA_REPORTING, "ps2 mouse disable data reporting");
+}
 
-void ps2_mouse_enable_data_reporting(void) { PS2_MOUSE_SEND(PS2_MOUSE_ENABLE_DATA_REPORTING, "ps2 mouse enable data reporting"); }
+void ps2_mouse_enable_data_reporting(void) {
+    PS2_MOUSE_SEND(PS2_MOUSE_ENABLE_DATA_REPORTING, "ps2 mouse enable data reporting");
+}
 
 void ps2_mouse_set_remote_mode(void) {
     PS2_MOUSE_SEND_SAFE(PS2_MOUSE_SET_REMOTE_MODE, "ps2 mouse set remote mode");
@@ -127,13 +131,21 @@ void ps2_mouse_set_stream_mode(void) {
     ps2_mouse_mode = PS2_MOUSE_STREAM_MODE;
 }
 
-void ps2_mouse_set_scaling_2_1(void) { PS2_MOUSE_SEND_SAFE(PS2_MOUSE_SET_SCALING_2_1, "ps2 mouse set scaling 2:1"); }
+void ps2_mouse_set_scaling_2_1(void) {
+    PS2_MOUSE_SEND_SAFE(PS2_MOUSE_SET_SCALING_2_1, "ps2 mouse set scaling 2:1");
+}
 
-void ps2_mouse_set_scaling_1_1(void) { PS2_MOUSE_SEND_SAFE(PS2_MOUSE_SET_SCALING_1_1, "ps2 mouse set scaling 1:1"); }
+void ps2_mouse_set_scaling_1_1(void) {
+    PS2_MOUSE_SEND_SAFE(PS2_MOUSE_SET_SCALING_1_1, "ps2 mouse set scaling 1:1");
+}
 
-void ps2_mouse_set_resolution(ps2_mouse_resolution_t resolution) { PS2_MOUSE_SET_SAFE(PS2_MOUSE_SET_RESOLUTION, resolution, "ps2 mouse set resolution"); }
+void ps2_mouse_set_resolution(ps2_mouse_resolution_t resolution) {
+    PS2_MOUSE_SET_SAFE(PS2_MOUSE_SET_RESOLUTION, resolution, "ps2 mouse set resolution");
+}
 
-void ps2_mouse_set_sample_rate(ps2_mouse_sample_rate_t sample_rate) { PS2_MOUSE_SET_SAFE(PS2_MOUSE_SET_SAMPLE_RATE, sample_rate, "ps2 mouse set sample rate"); }
+void ps2_mouse_set_sample_rate(ps2_mouse_sample_rate_t sample_rate) {
+    PS2_MOUSE_SET_SAFE(PS2_MOUSE_SET_SAMPLE_RATE, sample_rate, "ps2 mouse set sample rate");
+}
 
 /* ============================= HELPERS ============================ */
 
@@ -165,7 +177,7 @@ static inline void ps2_mouse_convert_report_to_hid(report_mouse_t *mouse_report)
 #ifdef PS2_MOUSE_INVERT_X
     mouse_report->x = -mouse_report->x;
 #endif
-#ifndef PS2_MOUSE_INVERT_Y  // NOTE if not!
+#ifndef PS2_MOUSE_INVERT_Y // NOTE if not!
     // invert coordinate of y to conform to USB HID mouse
     mouse_report->y = -mouse_report->y;
 #endif
diff --git a/drivers/sensors/adns5050.c b/drivers/sensors/adns5050.c
index c23d24d5af..b76268fba2 100644
--- a/drivers/sensors/adns5050.c
+++ b/drivers/sensors/adns5050.c
@@ -74,9 +74,13 @@ void adns5050_sync(void) {
     writePinHigh(ADNS5050_CS_PIN);
 }
 
-void adns5050_cs_select(void) { writePinLow(ADNS5050_CS_PIN); }
+void adns5050_cs_select(void) {
+    writePinLow(ADNS5050_CS_PIN);
+}
 
-void adns5050_cs_deselect(void) { writePinHigh(ADNS5050_CS_PIN); }
+void adns5050_cs_deselect(void) {
+    writePinHigh(ADNS5050_CS_PIN);
+}
 
 uint8_t adns5050_serial_read(void) {
     setPinInput(ADNS5050_SDIO_PIN);
@@ -190,7 +194,7 @@ int8_t convert_twoscomp(uint8_t data) {
 
 // Don't forget to use the definitions for CPI in the header file.
 void adns5050_set_cpi(uint16_t cpi) {
-    uint8_t cpival = constrain((cpi / 125), 0x1, 0xD);  // limits to 0--119
+    uint8_t cpival = constrain((cpi / 125), 0x1, 0xD); // limits to 0--119
 
     adns5050_write_reg(REG_MOUSE_CONTROL2, 0b10000 | cpival);
 }
diff --git a/drivers/sensors/adns9800.c b/drivers/sensors/adns9800.c
index d167841968..3633f23e52 100644
--- a/drivers/sensors/adns9800.c
+++ b/drivers/sensors/adns9800.c
@@ -77,7 +77,9 @@
 #define MSB1              0x80
 // clang-format on
 
-void adns9800_spi_start(void) { spi_start(ADNS9800_CS_PIN, false, ADNS9800_SPI_MODE, ADNS9800_SPI_DIVISOR); }
+void adns9800_spi_start(void) {
+    spi_start(ADNS9800_CS_PIN, false, ADNS9800_SPI_MODE, ADNS9800_SPI_DIVISOR);
+}
 
 void adns9800_write(uint8_t reg_addr, uint8_t data) {
     adns9800_spi_start();
diff --git a/drivers/sensors/analog_joystick.c b/drivers/sensors/analog_joystick.c
index 1666bed047..95f8cff23a 100644
--- a/drivers/sensors/analog_joystick.c
+++ b/drivers/sensors/analog_joystick.c
@@ -24,7 +24,7 @@ uint16_t minAxisValue = ANALOG_JOYSTICK_AXIS_MIN;
 uint16_t maxAxisValue = ANALOG_JOYSTICK_AXIS_MAX;
 
 uint8_t maxCursorSpeed = ANALOG_JOYSTICK_SPEED_MAX;
-uint8_t speedRegulator = ANALOG_JOYSTICK_SPEED_REGULATOR;  // Lower Values Create Faster Movement
+uint8_t speedRegulator = ANALOG_JOYSTICK_SPEED_REGULATOR; // Lower Values Create Faster Movement
 
 int16_t xOrigin, yOrigin;
 
diff --git a/drivers/sensors/cirque_pinnacle.c b/drivers/sensors/cirque_pinnacle.c
index b807c4f076..2db7f916fe 100644
--- a/drivers/sensors/cirque_pinnacle.c
+++ b/drivers/sensors/cirque_pinnacle.c
@@ -54,7 +54,9 @@ void RAP_ReadBytes(uint8_t address, uint8_t* data, uint8_t count);
 void RAP_Write(uint8_t address, uint8_t data);
 
 #ifdef CONSOLE_ENABLE
-void print_byte(uint8_t byte) { xprintf("%c%c%c%c%c%c%c%c|", (byte & 0x80 ? '1' : '0'), (byte & 0x40 ? '1' : '0'), (byte & 0x20 ? '1' : '0'), (byte & 0x10 ? '1' : '0'), (byte & 0x08 ? '1' : '0'), (byte & 0x04 ? '1' : '0'), (byte & 0x02 ? '1' : '0'), (byte & 0x01 ? '1' : '0')); }
+void print_byte(uint8_t byte) {
+    xprintf("%c%c%c%c%c%c%c%c|", (byte & 0x80 ? '1' : '0'), (byte & 0x40 ? '1' : '0'), (byte & 0x20 ? '1' : '0'), (byte & 0x10 ? '1' : '0'), (byte & 0x08 ? '1' : '0'), (byte & 0x04 ? '1' : '0'), (byte & 0x02 ? '1' : '0'), (byte & 0x01 ? '1' : '0'));
+}
 #endif
 
 /*  Logical Scaling Functions */
@@ -73,8 +75,12 @@ void ClipCoordinates(pinnacle_data_t* coordinates) {
     }
 }
 
-uint16_t cirque_pinnacle_get_scale(void) { return scale_data; }
-void     cirque_pinnacle_set_scale(uint16_t scale) { scale_data = scale; }
+uint16_t cirque_pinnacle_get_scale(void) {
+    return scale_data;
+}
+void cirque_pinnacle_set_scale(uint16_t scale) {
+    scale_data = scale;
+}
 
 // Scales data to desired X & Y resolution
 void cirque_pinnacle_scale_data(pinnacle_data_t* coordinates, uint16_t xResolution, uint16_t yResolution) {
@@ -105,13 +111,13 @@ void cirque_pinnacle_clear_flags() {
 void cirque_pinnacle_enable_feed(bool feedEnable) {
     uint8_t temp;
 
-    RAP_ReadBytes(FEEDCONFIG_1, &temp, 1);  // Store contents of FeedConfig1 register
+    RAP_ReadBytes(FEEDCONFIG_1, &temp, 1); // Store contents of FeedConfig1 register
 
     if (feedEnable) {
-        temp |= 0x01;  // Set Feed Enable bit
+        temp |= 0x01; // Set Feed Enable bit
         RAP_Write(0x04, temp);
     } else {
-        temp &= ~0x01;  // Clear Feed Enable bit
+        temp &= ~0x01; // Clear Feed Enable bit
         RAP_Write(0x04, temp);
     }
 }
@@ -122,13 +128,13 @@ void cirque_pinnacle_enable_feed(bool feedEnable) {
 void ERA_ReadBytes(uint16_t address, uint8_t* data, uint16_t count) {
     uint8_t ERAControlValue = 0xFF;
 
-    cirque_pinnacle_enable_feed(false);  // Disable feed
+    cirque_pinnacle_enable_feed(false); // Disable feed
 
-    RAP_Write(ERA_HIGH_BYTE, (uint8_t)(address >> 8));     // Send upper byte of ERA address
-    RAP_Write(ERA_LOW_BYTE, (uint8_t)(address & 0x00FF));  // Send lower byte of ERA address
+    RAP_Write(ERA_HIGH_BYTE, (uint8_t)(address >> 8));    // Send upper byte of ERA address
+    RAP_Write(ERA_LOW_BYTE, (uint8_t)(address & 0x00FF)); // Send lower byte of ERA address
 
     for (uint16_t i = 0; i < count; i++) {
-        RAP_Write(ERA_CONTROL, 0x05);  // Signal ERA-read (auto-increment) to Pinnacle
+        RAP_Write(ERA_CONTROL, 0x05); // Signal ERA-read (auto-increment) to Pinnacle
 
         // Wait for status register 0x1E to clear
         do {
@@ -145,14 +151,14 @@ void ERA_ReadBytes(uint16_t address, uint8_t* data, uint16_t count) {
 void ERA_WriteByte(uint16_t address, uint8_t data) {
     uint8_t ERAControlValue = 0xFF;
 
-    cirque_pinnacle_enable_feed(false);  // Disable feed
+    cirque_pinnacle_enable_feed(false); // Disable feed
 
-    RAP_Write(ERA_VALUE, data);  // Send data byte to be written
+    RAP_Write(ERA_VALUE, data); // Send data byte to be written
 
-    RAP_Write(ERA_HIGH_BYTE, (uint8_t)(address >> 8));     // Upper byte of ERA address
-    RAP_Write(ERA_LOW_BYTE, (uint8_t)(address & 0x00FF));  // Lower byte of ERA address
+    RAP_Write(ERA_HIGH_BYTE, (uint8_t)(address >> 8));    // Upper byte of ERA address
+    RAP_Write(ERA_LOW_BYTE, (uint8_t)(address & 0x00FF)); // Lower byte of ERA address
 
-    RAP_Write(ERA_CONTROL, 0x02);  // Signal an ERA-write to Pinnacle
+    RAP_Write(ERA_CONTROL, 0x02); // Signal an ERA-write to Pinnacle
 
     // Wait for status register 0x1E to clear
     do {
@@ -166,7 +172,7 @@ void cirque_pinnacle_set_adc_attenuation(uint8_t adcGain) {
     uint8_t temp = 0x00;
 
     ERA_ReadBytes(0x0187, &temp, 1);
-    temp &= 0x3F;  // clear top two bits
+    temp &= 0x3F; // clear top two bits
     temp |= adcGain;
     ERA_WriteByte(0x0187, temp);
     ERA_ReadBytes(0x0187, &temp, 1);
diff --git a/drivers/sensors/cirque_pinnacle.h b/drivers/sensors/cirque_pinnacle.h
index db891122a6..c8cb360e03 100644
--- a/drivers/sensors/cirque_pinnacle.h
+++ b/drivers/sensors/cirque_pinnacle.h
@@ -26,16 +26,16 @@ void            cirque_pinnacle_set_scale(uint16_t scale);
 
 // Coordinate scaling values
 #ifndef CIRQUE_PINNACLE_X_LOWER
-#    define CIRQUE_PINNACLE_X_LOWER 127  // min "reachable" X value
+#    define CIRQUE_PINNACLE_X_LOWER 127 // min "reachable" X value
 #endif
 #ifndef CIRQUE_PINNACLE_X_UPPER
-#    define CIRQUE_PINNACLE_X_UPPER 1919  // max "reachable" X value
+#    define CIRQUE_PINNACLE_X_UPPER 1919 // max "reachable" X value
 #endif
 #ifndef CIRQUE_PINNACLE_Y_LOWER
-#    define CIRQUE_PINNACLE_Y_LOWER 63  // min "reachable" Y value
+#    define CIRQUE_PINNACLE_Y_LOWER 63 // min "reachable" Y value
 #endif
 #ifndef CIRQUE_PINNACLE_Y_UPPER
-#    define CIRQUE_PINNACLE_Y_UPPER 1471  // max "reachable" Y value
+#    define CIRQUE_PINNACLE_Y_UPPER 1471 // max "reachable" Y value
 #endif
 #ifndef CIRQUE_PINNACLE_X_RANGE
 #    define CIRQUE_PINNACLE_X_RANGE (CIRQUE_PINNACLE_X_UPPER - CIRQUE_PINNACLE_X_LOWER)
diff --git a/drivers/sensors/cirque_pinnacle_i2c.c b/drivers/sensors/cirque_pinnacle_i2c.c
index 81dd982b0c..8a38f1dcea 100644
--- a/drivers/sensors/cirque_pinnacle_i2c.c
+++ b/drivers/sensors/cirque_pinnacle_i2c.c
@@ -14,7 +14,7 @@ extern bool touchpad_init;
 /*  RAP Functions */
 // Reads <count> Pinnacle registers starting at <address>
 void RAP_ReadBytes(uint8_t address, uint8_t* data, uint8_t count) {
-    uint8_t cmdByte = READ_MASK | address;  // Form the READ command byte
+    uint8_t cmdByte = READ_MASK | address; // Form the READ command byte
     if (touchpad_init) {
         i2c_writeReg(CIRQUE_PINNACLE_ADDR << 1, cmdByte, NULL, 0, CIRQUE_PINNACLE_TIMEOUT);
         if (i2c_readReg(CIRQUE_PINNACLE_ADDR << 1, cmdByte, data, count, CIRQUE_PINNACLE_TIMEOUT) != I2C_STATUS_SUCCESS) {
@@ -29,7 +29,7 @@ void RAP_ReadBytes(uint8_t address, uint8_t* data, uint8_t count) {
 
 // Writes single-byte <data> to <address>
 void RAP_Write(uint8_t address, uint8_t data) {
-    uint8_t cmdByte = WRITE_MASK | address;  // Form the WRITE command byte
+    uint8_t cmdByte = WRITE_MASK | address; // Form the WRITE command byte
 
     if (touchpad_init) {
         if (i2c_writeReg(CIRQUE_PINNACLE_ADDR << 1, cmdByte, &data, sizeof(data), CIRQUE_PINNACLE_TIMEOUT) != I2C_STATUS_SUCCESS) {
diff --git a/drivers/sensors/cirque_pinnacle_spi.c b/drivers/sensors/cirque_pinnacle_spi.c
index ed40abd9fa..e00e73eb8c 100644
--- a/drivers/sensors/cirque_pinnacle_spi.c
+++ b/drivers/sensors/cirque_pinnacle_spi.c
@@ -13,14 +13,14 @@ extern bool touchpad_init;
 /*  RAP Functions */
 // Reads <count> Pinnacle registers starting at <address>
 void RAP_ReadBytes(uint8_t address, uint8_t* data, uint8_t count) {
-    uint8_t cmdByte = READ_MASK | address;  // Form the READ command byte
+    uint8_t cmdByte = READ_MASK | address; // Form the READ command byte
     if (touchpad_init) {
         if (spi_start(CIRQUE_PINNACLE_SPI_CS_PIN, CIRQUE_PINNACLE_SPI_LSBFIRST, CIRQUE_PINNACLE_SPI_MODE, CIRQUE_PINNACLE_SPI_DIVISOR)) {
             spi_write(cmdByte);
-            spi_read();  // filler
-            spi_read();  // filler
+            spi_read(); // filler
+            spi_read(); // filler
             for (uint8_t i = 0; i < count; i++) {
-                data[i] = spi_read();  // each sepsequent read gets another register's contents
+                data[i] = spi_read(); // each sepsequent read gets another register's contents
             }
         } else {
 #ifdef CONSOLE_ENABLE
@@ -34,7 +34,7 @@ void RAP_ReadBytes(uint8_t address, uint8_t* data, uint8_t count) {
 
 // Writes single-byte <data> to <address>
 void RAP_Write(uint8_t address, uint8_t data) {
-    uint8_t cmdByte = WRITE_MASK | address;  // Form the WRITE command byte
+    uint8_t cmdByte = WRITE_MASK | address; // Form the WRITE command byte
 
     if (touchpad_init) {
         if (spi_start(CIRQUE_PINNACLE_SPI_CS_PIN, CIRQUE_PINNACLE_SPI_LSBFIRST, CIRQUE_PINNACLE_SPI_MODE, CIRQUE_PINNACLE_SPI_DIVISOR)) {
diff --git a/drivers/sensors/pimoroni_trackball.c b/drivers/sensors/pimoroni_trackball.c
index 2867e763bc..333e017a06 100644
--- a/drivers/sensors/pimoroni_trackball.c
+++ b/drivers/sensors/pimoroni_trackball.c
@@ -33,7 +33,9 @@
 
 static uint16_t precision = 128;
 
-uint16_t pimoroni_trackball_get_cpi(void) { return (precision * 125); }
+uint16_t pimoroni_trackball_get_cpi(void) {
+    return (precision * 125);
+}
 /**
  * @brief Sets the scaling value for pimoroni trackball
  *
diff --git a/drivers/sensors/pmw3360.c b/drivers/sensors/pmw3360.c
index 8d1b08e22b..8c977be1c8 100644
--- a/drivers/sensors/pmw3360.c
+++ b/drivers/sensors/pmw3360.c
@@ -86,7 +86,9 @@
 bool _inBurst = false;
 
 #ifdef CONSOLE_ENABLE
-void print_byte(uint8_t byte) { dprintf("%c%c%c%c%c%c%c%c|", (byte & 0x80 ? '1' : '0'), (byte & 0x40 ? '1' : '0'), (byte & 0x20 ? '1' : '0'), (byte & 0x10 ? '1' : '0'), (byte & 0x08 ? '1' : '0'), (byte & 0x04 ? '1' : '0'), (byte & 0x02 ? '1' : '0'), (byte & 0x01 ? '1' : '0')); }
+void print_byte(uint8_t byte) {
+    dprintf("%c%c%c%c%c%c%c%c|", (byte & 0x80 ? '1' : '0'), (byte & 0x40 ? '1' : '0'), (byte & 0x20 ? '1' : '0'), (byte & 0x10 ? '1' : '0'), (byte & 0x08 ? '1' : '0'), (byte & 0x04 ? '1' : '0'), (byte & 0x02 ? '1' : '0'), (byte & 0x01 ? '1' : '0'));
+}
 #endif
 #define constrain(amt, low, high) ((amt) < (low) ? (low) : ((amt) > (high) ? (high) : (amt)))
 
@@ -144,7 +146,7 @@ bool pmw3360_init(void) {
     pmw3360_spi_start();
     spi_stop();
 
-    pmw3360_write(REG_Shutdown, 0xb6);  // Shutdown first
+    pmw3360_write(REG_Shutdown, 0xb6); // Shutdown first
     wait_ms(300);
 
     pmw3360_spi_start();
@@ -222,7 +224,7 @@ bool pmw3360_check_signature(void) {
     uint8_t pid      = pmw3360_read(REG_Product_ID);
     uint8_t iv_pid   = pmw3360_read(REG_Inverse_Product_ID);
     uint8_t SROM_ver = pmw3360_read(REG_SROM_ID);
-    return (pid == firmware_signature[0] && iv_pid == firmware_signature[1] && SROM_ver == firmware_signature[2]);  // signature for SROM 0x04
+    return (pid == firmware_signature[0] && iv_pid == firmware_signature[1] && SROM_ver == firmware_signature[2]); // signature for SROM 0x04
 }
 
 uint16_t pmw3360_get_cpi(void) {
@@ -248,17 +250,17 @@ report_pmw3360_t pmw3360_read_burst(void) {
 
     pmw3360_spi_start();
     spi_write(REG_Motion_Burst);
-    wait_us(35);  // waits for tSRAD_MOTBR
+    wait_us(35); // waits for tSRAD_MOTBR
 
     report.motion = spi_read();
-    spi_read();  // skip Observation
+    spi_read(); // skip Observation
     // delta registers
     report.dx  = spi_read();
     report.mdx = spi_read();
     report.dy  = spi_read();
     report.mdy = spi_read();
 
-    if (report.motion & 0b111) {  // panic recovery, sometimes burst mode works weird.
+    if (report.motion & 0b111) { // panic recovery, sometimes burst mode works weird.
         _inBurst = false;
     }
 
diff --git a/drivers/sensors/pmw3360.h b/drivers/sensors/pmw3360.h
index 4e17aa0c46..eec7295871 100644
--- a/drivers/sensors/pmw3360.h
+++ b/drivers/sensors/pmw3360.h
@@ -58,11 +58,11 @@
 
 typedef struct {
     int8_t  motion;
-    bool    isMotion;     // True if a motion is detected.
-    bool    isOnSurface;  // True when a chip is on a surface
-    int16_t dx;           // displacement on x directions. Unit: Count. (CPI * Count = Inch value)
+    bool    isMotion;    // True if a motion is detected.
+    bool    isOnSurface; // True when a chip is on a surface
+    int16_t dx;          // displacement on x directions. Unit: Count. (CPI * Count = Inch value)
     int8_t  mdx;
-    int16_t dy;  // displacement on y directions.
+    int16_t dy; // displacement on y directions.
     int8_t  mdy;
 } report_pmw3360_t;
 
diff --git a/drivers/sensors/pmw3389.c b/drivers/sensors/pmw3389.c
index 963925bd38..828dafa134 100644
--- a/drivers/sensors/pmw3389.c
+++ b/drivers/sensors/pmw3389.c
@@ -90,7 +90,9 @@
 bool _inBurst = false;
 
 #ifdef CONSOLE_ENABLE
-void print_byte(uint8_t byte) { dprintf("%c%c%c%c%c%c%c%c|", (byte & 0x80 ? '1' : '0'), (byte & 0x40 ? '1' : '0'), (byte & 0x20 ? '1' : '0'), (byte & 0x10 ? '1' : '0'), (byte & 0x08 ? '1' : '0'), (byte & 0x04 ? '1' : '0'), (byte & 0x02 ? '1' : '0'), (byte & 0x01 ? '1' : '0')); }
+void print_byte(uint8_t byte) {
+    dprintf("%c%c%c%c%c%c%c%c|", (byte & 0x80 ? '1' : '0'), (byte & 0x40 ? '1' : '0'), (byte & 0x20 ? '1' : '0'), (byte & 0x10 ? '1' : '0'), (byte & 0x08 ? '1' : '0'), (byte & 0x04 ? '1' : '0'), (byte & 0x02 ? '1' : '0'), (byte & 0x01 ? '1' : '0'));
+}
 #endif
 #define constrain(amt, low, high) ((amt) < (low) ? (low) : ((amt) > (high) ? (high) : (amt)))
 
@@ -148,7 +150,7 @@ bool pmw3389_init(void) {
     pmw3389_spi_start();
     spi_stop();
 
-    pmw3389_write(REG_Shutdown, 0xb6);  // Shutdown first
+    pmw3389_write(REG_Shutdown, 0xb6); // Shutdown first
     wait_ms(300);
 
     pmw3389_spi_start();
@@ -226,7 +228,7 @@ bool pmw3389_check_signature(void) {
     uint8_t pid      = pmw3389_read(REG_Product_ID);
     uint8_t iv_pid   = pmw3389_read(REG_Inverse_Product_ID);
     uint8_t SROM_ver = pmw3389_read(REG_SROM_ID);
-    return (pid == firmware_signature[0] && iv_pid == firmware_signature[1] && SROM_ver == firmware_signature[2]);  // signature for SROM 0x04
+    return (pid == firmware_signature[0] && iv_pid == firmware_signature[1] && SROM_ver == firmware_signature[2]); // signature for SROM 0x04
 }
 
 uint16_t pmw3389_get_cpi(void) {
@@ -254,17 +256,17 @@ report_pmw3389_t pmw3389_read_burst(void) {
 
     pmw3389_spi_start();
     spi_write(REG_Motion_Burst);
-    wait_us(35);  // waits for tSRAD_MOTBR
+    wait_us(35); // waits for tSRAD_MOTBR
 
     report.motion = spi_read();
-    spi_read();  // skip Observation
+    spi_read(); // skip Observation
     // delta registers
     report.dx  = spi_read();
     report.mdx = spi_read();
     report.dy  = spi_read();
     report.mdy = spi_read();
 
-    if (report.motion & 0b111) {  // panic recovery, sometimes burst mode works weird.
+    if (report.motion & 0b111) { // panic recovery, sometimes burst mode works weird.
         _inBurst = false;
     }
 
diff --git a/drivers/sensors/pmw3389.h b/drivers/sensors/pmw3389.h
index a7c95e6076..db4a763fe3 100644
--- a/drivers/sensors/pmw3389.h
+++ b/drivers/sensors/pmw3389.h
@@ -59,11 +59,11 @@
 
 typedef struct {
     int8_t  motion;
-    bool    isMotion;     // True if a motion is detected.
-    bool    isOnSurface;  // True when a chip is on a surface
-    int16_t dx;           // displacement on x directions. Unit: Count. (CPI * Count = Inch value)
+    bool    isMotion;    // True if a motion is detected.
+    bool    isOnSurface; // True when a chip is on a surface
+    int16_t dx;          // displacement on x directions. Unit: Count. (CPI * Count = Inch value)
     int8_t  mdx;
-    int16_t dy;  // displacement on y directions.
+    int16_t dy; // displacement on y directions.
     int8_t  mdy;
 } report_pmw3389_t;
 
diff --git a/drivers/usb2422.c b/drivers/usb2422.c
index 62b919093b..8ee54b24ee 100644
--- a/drivers/usb2422.c
+++ b/drivers/usb2422.c
@@ -352,7 +352,7 @@ void USB2422_init() {
     setPinInput(USB2422_ACTIVE_PIN);
 #endif
 
-    i2c_init();  // IC2 clk must be high at USB2422 reset release time to signal SMB configuration
+    i2c_init(); // IC2 clk must be high at USB2422 reset release time to signal SMB configuration
 }
 
 void USB2422_configure() {
@@ -363,14 +363,14 @@ void USB2422_configure() {
     // configure Usb2422 registers
     config.VID.reg               = USB2422_VENDOR_ID;
     config.PID.reg               = USB2422_PRODUCT_ID;
-    config.DID.reg               = USB2422_DEVICE_VER;  // BCD format, eg 01.01
-    config.CFG1.bit.SELF_BUS_PWR = 1;                   // self powered for now
-    config.CFG1.bit.HS_DISABLE   = 1;                   // full or high speed
+    config.DID.reg               = USB2422_DEVICE_VER; // BCD format, eg 01.01
+    config.CFG1.bit.SELF_BUS_PWR = 1;                  // self powered for now
+    config.CFG1.bit.HS_DISABLE   = 1;                  // full or high speed
     // config.CFG2.bit.COMPOUND = 0; // compound device
-    config.CFG3.bit.STRING_EN = 1;  // strings enabled
+    config.CFG3.bit.STRING_EN = 1; // strings enabled
     // config.NRD.bit.PORT2_NR = 0; // MCU is non-removable
-    config.MAXPB.reg = 20;  // 0mA
-    config.HCMCB.reg = 20;  // 0mA
+    config.MAXPB.reg = 20; // 0mA
+    config.HCMCB.reg = 20; // 0mA
     config.MFRSL.reg = sizeof(USB2422_MANUFACTURER);
     config.PRDSL.reg = sizeof(USB2422_PRODUCT);
     config.SERSL.reg = sizeof(SERNAME);
diff --git a/drivers/ws2812.h b/drivers/ws2812.h
index 945b3d0728..5985b5340c 100644
--- a/drivers/ws2812.h
+++ b/drivers/ws2812.h
@@ -33,19 +33,19 @@
 #endif
 
 #ifndef WS2812_T1H
-#    define WS2812_T1H 900  // Width of a 1 bit in ns
+#    define WS2812_T1H 900 // Width of a 1 bit in ns
 #endif
 
 #ifndef WS2812_T1L
-#    define WS2812_T1L (WS2812_TIMING - WS2812_T1H)  // Width of a 1 bit in ns
+#    define WS2812_T1L (WS2812_TIMING - WS2812_T1H) // Width of a 1 bit in ns
 #endif
 
 #ifndef WS2812_T0H
-#    define WS2812_T0H 350  // Width of a 0 bit in ns
+#    define WS2812_T0H 350 // Width of a 0 bit in ns
 #endif
 
 #ifndef WS2812_T0L
-#    define WS2812_T0L (WS2812_TIMING - WS2812_T0H)  // Width of a 0 bit in ns
+#    define WS2812_T0L (WS2812_TIMING - WS2812_T0H) // Width of a 0 bit in ns
 #endif
 
 /*
diff --git a/data/templates/ps2avrgb/config.h b/keyboards/1upkeyboards/super16v2/config.h
similarity index 51%
rename from data/templates/ps2avrgb/config.h
rename to keyboards/1upkeyboards/super16v2/config.h
index ef29da0de0..4fd4238780 100644
--- a/data/templates/ps2avrgb/config.h
+++ b/keyboards/1upkeyboards/super16v2/config.h
@@ -1,20 +1,33 @@
-// Copyright %(YEAR)s %(YOUR_NAME)s (@%(USER_NAME)s)
-// SPDX-License-Identifier: GPL-2.0-or-later
+/* Copyright 2022 MechMerlin
+ *
+ * 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"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID    0xFEED
-#define PRODUCT_ID   0x0000
+#define VENDOR_ID    0x6F75 // OU
+#define PRODUCT_ID   0x5517
 #define DEVICE_VER   0x0001
-#define MANUFACTURER %(USER_NAME)s
-#define PRODUCT      %(KEYBOARD)s
+#define MANUFACTURER 1upkeyboards
+#define PRODUCT      super16v2
 
 /* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 15
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 4
 
 /*
  * Keyboard Matrix Assignments
@@ -26,45 +39,55 @@
  *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
  *
  */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
+
+//                         0   1   2   3
+#define MATRIX_ROW_PINS { D1, D2, D3, D4 }
+#define MATRIX_COL_PINS { D5, D6, C2, D0 }
+
 #define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-//#define LED_NUM_LOCK_PIN D0
-//#define LED_CAPS_LOCK_PIN D1
-//#define LED_SCROLL_LOCK_PIN D6
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
 
-#define BACKLIGHT_PIN D4
+//#define LED_NUM_LOCK_PIN B0
+//#define LED_CAPS_LOCK_PIN B1
+//#define LED_SCROLL_LOCK_PIN B2
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+//#define BACKLIGHT_PIN B7
 //#define BACKLIGHT_LEVELS 3
 //#define BACKLIGHT_BREATHING
 
-#define RGBLED_NUM 16
-//#define RGBLIGHT_HUE_STEP 8
-//#define RGBLIGHT_SAT_STEP 8
-//#define RGBLIGHT_VAL_STEP 8
-//#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-//#define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#define RGBLIGHT_EFFECT_BREATHING
-//#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#define RGBLIGHT_EFFECT_SNAKE
-//#define RGBLIGHT_EFFECT_KNIGHT
-//#define RGBLIGHT_EFFECT_CHRISTMAS
-//#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#define RGBLIGHT_EFFECT_RGB_TEST
-//#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGB_DI_PIN B5
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 20
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
-//#define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
 /*==== use exp() and sin() ====*/
-//#define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
-//#define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+#endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
@@ -119,6 +142,10 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/1upkeyboards/super16v2/info.json b/keyboards/1upkeyboards/super16v2/info.json
new file mode 100644
index 0000000000..2a384f775d
--- /dev/null
+++ b/keyboards/1upkeyboards/super16v2/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "super16v2",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+      "LAYOUT_ortho_4x4": {
+        "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}]
+      }
+    }
+  }
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/super16v2/keymaps/default/keymap.c b/keyboards/1upkeyboards/super16v2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..dc58023a37
--- /dev/null
+++ b/keyboards/1upkeyboards/super16v2/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2022 MechMerlin
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_ortho_4x4( /* Base */
+    KC_P7,    KC_P8,    KC_P9,    KC_PMNS,
+    KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
+    KC_P1,    KC_P2,    KC_P3,    KC_PSLS,
+    MO(1),    KC_P0,    KC_PDOT,  KC_PENT
+  ),
+
+  [1] = LAYOUT_ortho_4x4( /* Fn Layer */
+    RGB_TOG,   RGB_HUI,    RGB_SAI,    RGB_VAI,
+    RGB_MOD,   RGB_HUD,    RGB_SAD,    RGB_VAD,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    RESET
+  ),
+};
+
diff --git a/keyboards/1upkeyboards/super16v2/keymaps/default/readme.md b/keyboards/1upkeyboards/super16v2/keymaps/default/readme.md
new file mode 100644
index 0000000000..e229fcba74
--- /dev/null
+++ b/keyboards/1upkeyboards/super16v2/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for Super 16 V2
diff --git a/keyboards/1upkeyboards/super16v2/keymaps/via/keymap.c b/keyboards/1upkeyboards/super16v2/keymaps/via/keymap.c
new file mode 100644
index 0000000000..7e8f41b909
--- /dev/null
+++ b/keyboards/1upkeyboards/super16v2/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2022 MechMerlin
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_ortho_4x4( /* Base */
+    KC_P7,    KC_P8,    KC_P9,    KC_PMNS,
+    KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
+    KC_P1,    KC_P2,    KC_P3,    KC_PSLS,
+    MO(1),    KC_P0,    KC_PDOT,  KC_PENT
+  ),
+
+  [1] = LAYOUT_ortho_4x4( /* Fn Layer */
+    RGB_TOG,   RGB_HUI,    RGB_SAI,    RGB_VAI,
+    RGB_MOD,   RGB_HUD,    RGB_SAD,    RGB_VAD,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    RESET
+  ),
+
+  [2] = LAYOUT_ortho_4x4( 
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS
+  ),
+
+  [3] = LAYOUT_ortho_4x4( 
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS
+  ),
+};
+
diff --git a/keyboards/1upkeyboards/super16v2/keymaps/via/readme.md b/keyboards/1upkeyboards/super16v2/keymaps/via/readme.md
new file mode 100644
index 0000000000..e229fcba74
--- /dev/null
+++ b/keyboards/1upkeyboards/super16v2/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The default keymap for Super 16 V2
diff --git a/keyboards/latin17rgb/keymaps/via/rules.mk b/keyboards/1upkeyboards/super16v2/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/latin17rgb/keymaps/via/rules.mk
rename to keyboards/1upkeyboards/super16v2/keymaps/via/rules.mk
diff --git a/keyboards/1upkeyboards/super16v2/readme.md b/keyboards/1upkeyboards/super16v2/readme.md
new file mode 100644
index 0000000000..b2c0ca747b
--- /dev/null
+++ b/keyboards/1upkeyboards/super16v2/readme.md
@@ -0,0 +1,25 @@
+# Super 16 V2
+
+A 4x4 macropad with RGB inswitch lighting and underglow. 
+
+* Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin)
+* Hardware Supported: 1upkeyboards Super 16 V2
+* Hardware Availability: [1upkeyboards](https://1upkeyboards.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 1upkeyboards/super16v2:default
+
+Flashing example for this keyboard:
+
+    make 1upkeyboards/super16v2:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/1upkeyboards/super16v2/rules.mk b/keyboards/1upkeyboards/super16v2/rules.mk
new file mode 100644
index 0000000000..d31d53cead
--- /dev/null
+++ b/keyboards/1upkeyboards/super16v2/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u2
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+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            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/1upkeyboards/super16v2/super16v2.c b/keyboards/1upkeyboards/super16v2/super16v2.c
new file mode 100644
index 0000000000..fc73f700c4
--- /dev/null
+++ b/keyboards/1upkeyboards/super16v2/super16v2.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 MechMerlin
+ *
+ * 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 "super16v2.h"
diff --git a/keyboards/1upkeyboards/super16v2/super16v2.h b/keyboards/1upkeyboards/super16v2/super16v2.h
new file mode 100644
index 0000000000..58fd26ed8a
--- /dev/null
+++ b/keyboards/1upkeyboards/super16v2/super16v2.h
@@ -0,0 +1,39 @@
+/* Copyright 2022 MechMerlin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_ortho_4x4( \
+    k00, k01, k02, k03,  \
+      k10, k11, k12, k13,    \
+       k20, k21, k22, k23, \
+       k30, k31, k32, k33 \
+) { \
+    { k00, k01, k02, k03  }, \
+    { k10, k11, k12, k13 },  \
+    { k20, k21, k22, k23 },  \
+    { k30, k31, k32, k33 }  \
+}
diff --git a/keyboards/3w6/rev2/keymaps/default_pimoroni/rules.mk b/keyboards/3w6/rev2/keymaps/default_pimoroni/rules.mk
index 231a883719..5b5f23fbce 100644
--- a/keyboards/3w6/rev2/keymaps/default_pimoroni/rules.mk
+++ b/keyboards/3w6/rev2/keymaps/default_pimoroni/rules.mk
@@ -1,3 +1,4 @@
 POINTING_DEVICE_ENABLE = yes
+POINTING_DEVICE_DRIVER = custom
 SRC += pimoroni_trackball.c
 MOUSEKEY_ENABLE = no
diff --git a/keyboards/4pplet/waffling60/rev_c/config.h b/keyboards/4pplet/waffling60/rev_c/config.h
new file mode 100644
index 0000000000..e1862f4c0e
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_c/config.h
@@ -0,0 +1,64 @@
+/*
+Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4444
+#define PRODUCT_ID      0x0008
+#define DEVICE_VER      0x0003
+#define MANUFACTURER    4pplet
+#define PRODUCT         waffling60 Rev C
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+// ROWS: Top to bottom, COLS: Left to right
+
+#define MATRIX_ROW_PINS {C2,D0,B0,D6,D5}
+#define MATRIX_COL_PINS {C4,C5,D2,C6,C7,B7,B6,B5,B4,B3,B2,B1,D1,D4}
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#define QMK_ESC_OUTPUT C2 // usually COL
+#define QMK_ESC_INPUT C4 // usually ROW
+
+#define RGB_DI_PIN D3
+#define RGBLED_NUM 1
+#define BACKLIGHT_LEVELS 5
+
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/4pplet/waffling60/rev_c/readme.md b/keyboards/4pplet/waffling60/rev_c/readme.md
new file mode 100644
index 0000000000..3b6b9c94f2
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_c/readme.md
@@ -0,0 +1,20 @@
+# waffling60
+
+A 60% PCB for MX switches, one hot swap and one solder-pcb version with decent layout support.
+
+More info: https://geekhack.org/index.php?topic=103531.0
+
+* Keyboard Maintainer: [4pplet](https://github.com/4pplet)
+* Hardware Supported: [waffling60](https://github.com/4pplet/waffling60)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 4pplet/waffling60/rev_c:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+How to enter bootloader (DFU):
+* Tap the physical reset button or short the reset-header (labled RESET) on tha back of the PCB for keyboard to enter DFU. When in DFU, it's ready to flash the firmware.
+
+Alternative option if the firmware is already pre-flashed:
+* Unplug your keyboard, hold down the Spacebar and B at the same time, plug in your keyboard and wait a second before releasing the keys. The keyboard will enter DFU and is ready to flash the firmware.
diff --git a/keyboards/4pplet/waffling60/rev_c/rev_c.c b/keyboards/4pplet/waffling60/rev_c/rev_c.c
new file mode 100644
index 0000000000..f00cce06dc
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_c/rev_c.c
@@ -0,0 +1,31 @@
+/*
+Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "rev_c.h"
+
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if (CAPS_LOCK_ENABLE && res) {
+        if (led_state.caps_lock){
+            rgblight_enable();
+            rgblight_mode(1);
+            rgblight_sethsv_noeeprom(CAPS_LOCK_COLOR);
+        } else {
+            rgblight_disable_noeeprom();
+        }
+    }
+    return res;
+}
diff --git a/keyboards/4pplet/waffling60/rev_c/rev_c.h b/keyboards/4pplet/waffling60/rev_c/rev_c.h
new file mode 100644
index 0000000000..3df9419eb9
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_c/rev_c.h
@@ -0,0 +1,38 @@
+/*
+Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+// defines to set RGB-led behaviour. Off by default
+#define CAPS_LOCK_ENABLE false
+#define CAPS_LOCK_COLOR HSV_ORANGE
+
+#include "quantum.h"
+
+#define LAYOUT_all( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k1d, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
+    k40, k41, k42, k44, k46, k48, k4a, k4b, k4c, k4d  \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \
+    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \
+    {k40, k41, k42, KC_NO, k44, KC_NO, k46, KC_NO, k48, KC_NO, k4a, k4b, k4c, k4d}, \
+}
diff --git a/keyboards/4pplet/waffling60/rev_c/rules.mk b/keyboards/4pplet/waffling60/rev_c/rules.mk
new file mode 100644
index 0000000000..88173a40c2
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_c/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u2
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+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            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/amag23/keymaps/via/keymap.c b/keyboards/amag23/keymaps/via/keymap.c
new file mode 100644
index 0000000000..aa248a039c
--- /dev/null
+++ b/keyboards/amag23/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
+/* Copyright 2022
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    BASE,
+    FN1,
+    FN2,
+    FN3
+};
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [BASE] = LAYOUT_all(
+      KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
+      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,
+      MO(FN1), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
+      KC_LSFT, KC_Z,    KC_X,    KC_C,             KC_SPC
+  ),
+  [FN1] = LAYOUT_all(
+      _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,
+      _______, RGB_TOG, RGB_VAI, RGB_MOD, RGB_HUI, _______,
+      _______, _______, RGB_VAD, RGB_RMOD,RGB_HUD, _______,
+      _______, _______, _______, _______,          _______
+  ),
+  [FN2] = LAYOUT_all(
+      _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______,          _______
+  ),
+  [FN3] = LAYOUT_all(
+      _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______,          _______
+  ),
+};
+// clang-format on
diff --git a/keyboards/latin47ble/keymaps/via/rules.mk b/keyboards/amag23/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/latin47ble/keymaps/via/rules.mk
rename to keyboards/amag23/keymaps/via/rules.mk
diff --git a/keyboards/atlantis/ak81_ve/ak81_ve.c b/keyboards/atlantis/ak81_ve/ak81_ve.c
index b8ef4ee225..fcf279ed46 100644
--- a/keyboards/atlantis/ak81_ve/ak81_ve.c
+++ b/keyboards/atlantis/ak81_ve/ak81_ve.c
@@ -20,11 +20,11 @@
 led_config_t g_led_config = { {
   // Key Matrix to LED Index
   { 12, 11, 10, 9,      8,      7,      6,  5,      4,      NO_LED, 3,  2,  1,      0 },            // 13 keys
-  { 27, 26, 25, 24,     23,     22,     21, 20,     19,     18,     17, 16, 15,     14, 13 },       // 15 keys
-  { 42, 41, 40, 39,     38,     37,     36, 35,     34,     33,     32, 31, 30,     29, 28 },       // 15 keys
-  { 56, 55, 54, 53,     52,     51,     50, 49,     48,     47,     46, 45, 44,     43, NO_LED },   // 14 keys
-  { 70, 69, 68, 67,     66,     65,     64, 63,     62,     61,     60, 59, NO_LED, 58, 57 },       // 14 keys
-  { 79, 78, 77, NO_LED, NO_LED, NO_LED, 76, NO_LED, NO_LED, NO_LED, 75, 74, 73,     72, 71 }        // 9 keys
+  { 27, 26, 25, 24,     23,     22,     21, 20,     19,     18,     17, 16, 15,     14,     13 },   // 15 keys
+  { 42, 41, 40, 39,     38,     37,     36, 35,     34,     33,     32, 31, 30,     29,     28 },   // 15 keys
+  { 56, 55, 54, 53,     52,     51,     50, 49,     48,     47,     46, 45, 44,     NO_LED, 43 },   // 14 keys
+  { 70, 69, 68, 67,     66,     65,     64, 63,     62,     61,     60, 59, NO_LED, 58,     57 },   // 14 keys
+  { 79, 78, 77, NO_LED, NO_LED, NO_LED, 76, NO_LED, NO_LED, NO_LED, 75, 74, 73,     72,     71 }    // 9 keys
 }, { 
   // LED Index to Physical Positon
   { 240,  0 }, { 224,  0 }, { 208,  0 }, { 192, 0 },   { 176, 0 },  { 160, 0 },  { 144, 0 },  { 128, 0 },  { 112, 0 },  { 96, 0 },  { 80, 0 },  { 64, 0 },             { 32, 0 },
@@ -32,7 +32,8 @@ led_config_t g_led_config = { {
   { 240, 26 }, { 224, 26 }, { 208, 26 }, { 192 , 26 }, { 176, 26 }, { 160, 26 }, { 144, 26 }, { 128, 26 }, { 112, 26 }, { 96, 26 }, { 80, 26 }, { 64, 26}, { 48, 26 }, { 32, 26 }, { 16, 26 },
   { 240, 39 },       { 216, 39 },        { 192 , 39 }, { 176, 39 }, { 160, 39 }, { 144, 39 }, { 128, 39 }, { 112, 39 }, { 96, 39 }, { 80, 39 }, { 64, 39}, { 48, 39 }, { 32, 39 }, { 16, 39 },
   { 240, 52 }, { 224, 52 }, { 208, 52 }, { 192 , 52 }, { 176, 52 }, { 160, 52 }, { 144, 52 }, { 128, 52 }, { 112, 52 }, { 96, 52 }, { 80, 52 }, { 64, 52}, { 48, 52 },       { 24, 52 },
-  { 240, 64 }, { 224, 64 }, { 208, 64 }, { 192, 64 },  { 176, 64 },                                        { 112, 64 },                                    { 48, 64 }, { 32, 64 }, { 16, 64 }
+  { 240, 64 }, { 224, 64 }, { 208, 64 }, { 192, 64 },  { 176, 64 },                                        { 112, 64 },                                    { 48, 64 }, { 32, 64 }, { 16, 64 },
+  { 0, 26 }, { 0, 46 }, { 0, 64 }, { 48, 64 }, { 72, 64 }, { 104, 64 }, { 136, 64 }, { 168, 64 }, { 208, 64 }, { 232, 58 }, { 232, 45 }, { 232, 32 }, { 232, 20 }, { 232, 7 }, { 176, 0 }, { 112, 0 }
 }, {
   // LED Index to Flag
   4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
diff --git a/keyboards/boardsource/lulu/config.h b/keyboards/boardsource/lulu/config.h
new file mode 100644
index 0000000000..8cd240179e
--- /dev/null
+++ b/keyboards/boardsource/lulu/config.h
@@ -0,0 +1,47 @@
+// Copyright 2022 Cole Smith <cole@boadsource.xyz>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+#define VENDOR_ID       0x4273
+#define PRODUCT_ID      0x7685
+#define DEVICE_VER      0x0000
+#define MANUFACTURER    Boardsource
+#define PRODUCT         lulu
+
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 6
+#define MATRIX_ROW_PINS {C6, D7, E6, B4, B5}
+
+// wiring of each half
+#define MATRIX_COL_PINS {F6, F7, B1, B3, B2, B6}
+#define USE_SERIAL
+#define SOFT_SERIAL_PIN D2
+#define SPLIT_USB_DETECT
+#define RGB_DI_PIN D3
+
+#define ENCODERS_PAD_A { F0 }
+#define ENCODERS_PAD_B { F1 }
+#define ENCODERS_PAD_A_RIGHT { F0 }
+#define ENCODERS_PAD_B_RIGHT { F1 }
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+#define DIODE_DIRECTION COL2ROW
+#ifdef RGB_MATRIX_ENABLE
+    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
+    #define RGBLED_NUM 70  // Number of LEDs
+    #define DRIVER_LED_TOTAL RGBLED_NUM
+    #define RGB_MATRIX_SPLIT { 35, 35 }
+    #define SPLIT_TRANSPORT_MIRROR
+    #define RGBLIGHT_LIMIT_VAL 150
+    #define ENABLE_RGB_MATRIX_ALPHAS_MODS
+    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+    #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+    #define ENABLE_RGB_MATRIX_BREATHING
+    #define ENABLE_RGB_MATRIX_BAND_SAT
+    #define ENABLE_RGB_MATRIX_BAND_VAL
+#endif
+
diff --git a/keyboards/boardsource/lulu/info.json b/keyboards/boardsource/lulu/info.json
new file mode 100644
index 0000000000..156a7cea98
--- /dev/null
+++ b/keyboards/boardsource/lulu/info.json
@@ -0,0 +1,16 @@
+{
+    "keyboard_name": "Lulu",
+    "url": "https://boardsource.xyz/store/61d0b772319a1f3cc53ba2fb",
+    "maintainer": "boardsource",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x":0, "y":0.5}, {"x":1, "y":0.375}, {"x":2, "y":0.125}, {"x":3, "y":0}, {"x":4, "y":0.125}, {"x":5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.5},
+                {"x":0, "y":1.5}, {"x":1, "y":1.375}, {"x":2, "y":1.125}, {"x":3, "y":1}, {"x":4, "y":1.125}, {"x":5, "y":1.25}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.5},
+                {"x":0, "y":2.5}, {"x":1, "y":2.375}, {"x":2, "y":2.125}, {"x":3, "y":2}, {"x":4, "y":2.125}, {"x":5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.5},
+                {"x":0, "y":3.5}, {"x":1, "y":3.375}, {"x":2, "y":3.125}, {"x":3, "y":3}, {"x":4, "y":3.125}, {"x":5, "y":3.25}, {"x":6, "y":2.75}, {"x":9.5, "y":2.75}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.5},
+                {"x":2.5, "y":4.125}, {"x":3.5, "y":4.15}, {"x":4.5, "y":4.25}, {"x":6, "y":4.25, "h":1.5}, {"x":9.5, "y":4.25, "h":1.5}, {"x":11, "y":4.25}, {"x":12, "y":4.15}, {"x":13, "y":4.15}
+            ]
+        }
+    }
+}
diff --git a/keyboards/boardsource/lulu/keymaps/default/keymap.c b/keyboards/boardsource/lulu/keymaps/default/keymap.c
new file mode 100644
index 0000000000..8624b51b6a
--- /dev/null
+++ b/keyboards/boardsource/lulu/keymaps/default/keymap.c
@@ -0,0 +1,129 @@
+// Copyright 2022 Cole Smith <cole@boadsource.xyz>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _QWERTY,
+    _RAISE,
+    _LOWER,
+    _ADJUST
+};
+
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ 
+/* QWERTY
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * | ESC  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  `   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  |  -   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |LCTRL |   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |  '   |
+ * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
+ * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  |RShift|
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE |BackSP| RGUI |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+
+ [_QWERTY] = LAYOUT(
+  KC_ESC,   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV,
+  KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS,
+  KC_LCTL, KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_LBRC,  KC_RBRC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,
+                          KC_LALT,    KC_LGUI, LOWER, KC_SPC,  KC_ENT,   RAISE,   KC_BSPC, KC_RGUI
+),
+/* LOWER
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |                    |  F7  |  F8  |  F9  | F10  | F11  | F12  |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |   `  |   !  |   @  |   #  |   $  |   %  |-------.    ,-------|   ^  |   &  |   *  |   (  |   )  |   -  |
+ * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |-------|    |-------|      |   _  |   +  |   {  |   }  |   |  |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE |BackSP| RGUI |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+[_LOWER] = LAYOUT(
+  _______, _______, _______, _______, _______, _______,                   _______, _______, _______,_______, _______, _______,
+  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_GRV, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TILD,
+  _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+                             _______, _______, _______, _______, _______,  _______, _______, _______
+),
+/* RAISE
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |MOD   | MODR |  S+  |  S-  |  B+  |  B-  |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |   `  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |-------.    ,-------|      | Left | Down |  Up  |Right |      |
+ * |------+------+------+------+------+------|RGB_TOG|    |    ]  |------+------+------+------+------+------|
+ * |  F7  |  F8  |  F9  | F10  | F11  | F12  |-------|    |-------|   +  |   -  |   =  |   [  |   ]  |   \  |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE |BackSP| RGUI |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+
+[_RAISE] = LAYOUT(
+  RGB_MOD, RGB_RMOD,RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD,                     _______, _______, _______, _______, _______, _______,
+  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
+  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                       XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX,
+  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,   RGB_TOG, _______,  KC_PLUS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+                             _______, _______, _______,  _______, _______,  _______, _______, _______
+),
+/* ADJUST
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |-------.    ,-------|      |      |RGB ON| HUE+ | SAT+ | VAL+ |
+ * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |-------|    |-------|      |      | MODE | HUE- | SAT- | VAL- |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE |BackSP| RGUI |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+  [_ADJUST] = LAYOUT(
+  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,
+                             _______, _______, _______, _______, _______,  _______, _______, _______
+  )
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+   return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        // Volume control
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } else if (index == 1) {
+        // Page up/Page down
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+    return false;
+}
+#endif
diff --git a/keyboards/boardsource/lulu/keymaps/via/keymap.c b/keyboards/boardsource/lulu/keymaps/via/keymap.c
new file mode 100644
index 0000000000..912ea38559
--- /dev/null
+++ b/keyboards/boardsource/lulu/keymaps/via/keymap.c
@@ -0,0 +1,105 @@
+// Copyright 2022 Cole Smith <cole@boadsource.xyz>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _QWERTY,
+    _RAISE,
+    _LOWER,
+    _ADJUST
+};
+
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ 
+/* QWERTY
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * | ESC  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  `   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  |  -   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |LCTRL |   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |  '   |
+ * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
+ * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  |RShift|
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE |BackSP| RGUI |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+
+ [_QWERTY] = LAYOUT(
+  KC_ESC,   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV,
+  KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS,
+  KC_LCTRL, KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_LBRC,  KC_RBRC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,
+                          KC_LALT,    KC_LGUI, LOWER, KC_SPC,  KC_ENT,   RAISE,   KC_BSPC, KC_RGUI
+),
+/* LOWER
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |                    |  F7  |  F8  |  F9  | F10  | F11  | F12  |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |   `  |   !  |   @  |   #  |   $  |   %  |-------.    ,-------|   ^  |   &  |   *  |   (  |   )  |   -  |
+ * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |-------|    |-------|      |   _  |   +  |   {  |   }  |   |  |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE |BackSP| RGUI |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+[_LOWER] = LAYOUT(
+  _______, _______, _______, _______, _______, _______,                   _______, _______, _______,_______, _______, _______,
+  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_GRV, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TILD,
+  _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+                             _______, _______, _______, _______, _______,  _______, _______, _______
+),
+/* RAISE
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |MOD   | MODR |  S+  |  S-  |  B+  |  B-  |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |   `  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |-------.    ,-------|      | Left | Down |  Up  |Right |      |
+ * |------+------+------+------+------+------|RGB_TOG|    |    ]  |------+------+------+------+------+------|
+ * |  F7  |  F8  |  F9  | F10  | F11  | F12  |-------|    |-------|   +  |   -  |   =  |   [  |   ]  |   \  |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE |BackSP| RGUI |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+
+[_RAISE] = LAYOUT(
+  RGB_MOD, RGB_RMOD,RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD,                     _______, _______, _______, _______, _______, _______,
+  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
+  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                       XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX,
+  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,   RGB_TOG, _______,  KC_PLUS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+                             _______, _______, _______,  _______, _______,  _______, _______, _______
+),
+/* ADJUST
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |-------.    ,-------|      |      |RGB ON| HUE+ | SAT+ | VAL+ |
+ * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |-------|    |-------|      |      | MODE | HUE- | SAT- | VAL- |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE |BackSP| RGUI |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+  [_ADJUST] = LAYOUT(
+  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/mechmini/v2/keymaps/via/rules.mk b/keyboards/boardsource/lulu/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/via/rules.mk
rename to keyboards/boardsource/lulu/keymaps/via/rules.mk
diff --git a/keyboards/boardsource/lulu/lulu.c b/keyboards/boardsource/lulu/lulu.c
new file mode 100644
index 0000000000..390815795a
--- /dev/null
+++ b/keyboards/boardsource/lulu/lulu.c
@@ -0,0 +1,280 @@
+// Copyright 2022 Cole Smith <cole@boadsource.xyz>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "lulu.h"
+#ifdef RGB_MATRIX_ENABLE
+
+led_config_t g_led_config = { {
+    {12,11,10,9 ,8 ,7 },
+    {18,17,16,15,14,13},
+    {24,23,22,21,20,19},
+    {30,29,28,27,26,25},
+    {NO_LED,35,34,33,32,31},
+    {42,43,44,45,46,47},
+    {48,49,50,51,52,53},
+    {54,55,56,57,58,59},
+    {60,61,62,63,64,65},
+    {NO_LED,66,67,68,69,70}
+},{
+
+  {86,55},{51,55},{17,40},{17,10},{51,10},{86,10},
+  {0,0}, {17,0}, {34,0}, {51,0}, {68,0}, {86,0},
+  {0,16},{17,16},{34,16},{51,16},{68,16},{86,16},
+  {0,32},{17,32},{34,32},{51,32},{68,32},{86,32},
+  {0,48},{17,48},{34,48},{51,48},{68,48},{86,48},{103,48},
+                 {34,64},{51,64},{68,64},{86,64},
+
+
+  {137,55},{172,55},{206,40},{206,10},{172,10},{137,10},
+  {137,0}, {155,0}, {172,0}, {189,0}, {206,0}, {224,0},
+  {137,16},{155,16},{172,16},{189,16},{206,16},{224,16},
+  {137,32},{155,32},{172,32},{189,32},{206,32},{224,32},
+  {137,48},{155,48},{172,48},{189,48},{155,48},{137,48},{120,48},
+                    {172,64},{189,64},{155,64},{137,64}
+},{2,2,2,2,2,2,
+   4,4,4,4,4,1,
+   1,4,4,4,4,4,
+   4,4,4,4,4,1,
+   1,4,4,4,4,4,
+   1,4,1,1,1,
+   2,2,2,2,2,2,
+   4,4,4,4,4,1,
+   1,4,4,4,4,4,
+   4,4,4,4,4,1,
+   1,4,4,4,4,4,
+   1,4,1,1,1
+}};
+
+#endif
+
+
+
+#ifdef OLED_ENABLE
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+  if (!is_keyboard_master()) {
+    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
+  }
+  return rotation;
+}
+
+void render_layer1_logo(void){
+        static const char PROGMEM layer_logo[] = {
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, 0x18, 0x30, 0x60, 0xe0, 0xc0, 0x80, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 
+0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 
+0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 
+0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x0f, 0x0f, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 
+0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 
+0xfc, 0x0e, 0x07, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 
+0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf0, 0x60, 
+0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x70, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x01, 0x03, 0x07, 
+0x07, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 
+0x00, 0x01, 0x03, 0x07, 0x06, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+    oled_write_raw_P(layer_logo, sizeof(layer_logo));
+}
+void render_layer2_logo(void){
+        static const char PROGMEM layer_logo[] = {
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, 0x18, 0x30, 0x60, 0xe0, 0xc0, 0x80, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 
+0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x0f, 0x0f, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 
+0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 
+0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 
+0x3f, 0x70, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf0, 0x60, 
+0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x70, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x01, 0x03, 0x07, 
+0x07, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 
+0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 
+0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 
+0x00, 0x01, 0x03, 0x07, 0x06, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+    oled_write_raw_P(layer_logo, sizeof(layer_logo));
+}
+void render_layer3_logo(void){
+        static const char PROGMEM layer_logo[] = {
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, 0x18, 0x30, 0x60, 0xe0, 0xc0, 0x80, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 
+0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x0f, 0x0f, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 
+0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 
+0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
+0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
+0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0x70, 0x38, 0x1f, 0x07, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf0, 0x60, 
+0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x70, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x01, 0x03, 0x07, 
+0x07, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 
+0x00, 0x01, 0x03, 0x07, 0x06, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+    oled_write_raw_P(layer_logo, sizeof(layer_logo));
+}
+void render_layer4_logo(void){
+        static const char PROGMEM layer_logo[] = {
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, 0x18, 0x30, 0x60, 0xe0, 0xc0, 0x80, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 
+0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 
+0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 
+0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x0f, 0x0f, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 
+0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x07, 0x0e, 0xfc, 0xf0, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 
+0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf0, 0x60, 
+0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x70, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x01, 0x03, 0x07, 
+0x07, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 
+0x00, 0x01, 0x03, 0x07, 0x06, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+    oled_write_raw_P(layer_logo, sizeof(layer_logo));
+}
+
+void render_logo(void) {
+    static const char PROGMEM logo[] = {
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0x60, 0x60, 0x60, 
+0x60, 0x60, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 
+0x00, 0xe0, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xfc, 0x1e, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x80, 0xc0, 
+0x80, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x0e, 0xfc, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 
+0xe0, 0xc0, 0x80, 0x80, 0xc0, 0xc0, 0xff, 0xff, 0x1f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 
+0x00, 0x1f, 0xff, 0xff, 0xc0, 0xc0, 0x80, 0xc0, 0xc0, 0xe0, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x1f, 0x78, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x01, 
+0x01, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xe0, 0x78, 0x3f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 
+0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+    oled_write_raw_P(logo, sizeof(logo));
+}
+enum Layers{
+    _QWERTY,
+    _RAISE,
+    _LOWER,
+    _ADJUST
+};
+
+void process_layer_state(void) {
+    switch (get_highest_layer(layer_state)) {
+        case _QWERTY:
+            render_layer1_logo();
+            break;
+        case _LOWER:
+            render_layer2_logo();
+            break;
+        case _RAISE:
+            render_layer3_logo();
+            break;
+        case _ADJUST:
+            render_layer4_logo();
+            break;
+    }
+}
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) { return false; }
+    if (is_keyboard_master()) {
+        process_layer_state();
+    } else {
+        render_logo();
+    }
+    return false;
+}
+#endif
+
diff --git a/keyboards/boardsource/lulu/lulu.h b/keyboards/boardsource/lulu/lulu.h
new file mode 100644
index 0000000000..bda65f63e0
--- /dev/null
+++ b/keyboards/boardsource/lulu/lulu.h
@@ -0,0 +1,29 @@
+// Copyright 2022 Cole Smith <cole@boadsource.xyz>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+#include "split_util.h"
+#define has_usb() is_keyboard_master()
+#define is_master is_keyboard_master()
+#define LAYOUT( \
+	L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05,  \
+	L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15,  \
+	L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25,  \
+	L30, L31, L32, L33, L34, L35, L45, R40, R30, R31, R32, R33, R34, R35, \
+	               L41, L42, L43, L44, R41, R42, R43, R44  \
+	) \
+	{ \
+		{ L00, L01, L02, L03, L04, L05 }, \
+		{ L10, L11, L12, L13, L14, L15 }, \
+		{ L20, L21, L22, L23, L24, L25 }, \
+		{ L30, L31, L32, L33, L34, L35 }, \
+		{ KC_NO, L41, L42, L43, L44, L45 }, \
+		{ R05, R04, R03, R02, R01, R00 }, \
+		{ R15, R14, R13, R12, R11, R10 }, \
+		{ R25, R24, R23, R22, R21, R20 }, \
+		{ R35, R34, R33, R32, R31, R30 }, \
+		{ KC_NO, R44, R43, R42, R41, R40 } \
+	}
+
diff --git a/keyboards/boardsource/lulu/readme.md b/keyboards/boardsource/lulu/readme.md
new file mode 100644
index 0000000000..e7c530161b
--- /dev/null
+++ b/keyboards/boardsource/lulu/readme.md
@@ -0,0 +1,24 @@
+# Lulu
+
+![boardsource Lulu](https://i.imgur.com/tjvUoXTh.png)
+
+The lulu is what the ergo community has needed for a long time, a high-end aesthetic split ergo 60%. With this project we not only tried to create a beautiful product but we also wanted to unify the some what split 60% community. With hotswap, per key rgb & underglow, swappable encoder and adjustable tenting with out giving up anything.
+
+
+* Keyboard Maintainer: [Boardsource](https://github.com/daysgobye) 
+* Hardware Supported: lulu v1
+* Hardware Availability: this keyboard is available from the [Boardsource store](https://boardsource.xyz/store/61d0b772319a1f3cc53ba2fb)
+
+
+Make example for this keyboard (after setting up your build environment):
+
+    make boardsource/lulu:default
+
+Flashing example for this keyboard:
+
+    make boardsource/lulu:default:flash
+
+Reset keyboard by holding down top left key while you plug in the usb cable. Or by pushing the reset switch on the pcb.
+
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/boardsource/lulu/rules.mk b/keyboards/boardsource/lulu/rules.mk
new file mode 100644
index 0000000000..06d206cb55
--- /dev/null
+++ b/keyboards/boardsource/lulu/rules.mk
@@ -0,0 +1,26 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+SPLIT_KEYBOARD = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
+RGB_MATRIX_SUPPORTED = yes
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306
+LTO_ENABLE = yes
+ENCODER_ENABLE = yes  
diff --git a/keyboards/boardsource/the_mark/info.json b/keyboards/boardsource/the_mark/info.json
index 07e3a34e54..792585d12a 100644
--- a/keyboards/boardsource/the_mark/info.json
+++ b/keyboards/boardsource/the_mark/info.json
@@ -1,229 +1,393 @@
 {
     "keyboard_name": "The Mark: 65",
     "url": "",
-    "maintainer": "Boardsource",
+    "maintainer": "daysgobye, Boardsource",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "x": 0, "y": 0, "w": 1 },
-                { "x": 1, "y": 0, "w": 1 },
-                { "x": 2, "y": 0, "w": 1 },
-                { "x": 3, "y": 0, "w": 1 },
-                { "x": 4, "y": 0, "w": 1 },
-                { "x": 5, "y": 0, "w": 1 },
-                { "x": 6, "y": 0, "w": 1 },
-                { "x": 7, "y": 0, "w": 1 },
-                { "x": 8, "y": 0, "w": 1 },
-                { "x": 9, "y": 0, "w": 1 },
-                { "x": 10, "y": 0, "w": 1 },
-                { "x": 11, "y": 0, "w": 1 },
-                { "x": 12, "y": 0, "w": 1 },
-                { "x": 13, "y": 0, "w": 1 },
-                { "x": 14, "y": 0, "w": 1 },
-                { "x": 15.25, "y": 0, "w": 1 },
-                { "x": 0, "y": 1, "w": 1.5 },
-                { "x": 1.5, "y": 1, "w": 1 },
-                { "x": 2.5, "y": 1, "w": 1 },
-                { "x": 3.5, "y": 1, "w": 1 },
-                { "x": 4.5, "y": 1, "w": 1 },
-                { "x": 5.5, "y": 1, "w": 1 },
-                { "x": 6.5, "y": 1, "w": 1 },
-                { "x": 7.5, "y": 1, "w": 1 },
-                { "x": 8.5, "y": 1, "w": 1 },
-                { "x": 9.5, "y": 1, "w": 1 },
-                { "x": 10.5, "y": 1, "w": 1 },
-                { "x": 11.5, "y": 1, "w": 1 },
-                { "x": 12.5, "y": 1, "w": 1 },
-                { "x": 13.5, "y": 1, "w": 1.5 },
-                { "x": 15.25, "y": 1, "w": 1 },
-                { "x": 0, "y": 2, "w": 1.75 },
-                { "x": 1.75, "y": 2, "w": 1 },
-                { "x": 2.75, "y": 2, "w": 1 },
-                { "x": 3.75, "y": 2, "w": 1 },
-                { "x": 4.75, "y": 2, "w": 1 },
-                { "x": 5.75, "y": 2, "w": 1 },
-                { "x": 6.75, "y": 2, "w": 1 },
-                { "x": 7.75, "y": 2, "w": 1 },
-                { "x": 8.75, "y": 2, "w": 1 },
-                { "x": 9.75, "y": 2, "w": 1 },
-                { "x": 10.75, "y": 2, "w": 1 },
-                { "x": 11.75, "y": 2, "w": 1 },
-                { "x": 12.75, "y": 2, "w": 2.25 },
-                { "x": 15.25, "y": 2, "w": 1 },
-                { "x": 0, "y": 3, "w": 1.25 },
-                { "x": 1.25, "y": 3, "w": 1 },
-                { "x": 2.25, "y": 3, "w": 1 },
-                { "x": 3.25, "y": 3, "w": 1 },
-                { "x": 4.25, "y": 3, "w": 1 },
-                { "x": 5.25, "y": 3, "w": 1 },
-                { "x": 6.25, "y": 3, "w": 1 },
-                { "x": 7.25, "y": 3, "w": 1 },
-                { "x": 8.25, "y": 3, "w": 1 },
-                { "x": 9.25, "y": 3, "w": 1 },
-                { "x": 10.25, "y": 3, "w": 1 },
-                { "x": 11.25, "y": 3, "w": 1 },
-                { "x": 12.25, "y": 3, "w": 1.75 },
-                { "x": 14.25, "y": 3.25, "w": 1 },
-                { "x": 0, "y": 4, "w": 1.25 },
-                { "x": 1.25, "y": 4, "w": 1.25 },
-                { "x": 2.5, "y": 4, "w": 1.25 },
-                { "x": 3.75, "y": 4, "w": 2.25 },
-                { "x": 6, "y": 4, "w": 1.25 },
-                { "x": 7.25, "y": 4, "w": 2.75 },
-                { "x": 10, "y": 4, "w": 1 },
-                { "x": 11, "y": 4, "w": 1 },
-                { "x": 12, "y": 4, "w": 1 },
-                { "x": 13.25, "y": 4.25, "w": 1 },
-                { "x": 14.25, "y": 4.25, "w": 1 },
-                { "x": 15.25, "y": 4.25, "w": 1 }
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0},
+                {"label":"Backspace", "x":14, "y":0},
+                {"label":"Toggle RGB", "x":15.25, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+                {"label":"RGB Mode +", "x":15.25, "y":1},
+
+                {"label":"Ctrl", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+                {"label":"Fn", "x":15.25, "y":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":3},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"\u2191", "x":14.25, "y":3.25},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":2.25},
+                {"label":"Space", "x":6, "y":4, "w":1.25},
+                {"label":"Space", "x":7.25, "y":4, "w":2.75},
+                {"label":"Alt", "x":10, "y":4},
+                {"label":"Ctrl", "x":11, "y":4},
+                {"label":"`~", "x":12, "y":4},
+                {"label":"\u2190", "x":13.25, "y":4.25},
+                {"label":"\u2193", "x":14.25, "y":4.25},
+                {"label":"\u2192", "x":15.25, "y":4.25}
             ]
         },
         "LAYOUT_ansi": {
             "layout": [
-                { "x": 0, "y": 0, "w": 1 },
-                { "x": 1, "y": 0, "w": 1 },
-                { "x": 2, "y": 0, "w": 1 },
-                { "x": 3, "y": 0, "w": 1 },
-                { "x": 4, "y": 0, "w": 1 },
-                { "x": 5, "y": 0, "w": 1 },
-                { "x": 6, "y": 0, "w": 1 },
-                { "x": 7, "y": 0, "w": 1 },
-                { "x": 8, "y": 0, "w": 1 },
-                { "x": 9, "y": 0, "w": 1 },
-                { "x": 10, "y": 0, "w": 1 },
-                { "x": 11, "y": 0, "w": 1 },
-                { "x": 12, "y": 0, "w": 1 },
-                { "x": 13, "y": 0, "w": 2 },
-                { "x": 15.25, "y": 0, "w": 1 },
-                { "x": 0, "y": 1, "w": 1.5 },
-                { "x": 1.5, "y": 1, "w": 1 },
-                { "x": 2.5, "y": 1, "w": 1 },
-                { "x": 3.5, "y": 1, "w": 1 },
-                { "x": 4.5, "y": 1, "w": 1 },
-                { "x": 5.5, "y": 1, "w": 1 },
-                { "x": 6.5, "y": 1, "w": 1 },
-                { "x": 7.5, "y": 1, "w": 1 },
-                { "x": 8.5, "y": 1, "w": 1 },
-                { "x": 9.5, "y": 1, "w": 1 },
-                { "x": 10.5, "y": 1, "w": 1 },
-                { "x": 11.5, "y": 1, "w": 1 },
-                { "x": 12.5, "y": 1, "w": 1 },
-                { "x": 13.5, "y": 1, "w": 1.5 },
-                { "x": 15.25, "y": 1, "w": 1 },
-                { "x": 0, "y": 2, "w": 1.75 },
-                { "x": 1.75, "y": 2, "w": 1 },
-                { "x": 2.75, "y": 2, "w": 1 },
-                { "x": 3.75, "y": 2, "w": 1 },
-                { "x": 4.75, "y": 2, "w": 1 },
-                { "x": 5.75, "y": 2, "w": 1 },
-                { "x": 6.75, "y": 2, "w": 1 },
-                { "x": 7.75, "y": 2, "w": 1 },
-                { "x": 8.75, "y": 2, "w": 1 },
-                { "x": 9.75, "y": 2, "w": 1 },
-                { "x": 10.75, "y": 2, "w": 1 },
-                { "x": 11.75, "y": 2, "w": 1 },
-                { "x": 12.75, "y": 2, "w": 2.25 },
-                { "x": 15.25, "y": 2, "w": 1 },
-                { "x": 0, "y": 3, "w": 2.25 },
-                { "x": 2.25, "y": 3, "w": 1 },
-                { "x": 3.25, "y": 3, "w": 1 },
-                { "x": 4.25, "y": 3, "w": 1 },
-                { "x": 5.25, "y": 3, "w": 1 },
-                { "x": 6.25, "y": 3, "w": 1 },
-                { "x": 7.25, "y": 3, "w": 1 },
-                { "x": 8.25, "y": 3, "w": 1 },
-                { "x": 9.25, "y": 3, "w": 1 },
-                { "x": 10.25, "y": 3, "w": 1 },
-                { "x": 11.25, "y": 3, "w": 1 },
-                { "x": 12.25, "y": 3, "w": 1.75 },
-                { "x": 14.25, "y": 3.25, "w": 1 },
-                { "x": 0, "y": 4, "w": 1.25 },
-                { "x": 1.25, "y": 4, "w": 1.25 },
-                { "x": 2.5, "y": 4, "w": 1.25 },
-                { "x": 3.75, "y": 4, "w": 6.25 },
-                { "x": 10, "y": 4, "w": 1 },
-                { "x": 11, "y": 4, "w": 1 },
-                { "x": 12, "y": 4, "w": 1 },
-                { "x": 13.25, "y": 4.25, "w": 1 },
-                { "x": 14.25, "y": 4.25, "w": 1 },
-                { "x": 15.25, "y": 4.25, "w": 1 }
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+                {"label":"Toggle RGB", "x":15.25, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+                {"label":"RGB Mode +", "x":15.25, "y":1},
+
+                {"label":"Ctrl", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+                {"label":"Fn", "x":15.25, "y":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"\u2191", "x":14.25, "y":3.25},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4},
+                {"label":"Ctrl", "x":11, "y":4},
+                {"label":"`~", "x":12, "y":4},
+                {"label":"\u2190", "x":13.25, "y":4.25},
+                {"label":"\u2193", "x":14.25, "y":4.25},
+                {"label":"\u2192", "x":15.25, "y":4.25}
+            ]
+        },
+        "LAYOUT_ansi_split_bs_space": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0},
+                {"label":"Backspace", "x":14, "y":0},
+                {"label":"Toggle RGB", "x":15.25, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+                {"label":"RGB Mode +", "x":15.25, "y":1},
+
+                {"label":"Ctrl", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+                {"label":"Fn", "x":15.25, "y":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"\u2191", "x":14.25, "y":3.25},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":2.25},
+                {"label":"Space", "x":6, "y":4, "w":1.25},
+                {"label":"Space", "x":7.25, "y":4, "w":2.75},
+                {"label":"Alt", "x":10, "y":4},
+                {"label":"Ctrl", "x":11, "y":4},
+                {"label":"`~", "x":12, "y":4},
+                {"label":"\u2190", "x":13.25, "y":4.25},
+                {"label":"\u2193", "x":14.25, "y":4.25},
+                {"label":"\u2192", "x":15.25, "y":4.25}
             ]
         },
         "LAYOUT_iso": {
             "layout": [
-                { "x": 0, "y": 0, "w": 1 },
-                { "x": 1, "y": 0, "w": 1 },
-                { "x": 2, "y": 0, "w": 1 },
-                { "x": 3, "y": 0, "w": 1 },
-                { "x": 4, "y": 0, "w": 1 },
-                { "x": 5, "y": 0, "w": 1 },
-                { "x": 6, "y": 0, "w": 1 },
-                { "x": 7, "y": 0, "w": 1 },
-                { "x": 8, "y": 0, "w": 1 },
-                { "x": 9, "y": 0, "w": 1 },
-                { "x": 10, "y": 0, "w": 1 },
-                { "x": 11, "y": 0, "w": 1 },
-                { "x": 12, "y": 0, "w": 1 },
-                { "x": 13, "y": 0, "w": 2 },
-                { "x": 15.25, "y": 0, "w": 1 },
-                { "x": 0, "y": 1, "w": 1.5 },
-                { "x": 1.5, "y": 1, "w": 1 },
-                { "x": 2.5, "y": 1, "w": 1 },
-                { "x": 3.5, "y": 1, "w": 1 },
-                { "x": 4.5, "y": 1, "w": 1 },
-                { "x": 5.5, "y": 1, "w": 1 },
-                { "x": 6.5, "y": 1, "w": 1 },
-                { "x": 7.5, "y": 1, "w": 1 },
-                { "x": 8.5, "y": 1, "w": 1 },
-                { "x": 9.5, "y": 1, "w": 1 },
-                { "x": 10.5, "y": 1, "w": 1 },
-                { "x": 11.5, "y": 1, "w": 1 },
-                { "x": 12.5, "y": 1, "w": 1 },
-                { "x": 15.25, "y": 1, "w": 1 },
-                { "x": 0, "y": 2, "w": 1.75 },
-                { "x": 1.75, "y": 2, "w": 1 },
-                { "x": 2.75, "y": 2, "w": 1 },
-                { "x": 3.75, "y": 2, "w": 1 },
-                { "x": 4.75, "y": 2, "w": 1 },
-                { "x": 5.75, "y": 2, "w": 1 },
-                { "x": 6.75, "y": 2, "w": 1 },
-                { "x": 7.75, "y": 2, "w": 1 },
-                { "x": 8.75, "y": 2, "w": 1 },
-                { "x": 9.75, "y": 2, "w": 1 },
-                { "x": 10.75, "y": 2, "w": 1 },
-                { "x": 11.75, "y": 2, "w": 1 },
-                { "x": 12.75, "y": 2, "w": 1 },
-                {
-                    "x": 13.75,
-                    "y": 1,
-                    "w": 1.25,
-                    "h": 2
-                },
-                { "x": 15.25, "y": 2, "w": 1 },
-                { "x": 0, "y": 3, "w": 1.25 },
-                { "x": 1.25, "y": 3, "w": 1 },
-                { "x": 2.25, "y": 3, "w": 1 },
-                { "x": 3.25, "y": 3, "w": 1 },
-                { "x": 4.25, "y": 3, "w": 1 },
-                { "x": 5.25, "y": 3, "w": 1 },
-                { "x": 6.25, "y": 3, "w": 1 },
-                { "x": 7.25, "y": 3, "w": 1 },
-                { "x": 8.25, "y": 3, "w": 1 },
-                { "x": 9.25, "y": 3, "w": 1 },
-                { "x": 10.25, "y": 3, "w": 1 },
-                { "x": 11.25, "y": 3, "w": 1 },
-                { "x": 12.25, "y": 3, "w": 1.75 },
-                { "x": 14.25, "y": 3.25, "w": 1 },
-                { "x": 0, "y": 4, "w": 1.25 },
-                { "x": 1.25, "y": 4, "w": 1.25 },
-                { "x": 2.5, "y": 4, "w": 1.25 },
-                { "x": 3.75, "y": 4, "w": 6.25 },
-                { "x": 10, "y": 4, "w": 1 },
-                { "x": 11, "y": 4, "w": 1 },
-                { "x": 12, "y": 4, "w": 1 },
-                { "x": 13.25, "y": 4.25, "w": 1 },
-                { "x": 14.25, "y": 4.25, "w": 1 },
-                { "x": 15.25, "y": 4.25, "w": 1 }
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2\"", "x":2, "y":0},
+                {"label":"3\u00a3", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+                {"label":"Toggle RGB", "x":15.25, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"RGB Mode +", "x":15.25, "y":1},
+
+                {"label":"Ctrl", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"#~", "x":12.75, "y":2},
+                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
+                {"label":"Fn", "x":15.25, "y":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":3},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"\u2191", "x":14.25, "y":3.25},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4},
+                {"label":"Ctrl", "x":11, "y":4},
+                {"label":"`\u00ac", "x":12, "y":4},
+                {"label":"\u2190", "x":13.25, "y":4.25},
+                {"label":"\u2193", "x":14.25, "y":4.25},
+                {"label":"\u2192", "x":15.25, "y":4.25}
+            ]
+        },
+        "LAYOUT_iso_split_bs_space": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2\"", "x":2, "y":0},
+                {"label":"3\u00a3", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0},
+                {"label":"Backspace", "x":14, "y":0},
+                {"label":"Toggle RGB", "x":15.25, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"RGB Mode +", "x":15.25, "y":1},
+
+                {"label":"Ctrl", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"#~", "x":12.75, "y":2},
+                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
+                {"label":"Fn", "x":15.25, "y":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":3},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"\u2191", "x":14.25, "y":3.25},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":2.25},
+                {"label":"Space", "x":6, "y":4, "w":1.25},
+                {"label":"Space", "x":7.25, "y":4, "w":2.75},
+                {"label":"Alt", "x":10, "y":4},
+                {"label":"Ctrl", "x":11, "y":4},
+                {"label":"`\u00ac", "x":12, "y":4},
+                {"label":"\u2190", "x":13.25, "y":4.25},
+                {"label":"\u2193", "x":14.25, "y":4.25},
+                {"label":"\u2192", "x":15.25, "y":4.25}
             ]
         }
     }
diff --git a/keyboards/boardsource/the_mark/keymaps/default/keymap.c b/keyboards/boardsource/the_mark/keymaps/default/keymap.c
index ead93baf55..148795b0c3 100644
--- a/keyboards/boardsource/the_mark/keymaps/default/keymap.c
+++ b/keyboards/boardsource/the_mark/keymaps/default/keymap.c
@@ -21,24 +21,20 @@ enum layer_names {
     _FN
 };
 
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_all(
-		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, RGB_TOG, 
-		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, RGB_MOD, 
-		KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  MO(_FN), 
-		KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,          KC_UP,   
-		KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_LALT, KC_LCTL, KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT
-	),
-[_FN] = LAYOUT_all(
-  KC_GRV,      KC_F1,     KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10,     KC_F11,     KC_F12,     _______,    _______,    KC_HOME,
-  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_MPLY,    KC_VOLD,    KC_VOLU,    KC_MUTE,    KC_END,
-  RESET,                  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    _______,
-  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    
-  _______,    _______,    _______,                _______,                _______,                _______,                _______,    _______,    _______,    _______,    _______,    _______
-)
-
-
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, RGB_TOG,
+        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, RGB_MOD,
+        KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  MO(_FN),
+        KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,          KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_LALT, KC_LCTL, KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FN] = LAYOUT_all(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, KC_HOME,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,
+        RESET,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______, _______, _______, _______
+    )
 };
-
diff --git a/keyboards/boardsource/the_mark/keymaps/default_ansi/keymap.c b/keyboards/boardsource/the_mark/keymaps/default_ansi/keymap.c
index 250ecf7669..4174e03603 100644
--- a/keyboards/boardsource/the_mark/keymaps/default_ansi/keymap.c
+++ b/keyboards/boardsource/the_mark/keymaps/default_ansi/keymap.c
@@ -21,24 +21,20 @@ enum layer_names {
     _FN
 };
 
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_ansi(
-		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          RGB_TOG, 
-		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, RGB_MOD, 
-		KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           MO(_FN), 
-		         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,          KC_UP,   
-		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_LALT, KC_LCTL, KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT
-	),
-[_FN] = LAYOUT_ansi(
-  KC_GRV,      KC_F1,     KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10,     KC_F11,     KC_F12,   _______,                  KC_HOME,
-  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_MPLY,    KC_VOLD,  KC_VOLU,  _______,        KC_END,
-  RESET,                  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,  KC_MUTE,                  _______,
-              _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,            _______,    
-  _______,    _______,    _______,                                        _______,                                        _______,    _______,    _______,  _______,  _______,    _______
-)
-
-
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          RGB_TOG,
+        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, RGB_MOD,
+        KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           MO(_FN),
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,          KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_LALT, KC_LCTL, KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FN] = LAYOUT_ansi(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,          KC_HOME,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, _______, KC_END,
+        RESET,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
+    )
 };
-
diff --git a/keyboards/boardsource/the_mark/keymaps/default_ansi_split_bs_space/keymap.c b/keyboards/boardsource/the_mark/keymaps/default_ansi_split_bs_space/keymap.c
new file mode 100644
index 0000000000..d59378c78f
--- /dev/null
+++ b/keyboards/boardsource/the_mark/keymaps/default_ansi_split_bs_space/keymap.c
@@ -0,0 +1,41 @@
+/* Copyright 2020 Boardsource
+ *           2022 QMK / James Young (@noroadsleft)
+ *
+ * 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
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT_ansi_split_bs_space(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, RGB_TOG,
+        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, RGB_MOD,
+        KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           MO(_FN),
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,          KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_LALT, KC_LCTL, KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FN] = LAYOUT_ansi_split_bs_space(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, KC_HOME,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, _______, KC_END,
+        RESET,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/boardsource/the_mark/keymaps/default_iso/keymap.c b/keyboards/boardsource/the_mark/keymaps/default_iso/keymap.c
index 6aeace190a..347bc19a35 100644
--- a/keyboards/boardsource/the_mark/keymaps/default_iso/keymap.c
+++ b/keyboards/boardsource/the_mark/keymaps/default_iso/keymap.c
@@ -21,24 +21,20 @@ enum layer_names {
     _FN
 };
 
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_iso(
-		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          RGB_TOG, 
-		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,          RGB_MOD, 
-		KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  MO(_FN), 
-		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_LSFT,          KC_UP,   
-		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_LALT, KC_LCTL, KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT
-	),
-[_FN] = LAYOUT_iso(
-  KC_GRV,      KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   _______,           KC_HOME,
-  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_MPLY,  KC_VOLD,  KC_VOLU,                  KC_END,
-  RESET,                  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,KC_MUTE,     _______,    _______,
-  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,             _______,    
-  _______,    _______,    _______,                                        _______,                                        _______,    _______,    _______,    _______,  _______,    _______
-)
-
-
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          RGB_TOG,
+        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,          RGB_MOD,
+        KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  MO(_FN),
+        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_LSFT,          KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_LALT, KC_LCTL, KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FN] = LAYOUT_iso(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,          KC_HOME,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU,          KC_END,
+        RESET,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
+    )
 };
-
diff --git a/keyboards/boardsource/the_mark/keymaps/default_iso_split_bs_space/keymap.c b/keyboards/boardsource/the_mark/keymaps/default_iso_split_bs_space/keymap.c
new file mode 100644
index 0000000000..617ee540d1
--- /dev/null
+++ b/keyboards/boardsource/the_mark/keymaps/default_iso_split_bs_space/keymap.c
@@ -0,0 +1,41 @@
+/* Copyright 2020 Boardsource
+ *           2022 QMK / James Young (@noroadsleft)
+ *
+ * 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
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT_iso_split_bs_space(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, RGB_TOG,
+        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,          RGB_MOD,
+        KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  MO(_FN),
+        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_LSFT,          KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_LALT, KC_LCTL, KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FN] = LAYOUT_iso_split_bs_space(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, KC_HOME,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU,          KC_END,
+        RESET,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/boardsource/the_mark/keymaps/via/keymap.c b/keyboards/boardsource/the_mark/keymaps/via/keymap.c
index 2b0477f39f..1d2a97b756 100644
--- a/keyboards/boardsource/the_mark/keymaps/via/keymap.c
+++ b/keyboards/boardsource/the_mark/keymaps/via/keymap.c
@@ -15,40 +15,34 @@
  */
 #include QMK_KEYBOARD_H
 
-
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    LAYOUT_all(
-		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, RGB_TOG, 
-		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_PGDN, 
-		KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP, 
-		KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,          KC_UP,   
+    [0] = LAYOUT_all(
+		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, RGB_TOG,
+		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_PGDN,
+		KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
+		KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,          KC_UP,
 		KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_LALT, KC_LCTL, KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT
 	),
-LAYOUT_all(
-  KC_GRV,      KC_F1,     KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10,     KC_F11,     KC_F12,     _______,    _______,    KC_HOME,
-  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_MPLY,    KC_VOLD,    KC_VOLU,    KC_MUTE,    KC_END,
-  RESET,                  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    _______,
-  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    
-  _______,    _______,    _______,                _______,                _______,                _______,                _______,    _______,    _______,    _______,    _______,    _______
-),
-LAYOUT_all(
-  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    _______,
-  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    
-  _______,    _______,    _______,                _______,                _______,                _______,                _______,    _______,    _______,    _______,    _______,    _______
-),
-LAYOUT_all(
-  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    _______,
-  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    
-  _______,    _______,    _______,                _______,                _______,                _______,                _______,    _______,    _______,    _______,    _______,    _______
-)
-
-
-
+    [1] = LAYOUT_all(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, KC_HOME,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,
+        RESET,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______, _______, _______, _______
+    ),
+    [2] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______, _______, _______, _______
+    ),
+    [3] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______, _______, _______, _______
+    ),
 };
-
diff --git a/keyboards/boardsource/the_mark/the_mark.h b/keyboards/boardsource/the_mark/the_mark.h
index 9d527f9467..163d5c256c 100644
--- a/keyboards/boardsource/the_mark/the_mark.h
+++ b/keyboards/boardsource/the_mark/the_mark.h
@@ -18,54 +18,92 @@
 
 #include "quantum.h"
 
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
+#define ___ KC_NO
+
+/*
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┐    ┌───────┐
+ *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E ││0F │    │0D     │ 2u Backspace
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┤    └─┬─────┤
+ *              │10   │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E   ││1F │      │     │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤├───┤   ┌──┴┐2D  │ ISO Enter
+ *  LShift      │20    │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D      ││2F │   │1E │    │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘└───┘   └───┴────┘
+ * │31      │   │31  │30 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D    │┌───┐
+ * └────────┘   ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┘│3E │
+ *              │40  │41  │43  │44      │46  │48        │4A │4B │4C │┌───┼───┼───┐
+ *              └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┘│4D │4E │4F │
+ *                                                                   └───┴───┴───┘
+ *                             ┌────────────────────────┬─────┬─────┐
+ *                 6.25u Space │46                      │4A   │4B   │ RWKL
+ *                             └────────────────────────┴─────┴─────┘
  */
+
 #define LAYOUT_all( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314,       \
-	K400, K401,       K403, K404,       K406,       K408,       K410, K411, K412, K413, K414, K415  \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2D, K2F, \
+    K31, K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E,      \
+    K40, K41,      K43, K44,      K46,      K48,      K4A, K4B, K4C, K4D, K4E, K4F  \
 ) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO, K215 }, \
-	{ K301,  K300,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  KC_NO}, \
-	{ K400,  K401,  KC_NO, K403,  K404,  KC_NO, K406,  KC_NO, K408,  KC_NO, K410,  K411,  K412,  K413,  K414,  K415 }  \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+    { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, ___ }, \
+    { K40, K41, ___, K43, K44, ___, K46, ___, K48, ___, K4A, K4B, K4C, K4D, K4E, K4F }  \
 }
 
 #define LAYOUT_ansi( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314,       \
-	K400, K401,       K403,             K406,                   K410, K411, K412, K413, K414, K415  \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F, \
+    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2D, K2F, \
+    K31,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E,      \
+    K40, K41,      K43,           K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
 ) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO, K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO, K215 }, \
-	{ KC_NO, K300,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  KC_NO}, \
-	{ K400,  K401,  KC_NO, K403,  KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  K411,  K412,  K413,  K414,  K415 }  \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, K0F }, \
+    { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
+    { ___, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, ___ }, \
+    { K40, K41, ___, K43, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D, K4E, K4F }  \
 }
 
+#define LAYOUT_ansi_split_bs_space( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2D, K2F, \
+    K31,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E,      \
+    K40, K41,      K43, K44,      K46,      K48,      K4A, K4B, K4C, K4D, K4E, K4F  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+    { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
+    { ___, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, ___ }, \
+    { K40, K41, ___, K43, K44, ___, K46, ___, K48, ___, K4A, K4B, K4C, K4D, K4E, K4F }  \
+}
 
 #define LAYOUT_iso( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K114, K213, K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314,       \
-	K400, K401,       K403,             K406,                   K410, K411, K412, K413, K414, K415  \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F, \
+    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
+    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1E, K2D, K2F, \
+    K31, K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E,      \
+    K40, K41,      K43,           K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
 ) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO, K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO, K215 }, \
-	{ K301,  K300,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  KC_NO}, \
-	{ K400,  K401,  KC_NO, K403,  KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  K411,  K412,  K413,  K414,  K415 }  \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, K0F }, \
+    { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, ___ }, \
+    { K40, K41, ___, K43, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D, K4E, K4F }  \
 }
 
+#define LAYOUT_iso_split_bs_space( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
+    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1E, K2D, K2F, \
+    K31, K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E,      \
+    K40, K41,      K43, K44,      K46,      K48,      K4A, K4B, K4C, K4D, K4E, K4F  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+    { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, ___ }, \
+    { K40, K41, ___, K43, K44, ___, K46, ___, K48, ___, K4A, K4B, K4C, K4D, K4E, K4F }  \
+}
diff --git a/keyboards/four_banger/config.h b/keyboards/bpiphany/four_banger/config.h
similarity index 100%
rename from keyboards/four_banger/config.h
rename to keyboards/bpiphany/four_banger/config.h
diff --git a/keyboards/four_banger/four_banger.c b/keyboards/bpiphany/four_banger/four_banger.c
similarity index 100%
rename from keyboards/four_banger/four_banger.c
rename to keyboards/bpiphany/four_banger/four_banger.c
diff --git a/keyboards/four_banger/four_banger.h b/keyboards/bpiphany/four_banger/four_banger.h
similarity index 100%
rename from keyboards/four_banger/four_banger.h
rename to keyboards/bpiphany/four_banger/four_banger.h
diff --git a/keyboards/four_banger/info.json b/keyboards/bpiphany/four_banger/info.json
similarity index 100%
rename from keyboards/four_banger/info.json
rename to keyboards/bpiphany/four_banger/info.json
diff --git a/keyboards/four_banger/keymaps/default/keymap.c b/keyboards/bpiphany/four_banger/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/four_banger/keymaps/default/keymap.c
rename to keyboards/bpiphany/four_banger/keymaps/default/keymap.c
diff --git a/keyboards/four_banger/readme.md b/keyboards/bpiphany/four_banger/readme.md
similarity index 82%
rename from keyboards/four_banger/readme.md
rename to keyboards/bpiphany/four_banger/readme.md
index 913ca6ee85..d508447b56 100644
--- a/keyboards/four_banger/readme.md
+++ b/keyboards/bpiphany/four_banger/readme.md
@@ -9,6 +9,6 @@ Hardware Availability: [1up Keyboards](https://1upkeyboards.com/)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make four_banger:default
+    make bpiphany/four_banger:default
 
-See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
\ No newline at end of file
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/keyboards/four_banger/rules.mk b/keyboards/bpiphany/four_banger/rules.mk
similarity index 100%
rename from keyboards/four_banger/rules.mk
rename to keyboards/bpiphany/four_banger/rules.mk
diff --git a/keyboards/bpiphany/ghost_squid/info.json b/keyboards/bpiphany/ghost_squid/info.json
new file mode 100644
index 0000000000..698e3c21de
--- /dev/null
+++ b/keyboards/bpiphany/ghost_squid/info.json
@@ -0,0 +1,121 @@
+{
+    "keyboard_name": "Bathroom Epiphanies Ghost Squid",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen,", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Ins", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+                {"label":"Num Lock", "x":18.5, "y":1.25},
+                {"label":"/", "x":19.5, "y":1.25},
+                {"label":"*", "x":20.5, "y":1.25},
+                {"label":"-", "x":21.5, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page DownDN", "x":17.25, "y":2.25},
+                {"label":"7", "x":18.5, "y":2.25},
+                {"label":"8", "x":19.5, "y":2.25},
+                {"label":"9", "x":20.5, "y":2.25},
+                {"label":"+", "x":21.5, "y":2.25, "h": 2},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"label":"4", "x":18.5, "y":3.25},
+                {"label":"5", "x":19.5, "y":3.25},
+                {"label":"6", "x":20.5, "y":3.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":4.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+                {"label":"1", "x":18.5, "y":4.25},
+                {"label":"2", "x":19.5, "y":4.25},
+                {"label":"3", "x":20.5, "y":4.25},
+                {"label":"Enter", "x":21.5, "y":4.25, "h":2},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Fn", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25},
+                {"label":"0", "x":18.5, "y":5.25, "w":2},
+                {"label":".", "x":20.5, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/hid_liber/config.h b/keyboards/bpiphany/hid_liber/config.h
similarity index 100%
rename from keyboards/hid_liber/config.h
rename to keyboards/bpiphany/hid_liber/config.h
diff --git a/keyboards/hid_liber/hid_liber.c b/keyboards/bpiphany/hid_liber/hid_liber.c
similarity index 100%
rename from keyboards/hid_liber/hid_liber.c
rename to keyboards/bpiphany/hid_liber/hid_liber.c
diff --git a/keyboards/hid_liber/hid_liber.h b/keyboards/bpiphany/hid_liber/hid_liber.h
similarity index 100%
rename from keyboards/hid_liber/hid_liber.h
rename to keyboards/bpiphany/hid_liber/hid_liber.h
diff --git a/keyboards/hid_liber/info.json b/keyboards/bpiphany/hid_liber/info.json
similarity index 100%
rename from keyboards/hid_liber/info.json
rename to keyboards/bpiphany/hid_liber/info.json
diff --git a/keyboards/hid_liber/keymaps/bakageta/config.h b/keyboards/bpiphany/hid_liber/keymaps/bakageta/config.h
similarity index 100%
rename from keyboards/hid_liber/keymaps/bakageta/config.h
rename to keyboards/bpiphany/hid_liber/keymaps/bakageta/config.h
diff --git a/keyboards/hid_liber/keymaps/bakageta/keymap.c b/keyboards/bpiphany/hid_liber/keymaps/bakageta/keymap.c
similarity index 100%
rename from keyboards/hid_liber/keymaps/bakageta/keymap.c
rename to keyboards/bpiphany/hid_liber/keymaps/bakageta/keymap.c
diff --git a/keyboards/hid_liber/keymaps/bakageta/readme.md b/keyboards/bpiphany/hid_liber/keymaps/bakageta/readme.md
similarity index 100%
rename from keyboards/hid_liber/keymaps/bakageta/readme.md
rename to keyboards/bpiphany/hid_liber/keymaps/bakageta/readme.md
diff --git a/keyboards/hid_liber/keymaps/bakageta/rules.mk b/keyboards/bpiphany/hid_liber/keymaps/bakageta/rules.mk
similarity index 100%
rename from keyboards/hid_liber/keymaps/bakageta/rules.mk
rename to keyboards/bpiphany/hid_liber/keymaps/bakageta/rules.mk
diff --git a/keyboards/hid_liber/keymaps/default/keymap.c b/keyboards/bpiphany/hid_liber/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/hid_liber/keymaps/default/keymap.c
rename to keyboards/bpiphany/hid_liber/keymaps/default/keymap.c
diff --git a/keyboards/hid_liber/keymaps/default/readme.md b/keyboards/bpiphany/hid_liber/keymaps/default/readme.md
similarity index 100%
rename from keyboards/hid_liber/keymaps/default/readme.md
rename to keyboards/bpiphany/hid_liber/keymaps/default/readme.md
diff --git a/keyboards/hid_liber/matrix.c b/keyboards/bpiphany/hid_liber/matrix.c
similarity index 100%
rename from keyboards/hid_liber/matrix.c
rename to keyboards/bpiphany/hid_liber/matrix.c
diff --git a/keyboards/hid_liber/readme.md b/keyboards/bpiphany/hid_liber/readme.md
similarity index 96%
rename from keyboards/hid_liber/readme.md
rename to keyboards/bpiphany/hid_liber/readme.md
index d70ace123d..3f653cc040 100755
--- a/keyboards/hid_liber/readme.md
+++ b/keyboards/bpiphany/hid_liber/readme.md
@@ -12,6 +12,6 @@ DIY daughterboard for Filco Majestouch TKL developed by Geekhack and Deskthority
 
 Make example for this keyboard (after setting up your build environment):
 
-    make hid_liber:default
+    make bpiphany/hid_liber:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/hid_liber/rules.mk b/keyboards/bpiphany/hid_liber/rules.mk
similarity index 100%
rename from keyboards/hid_liber/rules.mk
rename to keyboards/bpiphany/hid_liber/rules.mk
diff --git a/keyboards/cannonkeys/hoodrowg/info.json b/keyboards/cannonkeys/hoodrowg/info.json
index 6b43a4b072..63c53ac5b3 100644
--- a/keyboards/cannonkeys/hoodrowg/info.json
+++ b/keyboards/cannonkeys/hoodrowg/info.json
@@ -3,8 +3,108 @@
     "url": "https://cannonkeys.com",
     "maintainer": "awkannan",
     "layouts": {
-        "LAYOUT": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "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":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "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}, {"x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":3.5, "w":1.25}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"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.5}, {"label":"Win", "x":1.5, "y":5.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Ctrl", "x":11, "y":5.5, "w":1.5}, {"label":"Win", "x":12.5, "y":5.5}, {"label":"Alt", "x":13.5, "y":5.5, "w":1.5}, {"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_all": {
+            "layout": [
+                {"x": 0, "y": 0},
+
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+                {"x": 9.5, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
+
+                {"x": 0, "y": 1.5},
+                {"x": 1, "y": 1.5},
+                {"x": 2, "y": 1.5},
+                {"x": 3, "y": 1.5},
+                {"x": 4, "y": 1.5},
+                {"x": 5, "y": 1.5},
+                {"x": 6, "y": 1.5},
+                {"x": 7, "y": 1.5},
+                {"x": 8, "y": 1.5},
+                {"x": 9, "y": 1.5},
+                {"x": 10, "y": 1.5},
+                {"x": 11, "y": 1.5},
+                {"x": 12, "y": 1.5},
+                {"x": 13, "y": 1.5, "w": 2},
+
+                {"x": 15.25, "y": 1.5},
+                {"x": 16.25, "y": 1.5},
+                {"x": 17.25, "y": 1.5},
+
+                {"x": 0, "y": 2.5, "w": 1.5},
+                {"x": 1.5, "y": 2.5},
+                {"x": 2.5, "y": 2.5},
+                {"x": 3.5, "y": 2.5},
+                {"x": 4.5, "y": 2.5},
+                {"x": 5.5, "y": 2.5},
+                {"x": 6.5, "y": 2.5},
+                {"x": 7.5, "y": 2.5},
+                {"x": 8.5, "y": 2.5},
+                {"x": 9.5, "y": 2.5},
+                {"x": 10.5, "y": 2.5},
+                {"x": 11.5, "y": 2.5},
+                {"x": 12.5, "y": 2.5},
+                {"x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"x": 15.25, "y": 2.5},
+                {"x": 16.25, "y": 2.5},
+                {"x": 17.25, "y": 2.5},
+
+                {"x": 0, "y": 3.5, "w": 1.75},
+                {"x": 1.75, "y": 3.5},
+                {"x": 2.75, "y": 3.5},
+                {"x": 3.75, "y": 3.5},
+                {"x": 4.75, "y": 3.5},
+                {"x": 5.75, "y": 3.5},
+                {"x": 6.75, "y": 3.5},
+                {"x": 7.75, "y": 3.5},
+                {"x": 8.75, "y": 3.5},
+                {"x": 9.75, "y": 3.5},
+                {"x": 10.75, "y": 3.5},
+                {"x": 11.75, "y": 3.5},
+                {"x": 12.75, "y": 3.5},
+                {"x": 13.75, "y": 3.5, "w": 1.25},
+
+                {"x": 0, "y": 4.5, "w": 1.25},
+                {"x": 1.25, "y": 4.5},
+                {"x": 2.25, "y": 4.5},
+                {"x": 3.25, "y": 4.5},
+                {"x": 4.25, "y": 4.5},
+                {"x": 5.25, "y": 4.5},
+                {"x": 6.25, "y": 4.5},
+                {"x": 7.25, "y": 4.5},
+                {"x": 8.25, "y": 4.5},
+                {"x": 9.25, "y": 4.5},
+                {"x": 10.25, "y": 4.5},
+                {"x": 11.25, "y": 4.5},
+                {"x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"x": 16.25, "y": 4.5},
+
+                {"x": 0, "y": 5.5, "w": 1.5},
+                {"x": 1.5, "y": 5.5},
+                {"x": 2.5, "y": 5.5, "w": 1.5},
+                {"x": 4, "y": 5.5, "w": 7},
+                {"x": 11, "y": 5.5, "w": 1.5},
+                {"x": 12.5, "y": 5.5},
+                {"x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"x": 15.25, "y": 5.5},
+                {"x": 16.25, "y": 5.5},
+                {"x": 17.25, "y": 5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/capsunlocked/cu75/rules.mk b/keyboards/capsunlocked/cu75/rules.mk
index 6274267ab1..d3979a9149 100644
--- a/keyboards/capsunlocked/cu75/rules.mk
+++ b/keyboards/capsunlocked/cu75/rules.mk
@@ -9,4 +9,6 @@ BOOTLOADER = atmel-dfu
 #
 BACKLIGHT_DRIVER = custom
 
-SRC = ../lfkeyboards/TWIlib.c ../lfkeyboards/issi.c ../lfkeyboards/lighting.c
+# TODO: These boards need to be converted to RGB Matrix
+VPATH += keyboards/lfkeyboards
+SRC = TWIlib.c issi.c lighting.c
diff --git a/keyboards/plexus75/config.h b/keyboards/checkerboards/plexus75/config.h
similarity index 100%
rename from keyboards/plexus75/config.h
rename to keyboards/checkerboards/plexus75/config.h
diff --git a/keyboards/plexus75/info.json b/keyboards/checkerboards/plexus75/info.json
similarity index 100%
rename from keyboards/plexus75/info.json
rename to keyboards/checkerboards/plexus75/info.json
diff --git a/keyboards/plexus75/keymaps/default/config.h b/keyboards/checkerboards/plexus75/keymaps/default/config.h
similarity index 100%
rename from keyboards/plexus75/keymaps/default/config.h
rename to keyboards/checkerboards/plexus75/keymaps/default/config.h
diff --git a/keyboards/plexus75/keymaps/default/keymap.c b/keyboards/checkerboards/plexus75/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/plexus75/keymaps/default/keymap.c
rename to keyboards/checkerboards/plexus75/keymaps/default/keymap.c
diff --git a/keyboards/plexus75/keymaps/default/readme.md b/keyboards/checkerboards/plexus75/keymaps/default/readme.md
similarity index 100%
rename from keyboards/plexus75/keymaps/default/readme.md
rename to keyboards/checkerboards/plexus75/keymaps/default/readme.md
diff --git a/keyboards/plexus75/keymaps/default_3u/keymap.c b/keyboards/checkerboards/plexus75/keymaps/default_3u/keymap.c
similarity index 100%
rename from keyboards/plexus75/keymaps/default_3u/keymap.c
rename to keyboards/checkerboards/plexus75/keymaps/default_3u/keymap.c
diff --git a/keyboards/plexus75/keymaps/default_3u/readme.md b/keyboards/checkerboards/plexus75/keymaps/default_3u/readme.md
similarity index 100%
rename from keyboards/plexus75/keymaps/default_3u/readme.md
rename to keyboards/checkerboards/plexus75/keymaps/default_3u/readme.md
diff --git a/keyboards/plexus75/keymaps/default_7u/keymap.c b/keyboards/checkerboards/plexus75/keymaps/default_7u/keymap.c
similarity index 100%
rename from keyboards/plexus75/keymaps/default_7u/keymap.c
rename to keyboards/checkerboards/plexus75/keymaps/default_7u/keymap.c
diff --git a/keyboards/plexus75/keymaps/default_7u/readme.md b/keyboards/checkerboards/plexus75/keymaps/default_7u/readme.md
similarity index 100%
rename from keyboards/plexus75/keymaps/default_7u/readme.md
rename to keyboards/checkerboards/plexus75/keymaps/default_7u/readme.md
diff --git a/keyboards/plexus75/keymaps/via/keymap.c b/keyboards/checkerboards/plexus75/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/plexus75/keymaps/via/keymap.c
rename to keyboards/checkerboards/plexus75/keymaps/via/keymap.c
diff --git a/keyboards/nebula12/keymaps/via/rules.mk b/keyboards/checkerboards/plexus75/keymaps/via/rules.mk
old mode 100755
new mode 100644
similarity index 100%
rename from keyboards/nebula12/keymaps/via/rules.mk
rename to keyboards/checkerboards/plexus75/keymaps/via/rules.mk
diff --git a/keyboards/plexus75/plexus75.h b/keyboards/checkerboards/plexus75/plexus75.h
similarity index 100%
rename from keyboards/plexus75/plexus75.h
rename to keyboards/checkerboards/plexus75/plexus75.h
diff --git a/keyboards/plexus75/readme.md b/keyboards/checkerboards/plexus75/readme.md
similarity index 94%
rename from keyboards/plexus75/readme.md
rename to keyboards/checkerboards/plexus75/readme.md
index 4cc2ff2b09..5d63086bab 100644
--- a/keyboards/plexus75/readme.md
+++ b/keyboards/checkerboards/plexus75/readme.md
@@ -10,6 +10,6 @@ The Plexus75 is a 60% ortholinear keyboard based on the XD75 but instead of an a
 
 Make example for this keyboard (after setting up your build environment):
 
-    make plexus75:default
+    make checkerboards/plexus75:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/plexus75/rules.mk b/keyboards/checkerboards/plexus75/rules.mk
similarity index 100%
rename from keyboards/plexus75/rules.mk
rename to keyboards/checkerboards/plexus75/rules.mk
diff --git a/keyboards/pursuit40/config.h b/keyboards/checkerboards/pursuit40/config.h
similarity index 100%
rename from keyboards/pursuit40/config.h
rename to keyboards/checkerboards/pursuit40/config.h
diff --git a/keyboards/pursuit40/info.json b/keyboards/checkerboards/pursuit40/info.json
similarity index 100%
rename from keyboards/pursuit40/info.json
rename to keyboards/checkerboards/pursuit40/info.json
diff --git a/keyboards/pursuit40/keymaps/default/config.h b/keyboards/checkerboards/pursuit40/keymaps/default/config.h
similarity index 100%
rename from keyboards/pursuit40/keymaps/default/config.h
rename to keyboards/checkerboards/pursuit40/keymaps/default/config.h
diff --git a/keyboards/pursuit40/keymaps/default/keymap.c b/keyboards/checkerboards/pursuit40/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/pursuit40/keymaps/default/keymap.c
rename to keyboards/checkerboards/pursuit40/keymaps/default/keymap.c
diff --git a/keyboards/pursuit40/keymaps/default/readme.md b/keyboards/checkerboards/pursuit40/keymaps/default/readme.md
similarity index 100%
rename from keyboards/pursuit40/keymaps/default/readme.md
rename to keyboards/checkerboards/pursuit40/keymaps/default/readme.md
diff --git a/keyboards/pursuit40/keymaps/via/keymap.c b/keyboards/checkerboards/pursuit40/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/pursuit40/keymaps/via/keymap.c
rename to keyboards/checkerboards/pursuit40/keymaps/via/keymap.c
diff --git a/keyboards/nebula68/keymaps/via/rules.mk b/keyboards/checkerboards/pursuit40/keymaps/via/rules.mk
old mode 100755
new mode 100644
similarity index 100%
rename from keyboards/nebula68/keymaps/via/rules.mk
rename to keyboards/checkerboards/pursuit40/keymaps/via/rules.mk
diff --git a/keyboards/pursuit40/pursuit40.c b/keyboards/checkerboards/pursuit40/pursuit40.c
similarity index 100%
rename from keyboards/pursuit40/pursuit40.c
rename to keyboards/checkerboards/pursuit40/pursuit40.c
diff --git a/keyboards/pursuit40/pursuit40.h b/keyboards/checkerboards/pursuit40/pursuit40.h
similarity index 100%
rename from keyboards/pursuit40/pursuit40.h
rename to keyboards/checkerboards/pursuit40/pursuit40.h
diff --git a/keyboards/pursuit40/readme.md b/keyboards/checkerboards/pursuit40/readme.md
similarity index 94%
rename from keyboards/pursuit40/readme.md
rename to keyboards/checkerboards/pursuit40/readme.md
index 86cd043f38..b2193fec91 100644
--- a/keyboards/pursuit40/readme.md
+++ b/keyboards/checkerboards/pursuit40/readme.md
@@ -10,6 +10,6 @@ The Pursuit40 PCB is a modified layout Panc40 by Alex Panc. It's similar to trad
 
 Make example for this keyboard (after setting up your build environment):
 
-    make pursuit40:default
+    make checkerboards/pursuit40:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/pursuit40/rules.mk b/keyboards/checkerboards/pursuit40/rules.mk
similarity index 100%
rename from keyboards/pursuit40/rules.mk
rename to keyboards/checkerboards/pursuit40/rules.mk
diff --git a/keyboards/quark/config.h b/keyboards/checkerboards/quark/config.h
similarity index 100%
rename from keyboards/quark/config.h
rename to keyboards/checkerboards/quark/config.h
diff --git a/keyboards/quark/info.json b/keyboards/checkerboards/quark/info.json
similarity index 100%
rename from keyboards/quark/info.json
rename to keyboards/checkerboards/quark/info.json
diff --git a/keyboards/quark/keymaps/ajp10304/keymap.c b/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c
similarity index 100%
rename from keyboards/quark/keymaps/ajp10304/keymap.c
rename to keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c
diff --git a/keyboards/quark/keymaps/ajp10304/readme.md b/keyboards/checkerboards/quark/keymaps/ajp10304/readme.md
similarity index 100%
rename from keyboards/quark/keymaps/ajp10304/readme.md
rename to keyboards/checkerboards/quark/keymaps/ajp10304/readme.md
diff --git a/keyboards/quark/keymaps/ajp10304/rules.mk b/keyboards/checkerboards/quark/keymaps/ajp10304/rules.mk
similarity index 100%
rename from keyboards/quark/keymaps/ajp10304/rules.mk
rename to keyboards/checkerboards/quark/keymaps/ajp10304/rules.mk
diff --git a/keyboards/quark/keymaps/default/config.h b/keyboards/checkerboards/quark/keymaps/default/config.h
similarity index 100%
rename from keyboards/quark/keymaps/default/config.h
rename to keyboards/checkerboards/quark/keymaps/default/config.h
diff --git a/keyboards/quark/keymaps/default/keymap.c b/keyboards/checkerboards/quark/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/quark/keymaps/default/keymap.c
rename to keyboards/checkerboards/quark/keymaps/default/keymap.c
diff --git a/keyboards/quark/keymaps/default/readme.md b/keyboards/checkerboards/quark/keymaps/default/readme.md
similarity index 100%
rename from keyboards/quark/keymaps/default/readme.md
rename to keyboards/checkerboards/quark/keymaps/default/readme.md
diff --git a/keyboards/quark/keymaps/default_4x12/config.h b/keyboards/checkerboards/quark/keymaps/default_4x12/config.h
similarity index 100%
rename from keyboards/quark/keymaps/default_4x12/config.h
rename to keyboards/checkerboards/quark/keymaps/default_4x12/config.h
diff --git a/keyboards/quark/keymaps/default_4x12/keymap.c b/keyboards/checkerboards/quark/keymaps/default_4x12/keymap.c
similarity index 100%
rename from keyboards/quark/keymaps/default_4x12/keymap.c
rename to keyboards/checkerboards/quark/keymaps/default_4x12/keymap.c
diff --git a/keyboards/quark/keymaps/default_4x12_2x225u/config.h b/keyboards/checkerboards/quark/keymaps/default_4x12_2x225u/config.h
similarity index 100%
rename from keyboards/quark/keymaps/default_4x12_2x225u/config.h
rename to keyboards/checkerboards/quark/keymaps/default_4x12_2x225u/config.h
diff --git a/keyboards/quark/keymaps/default_4x12_2x225u/keymap.c b/keyboards/checkerboards/quark/keymaps/default_4x12_2x225u/keymap.c
similarity index 100%
rename from keyboards/quark/keymaps/default_4x12_2x225u/keymap.c
rename to keyboards/checkerboards/quark/keymaps/default_4x12_2x225u/keymap.c
diff --git a/keyboards/quark/keymaps/default_4x12_2x3u/config.h b/keyboards/checkerboards/quark/keymaps/default_4x12_2x3u/config.h
similarity index 100%
rename from keyboards/quark/keymaps/default_4x12_2x3u/config.h
rename to keyboards/checkerboards/quark/keymaps/default_4x12_2x3u/config.h
diff --git a/keyboards/quark/keymaps/default_4x12_2x3u/keymap.c b/keyboards/checkerboards/quark/keymaps/default_4x12_2x3u/keymap.c
similarity index 100%
rename from keyboards/quark/keymaps/default_4x12_2x3u/keymap.c
rename to keyboards/checkerboards/quark/keymaps/default_4x12_2x3u/keymap.c
diff --git a/keyboards/quark/keymaps/default_5x12_2x3u/config.h b/keyboards/checkerboards/quark/keymaps/default_5x12_2x3u/config.h
similarity index 100%
rename from keyboards/quark/keymaps/default_5x12_2x3u/config.h
rename to keyboards/checkerboards/quark/keymaps/default_5x12_2x3u/config.h
diff --git a/keyboards/quark/keymaps/default_5x12_2x3u/keymap.c b/keyboards/checkerboards/quark/keymaps/default_5x12_2x3u/keymap.c
similarity index 100%
rename from keyboards/quark/keymaps/default_5x12_2x3u/keymap.c
rename to keyboards/checkerboards/quark/keymaps/default_5x12_2x3u/keymap.c
diff --git a/keyboards/quark/keymaps/default_mit/config.h b/keyboards/checkerboards/quark/keymaps/default_mit/config.h
similarity index 100%
rename from keyboards/quark/keymaps/default_mit/config.h
rename to keyboards/checkerboards/quark/keymaps/default_mit/config.h
diff --git a/keyboards/quark/keymaps/default_mit/keymap.c b/keyboards/checkerboards/quark/keymaps/default_mit/keymap.c
similarity index 100%
rename from keyboards/quark/keymaps/default_mit/keymap.c
rename to keyboards/checkerboards/quark/keymaps/default_mit/keymap.c
diff --git a/keyboards/quark/keymaps/pezhore/config.h b/keyboards/checkerboards/quark/keymaps/pezhore/config.h
similarity index 100%
rename from keyboards/quark/keymaps/pezhore/config.h
rename to keyboards/checkerboards/quark/keymaps/pezhore/config.h
diff --git a/keyboards/quark/keymaps/pezhore/keymap.c b/keyboards/checkerboards/quark/keymaps/pezhore/keymap.c
similarity index 100%
rename from keyboards/quark/keymaps/pezhore/keymap.c
rename to keyboards/checkerboards/quark/keymaps/pezhore/keymap.c
diff --git a/keyboards/quark/keymaps/via/keymap.c b/keyboards/checkerboards/quark/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/quark/keymaps/via/keymap.c
rename to keyboards/checkerboards/quark/keymaps/via/keymap.c
diff --git a/keyboards/nebula68b/keymaps/via/rules.mk b/keyboards/checkerboards/quark/keymaps/via/rules.mk
old mode 100755
new mode 100644
similarity index 100%
rename from keyboards/nebula68b/keymaps/via/rules.mk
rename to keyboards/checkerboards/quark/keymaps/via/rules.mk
diff --git a/keyboards/quark/quark.c b/keyboards/checkerboards/quark/quark.c
similarity index 100%
rename from keyboards/quark/quark.c
rename to keyboards/checkerboards/quark/quark.c
diff --git a/keyboards/quark/quark.h b/keyboards/checkerboards/quark/quark.h
similarity index 100%
rename from keyboards/quark/quark.h
rename to keyboards/checkerboards/quark/quark.h
diff --git a/keyboards/quark/readme.md b/keyboards/checkerboards/quark/readme.md
similarity index 95%
rename from keyboards/quark/readme.md
rename to keyboards/checkerboards/quark/readme.md
index 88b742f821..743252758a 100644
--- a/keyboards/quark/readme.md
+++ b/keyboards/checkerboards/quark/readme.md
@@ -10,6 +10,6 @@ The Quark PCB is a modified layout for the Planck by OLKB. It's similar to a Pla
 
 Make example for this keyboard (after setting up your build environment):
 
-    make quark:default
+    make checkerboards/quark:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/quark/rules.mk b/keyboards/checkerboards/quark/rules.mk
similarity index 100%
rename from keyboards/quark/rules.mk
rename to keyboards/checkerboards/quark/rules.mk
diff --git a/keyboards/cmm_studio/fuji65/info.json b/keyboards/cmm_studio/fuji65/info.json
index 9311f25453..4d5080a831 100644
--- a/keyboards/cmm_studio/fuji65/info.json
+++ b/keyboards/cmm_studio/fuji65/info.json
@@ -1,7 +1,7 @@
 {
     "keyboard_name": "cmm.studio fuji65",
     "url": "",
-    "maintainer": "qmk",
+    "maintainer": "CMMS-Freather",
     "layouts": {
         "LAYOUT": {
             "layout": [
@@ -20,7 +20,7 @@
                 { "label": "K0C (B5,D2)", "x": 12, "y": 0 },
                 { "label": "K0D (B5,D1)", "x": 13, "y": 0 },
                 { "label": "K0E (B5,D0)", "x": 14, "y": 0 },
-                { "label": "K10 (B4,F7)", "x": 0, "y": 1 },
+                { "label": "K10 (B4,F7)", "x": 0, "y": 1, "w": 1.5 },
                 { "label": "K11 (B4,F6)", "x": 1.5, "y": 1 },
                 { "label": "K12 (B4,F5)", "x": 2.5, "y": 1 },
                 { "label": "K13 (B4,F4)", "x": 3.5, "y": 1 },
diff --git a/keyboards/contra/keymaps/maxr1998/rules.mk b/keyboards/contra/keymaps/maxr1998/rules.mk
index e1ba074290..8607ce19ef 100644
--- a/keyboards/contra/keymaps/maxr1998/rules.mk
+++ b/keyboards/contra/keymaps/maxr1998/rules.mk
@@ -1,7 +1,7 @@
 RGBLIGHT_ENABLE = yes
 KEY_LOCK_ENABLE = yes
 
-EXTRAFLAGS      += -flto
+LTO_ENABLE      = yes
 UNICODE_ENABLE  = no
 MOUSEKEY_ENABLE = no
 
diff --git a/keyboards/crkbd/keymaps/ardakilic/config.h b/keyboards/crkbd/keymaps/ardakilic/config.h
index 78602b22ab..7a3bb76b38 100644
--- a/keyboards/crkbd/keymaps/ardakilic/config.h
+++ b/keyboards/crkbd/keymaps/ardakilic/config.h
@@ -24,6 +24,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Select hand configuration */
 
 #define MASTER_LEFT
+
+#define SPLIT_WPM_ENABLE
+
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
@@ -54,4 +57,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define NO_ACTION_ONESHOT
 // Size optimisations END
-*/
\ No newline at end of file
+*/
diff --git a/keyboards/crkbd/keymaps/ardakilic/keymap.c b/keyboards/crkbd/keymaps/ardakilic/keymap.c
index 758cdbab60..a611c59223 100644
--- a/keyboards/crkbd/keymaps/ardakilic/keymap.c
+++ b/keyboards/crkbd/keymaps/ardakilic/keymap.c
@@ -249,7 +249,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
 // #include <stdio.h>
 
 // bongo cat
diff --git a/keyboards/crkbd/keymaps/snowe/rules.mk b/keyboards/crkbd/keymaps/snowe/rules.mk
index ce3b5928fa..96ae4bbf95 100644
--- a/keyboards/crkbd/keymaps/snowe/rules.mk
+++ b/keyboards/crkbd/keymaps/snowe/rules.mk
@@ -21,6 +21,6 @@ OCEAN_DREAM_ENABLE = yes
 LUNA_ENABLE = no # disabled so travis build succeeds
 
 # if firmware size over limit, try this option
-CFLAGS += -flto
+LTO_ENABLE = yes
 
 WPM_ENABLE = yes
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_right/rules.mk b/keyboards/crkbd/keymaps/vlukash_trackpad_right/rules.mk
index bd53c19211..92ded45e93 100644
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_right/rules.mk
+++ b/keyboards/crkbd/keymaps/vlukash_trackpad_right/rules.mk
@@ -1,5 +1,6 @@
 # Build Options
 POINTING_DEVICE_ENABLE = yes # Generic Pointer, not as big as mouse keys hopefully.
+POINTING_DEVICE_DRIVER = custom
 MOUSEKEY_ENABLE = yes        # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes        # Audio control and System control(+450)
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight.
diff --git a/keyboards/cutie_club/keebcats/dougal/dougal.h b/keyboards/cutie_club/keebcats/dougal/dougal.h
index cd0fa1d2cd..e035177dcd 100644
--- a/keyboards/cutie_club/keebcats/dougal/dougal.h
+++ b/keyboards/cutie_club/keebcats/dougal/dougal.h
@@ -18,17 +18,72 @@
 
 #include "quantum.h"
 
+#define ___ KC_NO
+
+/*
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐      ┌───────┐
+ *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │      │0E     │ 2u Backspace
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤      └─┬─────┤
+ *              │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1F │        │     │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤     ┌──┴┐2D  │ ISO Enter
+ *  LShift      │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2F │     │2C │    │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   ┌─┴───┴────┤
+ * │30      │   │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3F │   │3C        │ 2.75u RShift
+ * └────────┘   ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤   └──────────┘
+ *              │40  │41  │42  │44      │46  │48        │49 │4A │4B │4C │4D │4F │
+ *              └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┴───┘
+ *              ┌────┬────┬────┬────────────────────────┬───┬───┬───┐
+ *              │40  │41  │42  │46                      │49 │4A │4B │ Standard
+ *              └────┴────┴────┴────────────────────────┴───┴───┴───┘
+ *              ┌─────┬─────┬───────────────────────────┬─────┬─────┐
+ *              │40   │41   │46                         │49   │4A   │ WKL
+ *              └─────┴─────┴───────────────────────────┴─────┴─────┘
+ *              ┌─────┬───┬─────┬───────────────────────────┬─────┐
+ *              │40   │41 │42   │46                         │4A   │ Tsangan
+ *              └─────┴───┴─────┴───────────────────────────┴─────┘
+ */
+
 #define LAYOUT_all( \
-    k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_13, k00_14, k00_15, \
-    k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13,         k01_15, \
-    k02_00, k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_12, k02_13,         k02_15, \
-    k03_00, k03_01, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12,         k03_13, k03_15, \
-    k04_00, k04_01, k04_02,         k04_04,         k04_06,         k04_08, k04_09, k04_10, k04_11,         k04_12, k04_13, k04_15  \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1F, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,      k2F, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,      k3D, k3F, \
+    k40, k41, k42,      k44,      k46,      k48, k49, k4A, k4B,      k4C, k4D, k4F  \
 ) \
 { \
-    { k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_13, k00_14, k00_15 }, \
-    { k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13, KC_NO,  k01_15 }, \
-    { k02_00, k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_12, k02_13, KC_NO,  k02_15 }, \
-    { k03_00, k03_01, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12, k03_13, KC_NO,  k03_15 }, \
-    { k04_00, k04_01, k04_02, KC_NO,  k04_04, KC_NO,  k04_06, KC_NO,  k04_08, k04_09, k04_10, k04_11, k04_12, k04_13, KC_NO,  k04_15 }  \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, ___, k1F }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___, k2F }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, ___, k3F }, \
+    { k40, k41, k42, ___, k44, ___, k46, ___, k48, k49, k4A, k4B, k4C, k4D, ___, k4F }  \
+}
+
+#define LAYOUT_65_ansi( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, k2F, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3F, \
+    k40, k41, k42,                k46,           k49, k4A, k4B, k4C, k4D, k4F  \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E, k0F }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, ___, k1F }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, k2D, ___, k2F }, \
+    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, ___, k3F }, \
+    { k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4A, k4B, k4C, k4D, ___, k4F }  \
+}
+
+#define LAYOUT_65_iso( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1F, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3F, \
+    k40, k41, k42,                k46,           k49, k4A, k4B, k4C, k4D, k4F  \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E, k0F }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, ___, ___, k1F }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___, k2F }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, ___, k3F }, \
+    { k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4A, k4B, k4C, k4D, ___, k4F }  \
 }
diff --git a/keyboards/cutie_club/keebcats/dougal/info.json b/keyboards/cutie_club/keebcats/dougal/info.json
index 70c804e20d..f637be7a1a 100644
--- a/keyboards/cutie_club/keebcats/dougal/info.json
+++ b/keyboards/cutie_club/keebcats/dougal/info.json
@@ -79,6 +79,159 @@
                 { "x": 14, "y": 4 },
                 { "x": 15, "y": 4 }
             ]
+        },
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+                {"x":15, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+                {"x":15, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+                {"x":15, "y":2},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4},
+                {"x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_iso": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+                {"x":15, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":15, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
+                {"x":15, "y":2},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4},
+                {"x":15, "y":4}
+            ]
         }
     }
 }
diff --git a/keyboards/cutie_club/keebcats/dougal/keymaps/default_65_ansi/keymap.c b/keyboards/cutie_club/keebcats/dougal/keymaps/default_65_ansi/keymap.c
new file mode 100644
index 0000000000..3de782f742
--- /dev/null
+++ b/keyboards/cutie_club/keebcats/dougal/keymaps/default_65_ansi/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2021 Cutie Club
+ *           2022 QMK / James Young (@noroadsleft)
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_65_ansi(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME,
+        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_PGUP,
+        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_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_ansi(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_PGDN,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
+    ),
+};
diff --git a/keyboards/cutie_club/keebcats/dougal/keymaps/default_65_iso/keymap.c b/keyboards/cutie_club/keebcats/dougal/keymaps/default_65_iso/keymap.c
new file mode 100644
index 0000000000..3154d3ea83
--- /dev/null
+++ b/keyboards/cutie_club/keebcats/dougal/keymaps/default_65_iso/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2021 Cutie Club
+ *           2022 QMK / James Young (@noroadsleft)
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_65_iso(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_HOME,
+        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_PGUP,
+        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_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_iso(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PGUP,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
+    ),
+};
diff --git a/keyboards/dailycraft/wings42/rev1/info.json b/keyboards/dailycraft/wings42/rev1/info.json
new file mode 100644
index 0000000000..863bb3d34e
--- /dev/null
+++ b/keyboards/dailycraft/wings42/rev1/info.json
@@ -0,0 +1,56 @@
+{
+    "keyboard_name": "wings42 rev1",
+    "url": "",
+    "maintainer": "yfuku",
+    "layouts": {
+        "LAYOUT_split_3x6_3": {
+            "layout": [
+                {"label":"L00", "x":0, "y":0.875},
+                {"label":"L01", "x":1, "y":0.625},
+                {"label":"L02", "x":2, "y":0.375},
+                {"label":"L03", "x":3, "y":0},
+                {"label":"L04", "x":4, "y":0},
+                {"label":"L05", "x":5, "y":0.125},
+                {"label":"R00", "x":9, "y":0.125},
+                {"label":"R01", "x":10, "y":0},
+                {"label":"R02", "x":11, "y":0},
+                {"label":"R03", "x":12, "y":0.375},
+                {"label":"R04", "x":13, "y":0.625},
+                {"label":"R05", "x":14, "y":0.875},
+
+                {"label":"L10", "x":0, "y":1.875},
+                {"label":"L11", "x":1, "y":1.625},
+                {"label":"L12", "x":2, "y":1.375},
+                {"label":"L13", "x":3, "y":1},
+                {"label":"L14", "x":4, "y":1},
+                {"label":"L15", "x":5, "y":1.125},
+                {"label":"R10", "x":9, "y":1.125},
+                {"label":"R11", "x":10, "y":1},
+                {"label":"R12", "x":11, "y":1},
+                {"label":"R13", "x":12, "y":1.375},
+                {"label":"R14", "x":13, "y":1.625},
+                {"label":"R15", "x":14, "y":1.875},
+
+                {"label":"L20", "x":0, "y":2.875},
+                {"label":"L21", "x":1, "y":2.625},
+                {"label":"L22", "x":2, "y":2.375},
+                {"label":"L23", "x":3, "y":2},
+                {"label":"L24", "x":4, "y":2},
+                {"label":"L25", "x":5, "y":2.125},
+                {"label":"R20", "x":9, "y":2.125},
+                {"label":"R21", "x":10, "y":2},
+                {"label":"R22", "x":11, "y":2},
+                {"label":"R23", "x":12, "y":2.375},
+                {"label":"R24", "x":13, "y":2.625},
+                {"label":"R25", "x":14, "y":2.875},
+
+                {"label":"L30", "x":4, "y":3},
+                {"label":"L31", "x":5, "y":3.125},
+                {"label":"L32", "x":6, "y":3.375},
+                {"label":"R30", "x":8, "y":3.375},
+                {"label":"R31", "x":9, "y":3.125},
+                {"label":"R32", "x":10, "y":3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/info.json b/keyboards/dailycraft/wings42/rev1_extkeys/info.json
new file mode 100644
index 0000000000..b9a793f112
--- /dev/null
+++ b/keyboards/dailycraft/wings42/rev1_extkeys/info.json
@@ -0,0 +1,60 @@
+{
+    "keyboard_name": "wings42 rev1_extkeys",
+    "url": "",
+    "maintainer": "yfuku",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"L00", "x":0, "y":0.875},
+                {"label":"L01", "x":1, "y":0.625},
+                {"label":"L02", "x":2, "y":0.375},
+                {"label":"L03", "x":3, "y":0},
+                {"label":"L04", "x":4, "y":0},
+                {"label":"L05", "x":5, "y":0.125},
+                {"label":"R00", "x":9, "y":0.125},
+                {"label":"R01", "x":10, "y":0},
+                {"label":"R02", "x":11, "y":0},
+                {"label":"R03", "x":12, "y":0.375},
+                {"label":"R04", "x":13, "y":0.625},
+                {"label":"R05", "x":14, "y":0.875},
+
+                {"label":"L10", "x":0, "y":1.875},
+                {"label":"L11", "x":1, "y":1.625},
+                {"label":"L12", "x":2, "y":1.375},
+                {"label":"L13", "x":3, "y":1},
+                {"label":"L14", "x":4, "y":1},
+                {"label":"L15", "x":5, "y":1.125},
+                {"label":"E01", "x":6, "y":1.625},
+                {"label":"E03", "x":8, "y":1.625},
+                {"label":"R10", "x":9, "y":1.125},
+                {"label":"R11", "x":10, "y":1},
+                {"label":"R12", "x":11, "y":1},
+                {"label":"R13", "x":12, "y":1.375},
+                {"label":"R14", "x":13, "y":1.625},
+                {"label":"R15", "x":14, "y":1.875},
+
+                {"label":"L20", "x":0, "y":2.875},
+                {"label":"L21", "x":1, "y":2.625},
+                {"label":"L22", "x":2, "y":2.375},
+                {"label":"L23", "x":3, "y":2},
+                {"label":"L24", "x":4, "y":2},
+                {"label":"L25", "x":5, "y":2.125},
+                {"label":"E02", "x":6, "y":2.625},
+                {"label":"E04", "x":8, "y":2.625},
+                {"label":"R20", "x":9, "y":2.125},
+                {"label":"R21", "x":10, "y":2},
+                {"label":"R22", "x":11, "y":2},
+                {"label":"R23", "x":12, "y":2.375},
+                {"label":"R24", "x":13, "y":2.625},
+                {"label":"R25", "x":14, "y":2.875},
+
+                {"label":"L30", "x":4, "y":3},
+                {"label":"L31", "x":5, "y":3.125},
+                {"label":"L32", "x":6, "y":3.375},
+                {"label":"R30", "x":8, "y":3.375},
+                {"label":"R31", "x":9, "y":3.125},
+                {"label":"R32", "x":10, "y":3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/dailycraft/wings42/rev2/info.json b/keyboards/dailycraft/wings42/rev2/info.json
new file mode 100644
index 0000000000..4e78697627
--- /dev/null
+++ b/keyboards/dailycraft/wings42/rev2/info.json
@@ -0,0 +1,60 @@
+{
+    "keyboard_name": "wings42 rev2",
+    "url": "",
+    "maintainer": "yfuku",
+    "layouts": {
+        "LAYOUT_split_3x6_3_2": {
+            "layout": [
+                {"label":"L00", "x":0, "y":0.875},
+                {"label":"L01", "x":1, "y":0.625},
+                {"label":"L02", "x":2, "y":0.375},
+                {"label":"L03", "x":3, "y":0},
+                {"label":"L04", "x":4, "y":0},
+                {"label":"L05", "x":5, "y":0.125},
+                {"label":"R00", "x":9, "y":0.125},
+                {"label":"R01", "x":10, "y":0},
+                {"label":"R02", "x":11, "y":0},
+                {"label":"R03", "x":12, "y":0.375},
+                {"label":"R04", "x":13, "y":0.625},
+                {"label":"R05", "x":14, "y":0.875},
+
+                {"label":"L10", "x":0, "y":1.875},
+                {"label":"L11", "x":1, "y":1.625},
+                {"label":"L12", "x":2, "y":1.375},
+                {"label":"L13", "x":3, "y":1},
+                {"label":"L14", "x":4, "y":1},
+                {"label":"L15", "x":5, "y":1.125},
+                {"label":"L31", "x":6, "y":1.625},
+                {"label":"R33", "x":8, "y":1.625},
+                {"label":"R10", "x":9, "y":1.125},
+                {"label":"R11", "x":10, "y":1},
+                {"label":"R12", "x":11, "y":1},
+                {"label":"R13", "x":12, "y":1.375},
+                {"label":"R14", "x":13, "y":1.625},
+                {"label":"R15", "x":14, "y":1.875},
+
+                {"label":"L20", "x":0, "y":2.875},
+                {"label":"L21", "x":1, "y":2.625},
+                {"label":"L22", "x":2, "y":2.375},
+                {"label":"L23", "x":3, "y":2},
+                {"label":"L24", "x":4, "y":2},
+                {"label":"L25", "x":5, "y":2.125},
+                {"label":"L32", "x":6, "y":2.625},
+                {"label":"R34", "x":8, "y":2.625},
+                {"label":"R20", "x":9, "y":2.125},
+                {"label":"R21", "x":10, "y":2},
+                {"label":"R22", "x":11, "y":2},
+                {"label":"R23", "x":12, "y":2.375},
+                {"label":"R24", "x":13, "y":2.625},
+                {"label":"R25", "x":14, "y":2.875},
+
+                {"label":"L33", "x":4, "y":3},
+                {"label":"L34", "x":5, "y":3.125},
+                {"label":"L35", "x":6, "y":3.375},
+                {"label":"R30", "x":8, "y":3.375},
+                {"label":"R31", "x":9, "y":3.125},
+                {"label":"R32", "x":10, "y":3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/demiurge/info.json b/keyboards/demiurge/info.json
index 639f37a888..427d7ce278 100644
--- a/keyboards/demiurge/info.json
+++ b/keyboards/demiurge/info.json
@@ -1,10 +1,87 @@
 {
-    "keyboard_name": "Demiurge", 
-    "url": "", 
-    "maintainer": "ojthetiny", 
+    "keyboard_name": "Demiurge",
+    "url": "",
+    "maintainer": "ojthetiny",
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"label":"F1", "x":0, "y":0}, {"label":"F2", "x":1, "y":0}, {"label":"Esc", "x":2.5, "y":0}, {"label":"!", "x":3.5, "y":0}, {"label":"@", "x":4.5, "y":0}, {"label":"#", "x":5.5, "y":0}, {"label":"$", "x":6.5, "y":0}, {"label":"%", "x":7.5, "y":0}, {"label":"^", "x":8.5, "y":0}, {"label":"&", "x":9.5, "y":0}, {"label":"*", "x":10.5, "y":0}, {"label":"(", "x":11.5, "y":0}, {"label":")", "x":12.5, "y":0}, {"label":"_", "x":13.5, "y":0}, {"label":"+", "x":14.5, "y":0}, {"label":"|", "x":15.5, "y":0}, {"label":"Backspace", "x":15.5, "y":0, "w":2}, {"label":"Del", "x":16.5, "y":0}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.5, "y":1, "w":1.5}, {"label":"Q", "x":4, "y":1}, {"label":"W", "x":5, "y":1}, {"label":"E", "x":6, "y":1}, {"label":"R", "x":7, "y":1}, {"label":"T", "x":8, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"Backspace", "x":16, "y":1, "w":1.5}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Caps Lock", "x":2.5, "y":2, "w":1.75}, {"label":"A", "x":4.25, "y":2}, {"label":"S", "x":5.25, "y":2}, {"label":"D", "x":6.25, "y":2}, {"label":"F", "x":7.25, "y":2}, {"label":"G", "x":8.25, "y":2}, {"label":"H", "x":9.25, "y":2}, {"label":"J", "x":10.25, "y":2}, {"label":"K", "x":11.25, "y":2}, {"label":"L", "x":12.25, "y":2}, {"label":":", "x":13.25, "y":2}, {"label":"\"", "x":14.25, "y":2}, {"label":"Enter", "x":15.25, "y":2, "w":2.25}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.5, "y":3, "w":2.25}, {"label":"Z", "x":4.75, "y":3}, {"label":"X", "x":5.75, "y":3}, {"label":"C", "x":6.75, "y":3}, {"label":"V", "x":7.75, "y":3}, {"label":"B", "x":8.75, "y":3}, {"label":"N", "x":9.75, "y":3}, {"label":"M", "x":10.75, "y":3}, {"label":"<", "x":11.75, "y":3}, {"label":">", "x":12.75, "y":3}, {"label":"?", "x":13.75, "y":3}, {"label":"Shift", "x":14.75, "y":3, "w":1.75}, {"label":"Shift", "x":14.75, "y":3, "w":2.75}, {"label":"Fn", "x":16.5, "y":3}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Ctrl", "x":2.5, "y":4, "w":1.5}, {"label":"Alt", "x":5, "y":4, "w":1.5}, {"x":6.5, "y":4, "w":7}, {"label":"Alt", "x":13.5, "y":4, "w":1.5}, {"label":"Ctrl", "x":16, "y":4, "w":1.5}]
+            "layout": [
+                {"label":"F1", "x":0, "y":0},
+                {"label":"F2", "x":1, "y":0},
+                {"label":"Esc", "x":2.5, "y":0},
+                {"label":"1!", "x":3.5, "y":0},
+                {"label":"2@", "x":4.5, "y":0},
+                {"label":"3#", "x":5.5, "y":0},
+                {"label":"4$", "x":6.5, "y":0},
+                {"label":"5%", "x":7.5, "y":0},
+                {"label":"6^", "x":8.5, "y":0},
+                {"label":"7&", "x":9.5, "y":0},
+                {"label":"8*", "x":10.5, "y":0},
+                {"label":"9(", "x":11.5, "y":0},
+                {"label":"0)", "x":12.5, "y":0},
+                {"label":"-_", "x":13.5, "y":0},
+                {"label":"=+", "x":14.5, "y":0},
+                {"label":"Backspace", "x":15.5, "y":0},
+                {"label":"Del", "x":16.5, "y":0},
+
+                {"label":"F3", "x":0, "y":1},
+                {"label":"F4", "x":1, "y":1},
+                {"label":"Tab", "x":2.5, "y":1, "w":1.5},
+                {"label":"Q", "x":4, "y":1},
+                {"label":"W", "x":5, "y":1},
+                {"label":"E", "x":6, "y":1},
+                {"label":"R", "x":7, "y":1},
+                {"label":"T", "x":8, "y":1},
+                {"label":"Y", "x":9, "y":1},
+                {"label":"U", "x":10, "y":1},
+                {"label":"I", "x":11, "y":1},
+                {"label":"O", "x":12, "y":1},
+                {"label":"P", "x":13, "y":1},
+                {"label":"[{", "x":14, "y":1},
+                {"label":"]}", "x":15, "y":1},
+                {"label":"\\|", "x":16, "y":1, "w":1.5},
+
+                {"label":"F5", "x":0, "y":2},
+                {"label":"F6", "x":1, "y":2},
+                {"label":"Caps Lock", "x":2.5, "y":2, "w":1.75},
+                {"label":"A", "x":4.25, "y":2},
+                {"label":"S", "x":5.25, "y":2},
+                {"label":"D", "x":6.25, "y":2},
+                {"label":"F", "x":7.25, "y":2},
+                {"label":"G", "x":8.25, "y":2},
+                {"label":"H", "x":9.25, "y":2},
+                {"label":"J", "x":10.25, "y":2},
+                {"label":"K", "x":11.25, "y":2},
+                {"label":"L", "x":12.25, "y":2},
+                {"label":";:", "x":13.25, "y":2},
+                {"label":"'\"", "x":14.25, "y":2},
+                {"label":"Enter", "x":15.25, "y":2, "w":2.25},
+
+                {"label":"F7", "x":0, "y":3},
+                {"label":"F8", "x":1, "y":3},
+                {"label":"Shift", "x":2.5, "y":3, "w":2.25},
+                {"label":"Z", "x":4.75, "y":3},
+                {"label":"X", "x":5.75, "y":3},
+                {"label":"C", "x":6.75, "y":3},
+                {"label":"V", "x":7.75, "y":3},
+                {"label":"B", "x":8.75, "y":3},
+                {"label":"N", "x":9.75, "y":3},
+                {"label":"M", "x":10.75, "y":3},
+                {"label":",<", "x":11.75, "y":3},
+                {"label":".>", "x":12.75, "y":3},
+                {"label":"/?", "x":13.75, "y":3},
+                {"label":"Shift", "x":14.75, "y":3, "w":1.75},
+                {"label":"Fn", "x":16.5, "y":3},
+
+                {"label":"F9", "x":0, "y":4},
+                {"label":"F10", "x":1, "y":4},
+                {"label":"Ctrl", "x":2.5, "y":4, "w":1.5},
+                {"label":"GUI", "x":4, "y":4},
+                {"label":"Alt", "x":5, "y":4, "w":1.5},
+                {"label":"Space", "x":6.5, "y":4, "w":7},
+                {"label":"Alt", "x":13.5, "y":4, "w":1.5},
+                {"label":"GUI", "x":15, "y":4},
+                {"label":"Ctrl", "x":16, "y":4, "w":1.5}
+            ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/dichotomy/rules.mk b/keyboards/dichotomy/rules.mk
index a6029e3dbf..420e409e43 100755
--- a/keyboards/dichotomy/rules.mk
+++ b/keyboards/dichotomy/rules.mk
@@ -10,6 +10,7 @@ BOOTLOADER = caterina
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
 #MOUSEKEY_ENABLE = yes	# Mouse keys
 POINTING_DEVICE_ENABLE = yes # Generic Pointer, not as big as mouse keys hopefully.
+POINTING_DEVICE_DRIVER = custom
 EXTRAKEY_ENABLE = yes	# Audio control and System control
 CONSOLE_ENABLE = yes	# Console for debug
 COMMAND_ENABLE = yes   # Commands for debug and configuration
diff --git a/keyboards/ducky/one2mini/1861st/1861st.c b/keyboards/ducky/one2mini/1861st/1861st.c
new file mode 100644
index 0000000000..1c164ea70d
--- /dev/null
+++ b/keyboards/ducky/one2mini/1861st/1861st.c
@@ -0,0 +1,8 @@
+// Copyright 2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "1861st.h"
+
+void bootloader_jump(void) {
+    // TODO: Work out how to jump to LDROM, for now just reset the board.
+    NVIC_SystemReset();
+}
diff --git a/keyboards/ducky/one2mini/1861st/rules.mk b/keyboards/ducky/one2mini/1861st/rules.mk
index 277108c8ac..a5b4708b26 100644
--- a/keyboards/ducky/one2mini/1861st/rules.mk
+++ b/keyboards/ducky/one2mini/1861st/rules.mk
@@ -1,6 +1,9 @@
 MCU_FAMILY = NUMICRO
 MCU_SERIES = NUC123
 
+# Bootloader selection
+BOOTLOADER = custom
+
 # linker script to use
 MCU_LDSCRIPT = NUC123xD4xx0
 
diff --git a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/rules.mk b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/rules.mk
index 15b8ec1baf..e2618e5290 100644
--- a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/rules.mk
+++ b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/rules.mk
@@ -2,6 +2,6 @@ NKRO_ENABLE = yes                 # USB Nkey Rollover
 AUTO_SHIFT_ENABLE = yes      # Auto Shift
 # VELOCIKEY_ENABLE = yes
 
-EXTRAFLAGS += -flto
+LTO_ENABLE = yes
 
 # SRC += dz60rgb.c
diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
index bfa9d8d955..960285b976 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
@@ -86,7 +86,7 @@
 #    define ENABLE_RGB_MATRIX_HUE_PENDULUM
 #    define ENABLE_RGB_MATRIX_HUE_WAVE
 #    define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+// #    define ENABLE_RGB_MATRIX_PIXEL_FLOW
 #    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 // enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
 #    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
diff --git a/keyboards/dztech/dz65rgb/keymaps/drootz/rules.mk b/keyboards/dztech/dz65rgb/keymaps/drootz/rules.mk
index 24a765ab9a..2f8ab8ecc3 100644
--- a/keyboards/dztech/dz65rgb/keymaps/drootz/rules.mk
+++ b/keyboards/dztech/dz65rgb/keymaps/drootz/rules.mk
@@ -2,7 +2,7 @@ DYNAMIC_MACRO_ENABLE = yes
 LEADER_ENABLE = yes
 
 # Firmware size Optimizations
-EXTRAFLAGS += -flto
+LTO_ENABLE = yes
 MOUSEKEY_ENABLE = no
 NKRO_ENABLE = no
 SPACE_CADET_ENABLE = no
diff --git a/keyboards/ergodox_ez/keymaps/default_glow/rules.mk b/keyboards/ergodox_ez/keymaps/default_glow/rules.mk
index 360c3c51b8..20bac4ab9d 100644
--- a/keyboards/ergodox_ez/keymaps/default_glow/rules.mk
+++ b/keyboards/ergodox_ez/keymaps/default_glow/rules.mk
@@ -1,4 +1,4 @@
 RGBLIGHT_ENABLE = no
 RGB_MATRIX_ENABLE = yes # enable later
 
-SRC += ../default/keymap.c
+SRC += keymaps/default/keymap.c
diff --git a/keyboards/ergodox_stm32/ergodox_stm32.c b/keyboards/ergodox_stm32/ergodox_stm32.c
index 846c29d7a4..8419b40f41 100644
--- a/keyboards/ergodox_stm32/ergodox_stm32.c
+++ b/keyboards/ergodox_stm32/ergodox_stm32.c
@@ -16,6 +16,11 @@ void board_init(void) {
     AFIO->MAPR |= AFIO_MAPR_SWJ_CFG_JTAGDISABLE;
 }
 
+void bootloader_jump(void) {
+    // This board doesn't use the "standard" stm32duino bootloader, and is resident in memory at the base location. All we can do here is reset.
+    NVIC_SystemReset();
+}
+
 void matrix_init_kb(void)
 {
     // Init LED Ports
diff --git a/keyboards/ergodox_stm32/rules.mk b/keyboards/ergodox_stm32/rules.mk
index 3f7197cbf6..e730df82aa 100644
--- a/keyboards/ergodox_stm32/rules.mk
+++ b/keyboards/ergodox_stm32/rules.mk
@@ -3,6 +3,9 @@ MCU = STM32F103
 MCU_LDSCRIPT = stm32f103_bootloader
 BOARD = ST_NUCLEO64_F103RB
 
+# Bootloader selection
+BOOTLOADER = custom
+
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = no	# Mouse keys
 EXTRAKEY_ENABLE = yes	# Audio control and System control
diff --git a/keyboards/eternal_keypad/config.h b/keyboards/eternal_keypad/config.h
index 5f2c60d6a1..fbcdb45021 100644
--- a/keyboards/eternal_keypad/config.h
+++ b/keyboards/eternal_keypad/config.h
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* USB Device descriptor parameter */
 #define VENDOR_ID    0xFEED
-#define PRODUCT_ID   0x0000
+#define PRODUCT_ID   0xDB00
 #define DEVICE_VER   0x0001
 #define MANUFACTURER duckyb
 #define PRODUCT      eternal_keypad
diff --git a/keyboards/eternal_keypad/keymaps/kyek/config.h b/keyboards/eternal_keypad/keymaps/kyek/config.h
new file mode 100644
index 0000000000..226b16e546
--- /dev/null
+++ b/keyboards/eternal_keypad/keymaps/kyek/config.h
@@ -0,0 +1,21 @@
+/* Copyright 2021 duckyb
+ *
+ * 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 ONESHOT_TIMEOUT 2000
+#define FORCE_NKRO
+#define USB_POLLING_INTERVAL_MS 1
+#define QMK_KEYS_PER_SCAN 12
diff --git a/keyboards/eternal_keypad/keymaps/kyek/keymap.c b/keyboards/eternal_keypad/keymaps/kyek/keymap.c
new file mode 100644
index 0000000000..592e73bc74
--- /dev/null
+++ b/keyboards/eternal_keypad/keymaps/kyek/keymap.c
@@ -0,0 +1,86 @@
+/* Copyright 2021 duckyb
+ *
+ * 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
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _ARROW,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Base Layer
+   * ,-------------------------------------.
+   * |     |  Esc  |  1|  2|  3|  4|  5|  6|
+	 * |		 |-------+---+---+---+---+---+---|
+   * |     |  Tab  |  Q|  W|  E|  R|  T|  7|
+	 * |----||-------+---+---+---+---+---+---|
+   * | F13|| Enter |  A|  S|  D|  F|  G|  8|
+	 * |----||-------+---+---+---+---+---+---|
+   * | F14|| Shift |  Z|  X|  C|  V|  B|  9|
+   * |----||-------------------------------|
+   * | F15|| LCtrl | _FN |Alt|  Space  |  0|
+   * `----'`-------------------------------'
+   */
+    [_BASE] = LAYOUT(
+		        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, 
+		        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_7, 
+		KC_F13, KC_ENT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_8, 
+		KC_F14, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_9, 
+		KC_LGUI, KC_LCTL, OSL(_FN), KC_LALT, KC_SPC, LT(_ARROW, KC_0)
+    ),
+  /* Arrows Layer
+   * ,-----------------------------------------.
+   * |     |       |    |    |     |   |   |   |
+	 * |		 |-------+----+----+-----+---+---+---|
+   * |     |       |    |  UP|     |   |   |   |
+	 * |----||-------+----+----+-----+---+---+---|
+   * |    ||       |LEFT|DOWN|RIGHT|   |   |   |
+	 * |----||-------+----+----+-----+---+---+---|
+   * |    ||       |    |    |     |   |   |   |
+   * |----||-----------------------------------|
+   * | RST||       |       |     |         |   |
+   * `----'`-----------------------------------'
+   */
+    [_ARROW] = LAYOUT(
+		         _______, _______, _______, _______, _______, _______, _______,
+		         _______, _______, KC_UP, _______, _______, _______, _______, 
+		_______, KC_DEL , KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, 
+		RESET,   _______, _______, _______, _______, _______
+    ),
+  /* Function Layer
+   * ,-------------------------------------.
+   * |     |       | F1| F2| F3| F4| F5| F6|
+	 * |		 |-------+---+---+---+---+---+---|
+   * |     |       |  P|  O|  I|  U|  Y| F7|
+	 * |----||-------+---+---+---+---+---+---|
+   * |    ||  Bspc |  ;|  L|  K|  J|  H| F8|
+	 * |----||-------+---+---+---+---+---+---|
+   * |    ||       |Gui|  M|  N|F12|F11| F9|
+   * |----||-------------------------------|
+   * |    ||       |     |   |         |F10|
+   * `----'`-------------------------------'
+   */
+    [_FN] = LAYOUT(
+		         _______, KC_F1  , KC_F2  , KC_F3  , KC_F4 , KC_F5 , KC_F6,
+		         _______, KC_P   , KC_O   , KC_I   , KC_U  , KC_Y  , KC_F7, 
+		_______, KC_BSPC, KC_SCLN, KC_L   , KC_K   , KC_J  , KC_H  , KC_F8, 
+		_______, _______, _______, KC_M   , KC_N   , KC_F12, KC_F11, KC_F9, 
+		_______, _______, _______, _______, _______, KC_F10
+    )
+};
diff --git a/keyboards/eternal_keypad/keymaps/kyek/readme.md b/keyboards/eternal_keypad/keymaps/kyek/readme.md
new file mode 100644
index 0000000000..d4c6162b0f
--- /dev/null
+++ b/keyboards/eternal_keypad/keymaps/kyek/readme.md
@@ -0,0 +1 @@
+# Kyek's personal keymap for eternal_keypad
diff --git a/keyboards/eternal_keypad/keymaps/via/keymap.c b/keyboards/eternal_keypad/keymaps/via/keymap.c
new file mode 100644
index 0000000000..725cc12240
--- /dev/null
+++ b/keyboards/eternal_keypad/keymaps/via/keymap.c
@@ -0,0 +1,107 @@
+/* Copyright 2021 duckyb
+ *
+ * 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
+
+enum layer_names {
+    _BASE = 0,
+    _ARROW,
+    _FN,
+    _ADJUST
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Base Layer
+   * ,-------------------------------------.
+   * |     |  Esc  |  1|  2|  3|  4|  5|  6|
+	 * |		 |-------+---+---+---+---+---+---|
+   * |     |  Tab  |  Q|  W|  E|  R|  T|  7|
+	 * |----||-------+---+---+---+---+---+---|
+   * | F13|| LCtrl |  A|  S|  D|  F|  G|  8|
+	 * |----||-------+---+---+---+---+---+---|
+   * | F14|| Shif  |  Z|  X|  C|  V|  B|  9|
+   * |----||-------------------------------|
+   * | F15|| AltTab| _FN |Alt|  Space  |  0|
+   * `----'`-------------------------------'
+   */
+    [_BASE] = LAYOUT(
+		        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, 
+		        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_7, 
+		KC_F13, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_8, 
+		KC_F14, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_9, 
+		KC_F15, KC_ENT, OSL(_FN), KC_LALT, KC_SPC, LT(_ARROW, KC_0)
+    ),
+  /* Arrows Layer
+   * ,-----------------------------------------.
+   * |     |       |    |    |     |   |   |   |
+	 * |		 |-------+----+----+-----+---+---+---|
+   * |     |       |    |  UP|     |   |   |   |
+	 * |----||-------+----+----+-----+---+---+---|
+   * |    ||       |LEFT|DOWN|RIGHT|   |   |   |
+	 * |----||-------+----+----+-----+---+---+---|
+   * |    ||       |    |    |     |   |   |   |
+   * |----||-----------------------------------|
+   * | RST||       |       |     |         |   |
+   * `----'`-----------------------------------'
+   */
+    [_ARROW] = LAYOUT(
+		         _______, _______, _______, _______, _______, _______, _______,
+		         _______, _______, KC_UP, _______, _______, _______, _______, 
+		_______, _______, KC_LEFT,KC_DOWN, KC_RIGHT, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, MO(_ADJUST), _______, _______, _______
+    ),
+  /* Function Layer
+   * ,-------------------------------------.
+   * |     |       | F1| F2| F3| F4| F5| F6|
+	 * |		 |-------+---+---+---+---+---+---|
+   * |     |       |  P|  O|  I|  U|  Y| F7|
+	 * |----||-------+---+---+---+---+---+---|
+   * |    ||  Bspc |  ;|  L|  K|  J|  H| F8|
+	 * |----||-------+---+---+---+---+---+---|
+   * |    ||       |Gui|  M|  N|F12|F11| F9|
+   * |----||-------------------------------|
+   * |    ||       |     |   |         |F10|
+   * `----'`-------------------------------'
+   */
+    [_FN] = LAYOUT(
+		         _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6,
+		         _______, KC_P, KC_O, KC_I, KC_U, KC_Y, KC_F7, 
+		_______, KC_BSPC, KC_SCLN, KC_L, KC_K, KC_J, KC_H, KC_F8, 
+		_______, _______, KC_LGUI, KC_M, KC_N, KC_F12, KC_F11, KC_F9, 
+		_______, _______, _______, _______, _______, KC_F10
+    ),
+
+  /* Adjust Layer
+   * ,-----------------------------------------.
+   * |     |       |    |    |     |   |   |   |
+	 * |		 |-------+----+----+-----+---+---+---|
+   * |     |       |    |    |     |   |   |   |
+	 * |----||-------+----+----+-----+---+---+---|
+   * |    ||       |    |    |     |   |   |   |
+	 * |----||-------+----+----+-----+---+---+---|
+   * |    ||       |    |    |     |   |   |   |
+   * |----||-----------------------------------|
+   * | RST||       |       |     |         |   |
+   * `----'`-----------------------------------'
+   */
+    [_ADJUST] = LAYOUT(
+		         _______, _______, _______, _______, _______, _______, _______,
+		         _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, 
+		RESET,   _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/id87/keymaps/via/rules.mk b/keyboards/eternal_keypad/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/id87/keymaps/via/rules.mk
rename to keyboards/eternal_keypad/keymaps/via/rules.mk
diff --git a/keyboards/evancookaudio/tenpad/config.h b/keyboards/evancookaudio/tenpad/config.h
new file mode 100644
index 0000000000..c9d7d05251
--- /dev/null
+++ b/keyboards/evancookaudio/tenpad/config.h
@@ -0,0 +1,44 @@
+/* Copyright 2022 evan cook <evan@evancook.audio>
+ *
+ * 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"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x636F
+#define PRODUCT_ID      0x0001
+#define DEVICE_VER      0x0000
+#define MANUFACTURER    evancook.audio
+#define PRODUCT         tenpad
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* key matrix size */
+#define MATRIX_ROWS 2
+#define MATRIX_COLS 5
+
+/* key matrix pins */
+
+#define MATRIX_ROW_PINS {D0, D1}
+#define MATRIX_COL_PINS {F4, F5, F6, F7, B1}
+
+#define UNUSED_PINS {B3, B2, B6, B7, D5, C7, F1, F0, B4, E6, D7, C6, D4 }
+
diff --git a/keyboards/evancookaudio/tenpad/info.json b/keyboards/evancookaudio/tenpad/info.json
new file mode 100644
index 0000000000..52c62775dc
--- /dev/null
+++ b/keyboards/evancookaudio/tenpad/info.json
@@ -0,0 +1,24 @@
+{
+    "keyboard_name": "evancook.audio tenpad",
+    "url": "https://evancook.audio/",
+    "maintainer": "evanmcook",
+    "layouts": {
+
+	"LAYOUT_ortho_2x5": {
+        "layout": [
+            { "label": "K01", "x": 0, "y": 0 },
+            { "label": "K02", "x": 1, "y": 0 },
+            { "label": "K03", "x": 2, "y": 0 },
+            { "label": "K04", "x": 3, "y": 0 },
+            { "label": "K05", "x": 4, "y": 0 },
+
+            { "label": "K06", "x": 0, "y": 1 },
+            { "label": "K07", "x": 1, "y": 1 },
+            { "label": "K08", "x": 2, "y": 1 },
+            { "label": "K09", "x": 3, "y": 1 },
+            { "label": "K10", "x": 4, "y": 1 }
+  
+            ]
+	    }   
+    }
+}
diff --git a/keyboards/evancookaudio/tenpad/keymaps/default/keymap.c b/keyboards/evancookaudio/tenpad/keymaps/default/keymap.c
new file mode 100644
index 0000000000..2238a238d3
--- /dev/null
+++ b/keyboards/evancookaudio/tenpad/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2022 evan cook <evan@evancook.audio>
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* LAYER 0
+ * ,---------------------------------------.
+ * |   Q   |   W   |   E   |   R   |   T   |
+ * |-------+-------+-------|-------|-------|
+ * |   A   |   S   |   D   |   F   |   G   |
+ * ,---------------------------------------.
+ * 
+ * 
+ */
+[0] = LAYOUT_ortho_2x5(
+  KC_Q,       KC_W,      KC_E,      KC_R,      KC_T,
+  KC_A,       KC_S,      KC_D,      KC_F,      KC_G
+)
+};
diff --git a/keyboards/evancookaudio/tenpad/readme.md b/keyboards/evancookaudio/tenpad/readme.md
new file mode 100644
index 0000000000..0bcb7a7bce
--- /dev/null
+++ b/keyboards/evancookaudio/tenpad/readme.md
@@ -0,0 +1,17 @@
+# tenpad macropad
+
+A 2x5 macropad designed by Evan Cook, with the design goal of being compact in the Z axis
+[Default Layout](https://raw.githubusercontent.com/evanmcook/tenpad/main/keyboard-layout.jpg)
+
+* Keyboard Maintainer: [Evan Cook](https://github.com/evanmcook/)
+* Hardware Supported: tenpad Macropad PCB
+* Hardware Availability: [tenpad Github](https://github.com/evanmcook/tenpad)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make evancookaudio/tenpad:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Enter the bootloader: 
+* **Physical reset button**: Briefly short the pair of pins marked "reset" on the top right corner of the bottom PCB of the keyboard.
\ No newline at end of file
diff --git a/keyboards/evancookaudio/tenpad/rules.mk b/keyboards/evancookaudio/tenpad/rules.mk
new file mode 100644
index 0000000000..6cf6d9358b
--- /dev/null
+++ b/keyboards/evancookaudio/tenpad/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = no        # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/evancookaudio/tenpad/tenpad.c b/keyboards/evancookaudio/tenpad/tenpad.c
new file mode 100644
index 0000000000..abd852baf2
--- /dev/null
+++ b/keyboards/evancookaudio/tenpad/tenpad.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 evan cook <evan@evancook.audio>
+ *
+ * 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 "tenpad.h"
diff --git a/keyboards/evancookaudio/tenpad/tenpad.h b/keyboards/evancookaudio/tenpad/tenpad.h
new file mode 100644
index 0000000000..c9d6fa62c9
--- /dev/null
+++ b/keyboards/evancookaudio/tenpad/tenpad.h
@@ -0,0 +1,26 @@
+/* Copyright 2022 evan cook <evan@evancook.audio>
+ *
+ * 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 LAYOUT_ortho_2x5(\
+    k00, k01, k02, k03, k04, \
+    k05, k06, k07, k08, k09 \
+    ) { \
+        {k00, k01, k02, k03, k04},\
+        {k05, k06, k07, k08, k09},\
+    }
diff --git a/keyboards/evyd13/wasdat/config.h b/keyboards/evyd13/wasdat/config.h
index 36bbd30821..38f9fe4bda 100644
--- a/keyboards/evyd13/wasdat/config.h
+++ b/keyboards/evyd13/wasdat/config.h
@@ -41,22 +41,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
 */
 #define MATRIX_ROW_PINS { D6, D4, F6, F7, F4, F5, F0, F1 }
-#define MATRIX_COL_PINS { }
+#define MATRIX_COL_PINS { C7, B6, C6, B4, B5, D7, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, D3, B7, B3 } // Columns 6-12 controlled by demux
 #define UNUSED_PINS
 
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
+#define SN74X138_ADDRESS_PINS { D2, D1, D0 }
 
 // For QMK DFU
 #define QMK_ESC_OUTPUT D6
 #define QMK_ESC_INPUT D7
 #define QMK_LED B0
 
-/*
- * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
- */
-//#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
-
 #define LED_NUM_LOCK_PIN B2
 #define LED_CAPS_LOCK_PIN B0
 #define LED_SCROLL_LOCK_PIN B1
diff --git a/keyboards/evyd13/wasdat/matrix.c b/keyboards/evyd13/wasdat/matrix.c
index 6dd79b5330..c97dd84694 100644
--- a/keyboards/evyd13/wasdat/matrix.c
+++ b/keyboards/evyd13/wasdat/matrix.c
@@ -14,268 +14,66 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+
 #include <stdint.h>
 #include <stdbool.h>
-#include "wait.h"
-#include "util.h"
 #include "matrix.h"
-#include "debounce.h"
 #include "quantum.h"
+#include "sn74x138.h"
 
-#ifdef DIRECT_PINS
-static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS;
-#elif (DIODE_DIRECTION == ROW2COL) || (DIODE_DIRECTION == COL2ROW)
 static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
-//static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
-#endif
+static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
 
-// matrix code
-
-#ifdef DIRECT_PINS
-
-static void init_pins(void) {
-    for (int row = 0; row < MATRIX_ROWS; row++) {
-        for (int col = 0; col < MATRIX_COLS; col++) {
-            pin_t pin = direct_pins[row][col];
-            if (pin != NO_PIN) {
-                setPinInputHigh(pin);
-            }
-        }
-    }
-}
-
-static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
-    matrix_row_t last_row_value = current_matrix[current_row];
-    current_matrix[current_row] = 0;
-
-    for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
-        pin_t pin = direct_pins[current_row][col_index];
-        if (pin != NO_PIN) {
-            current_matrix[current_row] |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index);
-        }
-    }
-
-    return (last_row_value != current_matrix[current_row]);
-}
-
-#elif (DIODE_DIRECTION == COL2ROW)
-
-static void select_row(uint8_t row) {
-    setPinOutput(row_pins[row]);
-    writePinLow(row_pins[row]);
-}
-
-static void unselect_row(uint8_t row) { setPinInputHigh(row_pins[row]); }
-
-static void unselect_rows(void) {
-    for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
-        setPinInputHigh(row_pins[x]);
-    }
-}
-
-static void init_pins(void) {
-    unselect_rows();
-    for (uint8_t x = 0; x < MATRIX_COLS; x++) {
-        setPinInputHigh(col_pins[x]);
-    }
-}
-
-static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
-    // Store last value of row prior to reading
-    matrix_row_t last_row_value = current_matrix[current_row];
-
-    // Clear data in matrix row
-    current_matrix[current_row] = 0;
-
-    // Select row and wait for row selecton to stabilize
-    select_row(current_row);
-    wait_us(30);
-
-    // For each col...
-    for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
-
-        // Select the col pin to read (active low)
-        uint8_t pin_state = readPin(col_pins[col_index]);
-
-        // Populate the matrix row with the state of the col pin
-        current_matrix[current_row] |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
-    }
-
-    // Unselect row
-    unselect_row(current_row);
-
-    return (last_row_value != current_matrix[current_row]);
-}
-
-#elif (DIODE_DIRECTION == ROW2COL)
-
-/* Cols 0 - 15
- * col 0: C7
- * col 1:  B6
+/* col 0: C7
+ * col 1: B6
  * col 2: C6
- * col 3:  B4
- * col 4:  B5
- * col 5:   D7
- * These columns use a 74HC237D 3 to 8 bit demultiplexer.
- *                A0   A1   A2
- * col / pin:    PD2  PD1  PD0
- * 6:             1    1    1
- * 7:             0    1    1
- * 8:             1    0    1
- * 9:             0    0    1
- * 10:            1    1    0
- * 11:            0    1    0
- * 12:            1    0    0
- * col 13:  D3
- * col 14:  B7
- * col 15:  B3
+ * col 3: B4
+ * col 4: B5
+ * col 5: D7
+ *
+ * These columns use a 74HC138 3 to 8 bit demultiplexer.
+ *                A2   A1   A0
+ * col / pin:    PD0  PD1  PD2
+ * 6:              1    1    1
+ * 7:              1    1    0
+ * 8:              1    0    1
+ * 9:              1    0    0
+ * 10:             0    1    1
+ * 11:             0    1    0
+ * 12:             0    0    1
+ *
+ * col 13: D3
+ * col 14: B7
+ * col 15: B3
  */
 static void select_col(uint8_t col) {
-    switch (col) {
-        case 0:
-            writePinLow(C7);
-            break;
-        case 1:
-            writePinLow(B6);
-            break;
-        case 2:
-            writePinLow(C6);
-            break;
-        case 3:
-            writePinLow(B4);
-            break;
-        case 4:
-            writePinLow(B5);
-            break;
-        case 5:
-            writePinLow(D7);
-            break;
-        case 6:
-            writePinHigh(D0);
-            writePinHigh(D1);
-            writePinHigh(D2);
-            break;
-        case 7:
-            writePinHigh(D0);
-            writePinHigh(D1);
-            break;
-        case 8:
-            writePinHigh(D0);
-            writePinHigh(D2);
-            break;
-        case 9:
-            writePinHigh(D0);
-            break;
-        case 10:
-            writePinHigh(D1);
-            writePinHigh(D2);
-            break;
-        case 11:
-            writePinHigh(D1);
-            break;
-        case 12:
-            writePinHigh(D2);
-            break;
-        case 13:
-            writePinLow(D3);
-            break;
-        case 14:
-            writePinLow(B7);
-            break;
-        case 15:
-            writePinLow(B3);
-            break;
+    if (col_pins[col] != NO_PIN) {
+        writePinLow(col_pins[col]);
+    } else {
+        sn74x138_set_addr(13 - col);
     }
 }
 
 static void unselect_col(uint8_t col) {
-    switch (col) {
-        case 0:
-            writePinHigh(C7);
-            break;
-        case 1:
-            writePinHigh(B6);
-            break;
-        case 2:
-            writePinHigh(C6);
-            break;
-        case 3:
-            writePinHigh(B4);
-            break;
-        case 4:
-            writePinHigh(B5);
-            break;
-        case 5:
-            writePinHigh(D7);
-            break;
-        case 6:
-            writePinLow(D0);
-            writePinLow(D1);
-            writePinLow(D2);
-            break;
-        case 7:
-            writePinLow(D0);
-            writePinLow(D1);
-            break;
-        case 8:
-            writePinLow(D0);
-            writePinLow(D2);
-            break;
-        case 9:
-            writePinLow(D0);
-            break;
-        case 10:
-            writePinLow(D1);
-            writePinLow(D2);
-            break;
-        case 11:
-            writePinLow(D1);
-            break;
-        case 12:
-            writePinLow(D2);
-            break;
-        case 13:
-            writePinHigh(D3);
-            break;
-        case 14:
-            writePinHigh(B7);
-            break;
-        case 15:
-            writePinHigh(B3);
-            break;
+    if (col_pins[col] != NO_PIN) {
+        setPinOutput(col_pins[col]);
+        writePinHigh(col_pins[col]);
+    } else {
+        sn74x138_set_addr(0);
     }
 }
 
 static void unselect_cols(void) {
-    //Native
-    setPinOutput(D3);
-    setPinOutput(D7);
-    writePinHigh(D3);
-    writePinHigh(D7);
+    // Native
+    for (uint8_t x = 0; x < MATRIX_COLS; x++) {
+        if (col_pins[x] != NO_PIN) {
+            setPinOutput(col_pins[x]);
+            writePinHigh(col_pins[x]);
+        }
+    }
 
-    setPinOutput(C6);
-    setPinOutput(C7);
-    writePinHigh(C6);
-    writePinHigh(C7);
-
-    setPinOutput(B3);
-    setPinOutput(B4);
-    setPinOutput(B5);
-    setPinOutput(B6);
-    setPinOutput(B7);
-    writePinHigh(B3);
-    writePinHigh(B4);
-    writePinHigh(B5);
-    writePinHigh(B6);
-    writePinHigh(B7);
-
-    //Demultiplexer
-    setPinOutput(D0);
-    setPinOutput(D1);
-    setPinOutput(D2);
-    writePinLow(D0);
-    writePinLow(D1);
-    writePinLow(D2);
+    // Demultiplexer
+    sn74x138_set_addr(0);
 }
 
 static void init_pins(void) {
@@ -288,9 +86,9 @@ static void init_pins(void) {
 static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
     bool matrix_changed = false;
 
-    // Select col and wait for col selecton to stabilize
+    // Select col and wait for col selection to stabilize
     select_col(current_col);
-    wait_us(30);
+    matrix_io_delay();
 
     // For each row...
     for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) {
@@ -318,27 +116,20 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
     return matrix_changed;
 }
 
-#endif
-
 void matrix_init_custom(void) {
     // initialize key pins
     init_pins();
+    // initialize demultiplexer
+    sn74x138_init();
 }
 
 bool matrix_scan_custom(matrix_row_t current_matrix[]) {
     bool changed = false;
 
-#if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW)
-    // Set row, read cols
-    for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) {
-        changed |= read_cols_on_row(current_matrix, current_row);
-    }
-#elif (DIODE_DIRECTION == ROW2COL)
     // Set col, read rows
     for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
         changed |= read_rows_on_col(current_matrix, current_col);
     }
-#endif
 
     return changed;
 }
diff --git a/keyboards/evyd13/wasdat/rules.mk b/keyboards/evyd13/wasdat/rules.mk
index d9f65747fb..bb4261a4fe 100644
--- a/keyboards/evyd13/wasdat/rules.mk
+++ b/keyboards/evyd13/wasdat/rules.mk
@@ -18,6 +18,7 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 CUSTOM_MATRIX = lite
-SRC += matrix.c
+VPATH += drivers/gpio
+SRC += matrix.c sn74x138.c
 
 LAYOUTS = fullsize_ansi fullsize_iso tkl_ansi tkl_iso
diff --git a/keyboards/eyeohdesigns/sprh/info.json b/keyboards/eyeohdesigns/sprh/info.json
index 976e64755e..7e79dd821e 100644
--- a/keyboards/eyeohdesigns/sprh/info.json
+++ b/keyboards/eyeohdesigns/sprh/info.json
@@ -1,31 +1,599 @@
 {
-    "keyboard_name": "sprh", 
-    "url": "https://github.com/joedinkle/eyeohdesigns/tree/main/keyboards/sprh", 
-    "maintainer": "eye oh designs", 
+    "keyboard_name": "sprh",
+    "url": "https://github.com/joedinkle/eyeohdesigns/tree/main/keyboards/sprh",
+    "maintainer": "joedinkle",
     "layouts": {
-        "LAYOUT_default": {
-            "layout": [{"label":"Mute", "x":0.5, "y":0}, {"label":"Esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"Backspace", "x":14.5, "y":0, "w":2}, {"label":"Tab", "x":1, "y":1, "w":1.5}, {"label":"Q", "x":2.5, "y":1}, {"label":"W", "x":3.5, "y":1}, {"label":"E", "x":4.5, "y":1}, {"label":"R", "x":5.5, "y":1}, {"label":"T", "x":6.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"[", "x":12.5, "y":1}, {"label":"]", "x":13.5, "y":1}, {"label":"\\", "x":14.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"H", "x":7.5, "y":2}, {"label":"J", "x":8.5, "y":2}, {"label":"K", "x":9.5, "y":2}, {"label":"L", "x":10.5, "y":2}, {"label":";", "x":11.5, "y":2}, {"label":"'", "x":12.5, "y":2}, {"label":"Enter", "x":13.5, "y":2, "w":2.25}, {"label":"Shift", "x":0.25, "y":3, "w":2.25}, {"label":"Z", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}, {"label":",", "x":9.5, "y":3}, {"label":".", "x":10.5, "y":3}, {"label":"/", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":2.75}, {"label":"\u2191", "x":15.25, "y":3}, {"label":"Super", "x":0, "y":4, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.37, "y":4, "w":1.25}, {"x":4.62, "y":4, "w":6.25}, {"label":"Alt", "x":10.87, "y":4, "w":1.25}, {"label":"Function", "x":12.12, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4}, {"label":"\u2193", "x":15.25, "y":4}, {"label":"\u2192", "x":16.25, "y":4}]
+        "LAYOUT_ac5": {
+            "layout": [
+                {"label":"Mute", "x":0.5, "y":0},
+                {"label":"Esc", "x":1.5, "y":0},
+                {"label":"1", "x":2.5, "y":0},
+                {"label":"2", "x":3.5, "y":0},
+                {"label":"3", "x":4.5, "y":0},
+                {"label":"4", "x":5.5, "y":0},
+                {"label":"5", "x":6.5, "y":0},
+                {"label":"6", "x":7.5, "y":0},
+                {"label":"7", "x":8.5, "y":0},
+                {"label":"8", "x":9.5, "y":0},
+                {"label":"9", "x":10.5, "y":0},
+                {"label":"0", "x":11.5, "y":0},
+                {"label":"_", "x":12.5, "y":0},
+                {"label":"+", "x":13.5, "y":0},
+                {"label":"Backspace", "x":14.5, "y":0, "w":2},
+
+                {"label":"Tab", "x":1, "y":1, "w":1.5},
+                {"label":"Q", "x":2.5, "y":1},
+                {"label":"W", "x":3.5, "y":1},
+                {"label":"E", "x":4.5, "y":1},
+                {"label":"R", "x":5.5, "y":1},
+                {"label":"T", "x":6.5, "y":1},
+                {"label":"Y", "x":7.5, "y":1},
+                {"label":"U", "x":8.5, "y":1},
+                {"label":"I", "x":9.5, "y":1},
+                {"label":"O", "x":10.5, "y":1},
+                {"label":"P", "x":11.5, "y":1},
+                {"label":"[", "x":12.5, "y":1},
+                {"label":"]", "x":13.5, "y":1},
+                {"label":"\\", "x":14.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75},
+                {"label":"A", "x":2.5, "y":2},
+                {"label":"S", "x":3.5, "y":2},
+                {"label":"D", "x":4.5, "y":2},
+                {"label":"F", "x":5.5, "y":2},
+                {"label":"G", "x":6.5, "y":2},
+                {"label":"H", "x":7.5, "y":2},
+                {"label":"J", "x":8.5, "y":2},
+                {"label":"K", "x":9.5, "y":2},
+                {"label":"L", "x":10.5, "y":2},
+                {"label":";", "x":11.5, "y":2},
+                {"label":"'", "x":12.5, "y":2},
+                {"label":"Enter", "x":13.5, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0.25, "y":3, "w":2.25},
+                {"label":"Z", "x":2.5, "y":3},
+                {"label":"X", "x":3.5, "y":3},
+                {"label":"C", "x":4.5, "y":3},
+                {"label":"V", "x":5.5, "y":3},
+                {"label":"B", "x":6.5, "y":3},
+                {"label":"N", "x":7.5, "y":3},
+                {"label":"M", "x":8.5, "y":3},
+                {"label":",", "x":9.5, "y":3},
+                {"label":".", "x":10.5, "y":3},
+                {"label":"/", "x":11.5, "y":3},
+                {"label":"Shift", "x":12.5, "y":3, "w":2.75},
+                {"label":"\u2191", "x":15.25, "y":3},
+
+                {"label":"Super", "x":0, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":3.37, "y":4, "w":1.25},
+                {"x":4.62, "y":4, "w":6.25},
+                {"label":"Alt", "x":10.87, "y":4, "w":1.25},
+                {"label":"Function", "x":12.12, "y":4, "w":1.25},
+                {"label":"\u2190", "x":14.25, "y":4},
+                {"label":"\u2193", "x":15.25, "y":4},
+                {"label":"\u2192", "x":16.25, "y":4}
+            ]
         },
         "LAYOUT_acs": {
-            "layout": [{"label":"Mute", "x":0.5, "y":0}, {"label":"Esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"Backspace", "x":14.5, "y":0, "w":2}, {"label":"Tab", "x":1, "y":1, "w":1.5}, {"label":"Q", "x":2.5, "y":1}, {"label":"W", "x":3.5, "y":1}, {"label":"E", "x":4.5, "y":1}, {"label":"R", "x":5.5, "y":1}, {"label":"T", "x":6.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"[", "x":12.5, "y":1}, {"label":"]", "x":13.5, "y":1}, {"label":"\\", "x":14.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"H", "x":7.5, "y":2}, {"label":"J", "x":8.5, "y":2}, {"label":"K", "x":9.5, "y":2}, {"label":"L", "x":10.5, "y":2}, {"label":";", "x":11.5, "y":2}, {"label":"'", "x":12.5, "y":2}, {"label":"Enter", "x":13.5, "y":2, "w":2.25}, {"label":"Shift", "x":0.25, "y":3, "w":2.25}, {"label":"Z", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}, {"label":",", "x":9.5, "y":3}, {"label":".", "x":10.5, "y":3}, {"label":"/", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":2.75}, {"label":"\u2191", "x":15.25, "y":3}, {"label":"Super", "x":0, "y":4, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.37, "y":4, "w":1.25}, {"x":4.62, "y":4, "w":2.75}, {"x":7.37, "y":4, "w":2.25}, {"x":9.62, "y":4, "w":1.25}, {"label":"Alt", "x":10.87, "y":4, "w":1.25}, {"label":"Function", "x":12.12, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4}, {"label":"\u2193", "x":15.25, "y":4}, {"label":"\u2192", "x":16.25, "y":4}]
+            "layout": [
+                {"label":"Mute", "x":0.5, "y":0},
+                {"label":"Esc", "x":1.5, "y":0},
+                {"label":"1", "x":2.5, "y":0},
+                {"label":"2", "x":3.5, "y":0},
+                {"label":"3", "x":4.5, "y":0},
+                {"label":"4", "x":5.5, "y":0},
+                {"label":"5", "x":6.5, "y":0},
+                {"label":"6", "x":7.5, "y":0},
+                {"label":"7", "x":8.5, "y":0},
+                {"label":"8", "x":9.5, "y":0},
+                {"label":"9", "x":10.5, "y":0},
+                {"label":"0", "x":11.5, "y":0},
+                {"label":"_", "x":12.5, "y":0},
+                {"label":"+", "x":13.5, "y":0},
+                {"label":"Backspace", "x":14.5, "y":0, "w":2},
+
+                {"label":"Tab", "x":1, "y":1, "w":1.5},
+                {"label":"Q", "x":2.5, "y":1},
+                {"label":"W", "x":3.5, "y":1},
+                {"label":"E", "x":4.5, "y":1},
+                {"label":"R", "x":5.5, "y":1},
+                {"label":"T", "x":6.5, "y":1},
+                {"label":"Y", "x":7.5, "y":1},
+                {"label":"U", "x":8.5, "y":1},
+                {"label":"I", "x":9.5, "y":1},
+                {"label":"O", "x":10.5, "y":1},
+                {"label":"P", "x":11.5, "y":1},
+                {"label":"[", "x":12.5, "y":1},
+                {"label":"]", "x":13.5, "y":1},
+                {"label":"\\", "x":14.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75},
+                {"label":"A", "x":2.5, "y":2},
+                {"label":"S", "x":3.5, "y":2},
+                {"label":"D", "x":4.5, "y":2},
+                {"label":"F", "x":5.5, "y":2},
+                {"label":"G", "x":6.5, "y":2},
+                {"label":"H", "x":7.5, "y":2},
+                {"label":"J", "x":8.5, "y":2},
+                {"label":"K", "x":9.5, "y":2},
+                {"label":"L", "x":10.5, "y":2},
+                {"label":";", "x":11.5, "y":2},
+                {"label":"'", "x":12.5, "y":2},
+                {"label":"Enter", "x":13.5, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0.25, "y":3, "w":2.25},
+                {"label":"Z", "x":2.5, "y":3},
+                {"label":"X", "x":3.5, "y":3},
+                {"label":"C", "x":4.5, "y":3},
+                {"label":"V", "x":5.5, "y":3},
+                {"label":"B", "x":6.5, "y":3},
+                {"label":"N", "x":7.5, "y":3},
+                {"label":"M", "x":8.5, "y":3},
+                {"label":",", "x":9.5, "y":3},
+                {"label":".", "x":10.5, "y":3},
+                {"label":"/", "x":11.5, "y":3},
+                {"label":"Shift", "x":12.5, "y":3, "w":2.75},
+                {"label":"\u2191", "x":15.25, "y":3},
+
+                {"label":"Super", "x":0, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":3.37, "y":4, "w":1.25},
+                {"x":4.62, "y":4, "w":2.75},
+                {"x":7.37, "y":4, "w":2.25},
+                {"x":9.62, "y":4, "w":1.25},
+                {"label":"Alt", "x":10.87, "y":4, "w":1.25},
+                {"label":"Function", "x":12.12, "y":4, "w":1.25},
+                {"label":"\u2190", "x":14.25, "y":4},
+                {"label":"\u2193", "x":15.25, "y":4},
+                {"label":"\u2192", "x":16.25, "y":4}
+            ]
         },
         "LAYOUT_ad5": {
-            "layout": [{"label":"Mute", "x":0.5, "y":0}, {"label":"Esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"Backspace", "x":14.5, "y":0, "w":2}, {"label":"Tab", "x":1, "y":1, "w":1.5}, {"label":"Q", "x":2.5, "y":1}, {"label":"W", "x":3.5, "y":1}, {"label":"E", "x":4.5, "y":1}, {"label":"R", "x":5.5, "y":1}, {"label":"T", "x":6.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"[", "x":12.5, "y":1}, {"label":"]", "x":13.5, "y":1}, {"label":"\\", "x":14.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"H", "x":7.5, "y":2}, {"label":"J", "x":8.5, "y":2}, {"label":"K", "x":9.5, "y":2}, {"label":"L", "x":10.5, "y":2}, {"label":";", "x":11.5, "y":2}, {"label":"'", "x":12.5, "y":2}, {"label":"Enter", "x":13.5, "y":2, "w":2.25}, {"label":"Shift", "x":0.25, "y":3, "w":2.25}, {"label":"Z", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}, {"label":",", "x":9.5, "y":3}, {"label":".", "x":10.5, "y":3}, {"label":"/", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":1.75}, {"label":"Fn", "x":14.25, "y":3}, {"label":"\u2191", "x":15.25, "y":3}, {"label":"Super", "x":0, "y":4, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.37, "y":4, "w":1.25}, {"x":4.62, "y":4, "w":6.25}, {"label":"Alt", "x":10.87, "y":4, "w":1.25}, {"label":"Function", "x":12.12, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4}, {"label":"\u2193", "x":15.25, "y":4}, {"label":"\u2192", "x":16.25, "y":4}]
+            "layout": [
+                {"label":"Mute", "x":0.5, "y":0},
+                {"label":"Esc", "x":1.5, "y":0},
+                {"label":"1", "x":2.5, "y":0},
+                {"label":"2", "x":3.5, "y":0},
+                {"label":"3", "x":4.5, "y":0},
+                {"label":"4", "x":5.5, "y":0},
+                {"label":"5", "x":6.5, "y":0},
+                {"label":"6", "x":7.5, "y":0},
+                {"label":"7", "x":8.5, "y":0},
+                {"label":"8", "x":9.5, "y":0},
+                {"label":"9", "x":10.5, "y":0},
+                {"label":"0", "x":11.5, "y":0},
+                {"label":"_", "x":12.5, "y":0},
+                {"label":"+", "x":13.5, "y":0},
+                {"label":"Backspace", "x":14.5, "y":0, "w":2},
+
+                {"label":"Tab", "x":1, "y":1, "w":1.5},
+                {"label":"Q", "x":2.5, "y":1},
+                {"label":"W", "x":3.5, "y":1},
+                {"label":"E", "x":4.5, "y":1},
+                {"label":"R", "x":5.5, "y":1},
+                {"label":"T", "x":6.5, "y":1},
+                {"label":"Y", "x":7.5, "y":1},
+                {"label":"U", "x":8.5, "y":1},
+                {"label":"I", "x":9.5, "y":1},
+                {"label":"O", "x":10.5, "y":1},
+                {"label":"P", "x":11.5, "y":1},
+                {"label":"[", "x":12.5, "y":1},
+                {"label":"]", "x":13.5, "y":1},
+                {"label":"\\", "x":14.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75},
+                {"label":"A", "x":2.5, "y":2},
+                {"label":"S", "x":3.5, "y":2},
+                {"label":"D", "x":4.5, "y":2},
+                {"label":"F", "x":5.5, "y":2},
+                {"label":"G", "x":6.5, "y":2},
+                {"label":"H", "x":7.5, "y":2},
+                {"label":"J", "x":8.5, "y":2},
+                {"label":"K", "x":9.5, "y":2},
+                {"label":"L", "x":10.5, "y":2},
+                {"label":";", "x":11.5, "y":2},
+                {"label":"'", "x":12.5, "y":2},
+                {"label":"Enter", "x":13.5, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0.25, "y":3, "w":2.25},
+                {"label":"Z", "x":2.5, "y":3},
+                {"label":"X", "x":3.5, "y":3},
+                {"label":"C", "x":4.5, "y":3},
+                {"label":"V", "x":5.5, "y":3},
+                {"label":"B", "x":6.5, "y":3},
+                {"label":"N", "x":7.5, "y":3},
+                {"label":"M", "x":8.5, "y":3},
+                {"label":",", "x":9.5, "y":3},
+                {"label":".", "x":10.5, "y":3},
+                {"label":"/", "x":11.5, "y":3},
+                {"label":"Shift", "x":12.5, "y":3, "w":1.75},
+                {"label":"Fn", "x":14.25, "y":3},
+                {"label":"\u2191", "x":15.25, "y":3},
+
+                {"label":"Super", "x":0, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":3.37, "y":4, "w":1.25},
+                {"x":4.62, "y":4, "w":6.25},
+                {"label":"Alt", "x":10.87, "y":4, "w":1.25},
+                {"label":"Function", "x":12.12, "y":4, "w":1.25},
+                {"label":"\u2190", "x":14.25, "y":4},
+                {"label":"\u2193", "x":15.25, "y":4},
+                {"label":"\u2192", "x":16.25, "y":4}
+            ]
         },
         "LAYOUT_ads": {
-            "layout": [{"label":"Mute", "x":0.5, "y":0}, {"label":"Esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"Backspace", "x":14.5, "y":0, "w":2}, {"label":"Tab", "x":1, "y":1, "w":1.5}, {"label":"Q", "x":2.5, "y":1}, {"label":"W", "x":3.5, "y":1}, {"label":"E", "x":4.5, "y":1}, {"label":"R", "x":5.5, "y":1}, {"label":"T", "x":6.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"[", "x":12.5, "y":1}, {"label":"]", "x":13.5, "y":1}, {"label":"\\", "x":14.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"H", "x":7.5, "y":2}, {"label":"J", "x":8.5, "y":2}, {"label":"K", "x":9.5, "y":2}, {"label":"L", "x":10.5, "y":2}, {"label":";", "x":11.5, "y":2}, {"label":"'", "x":12.5, "y":2}, {"label":"Enter", "x":13.5, "y":2, "w":2.25}, {"label":"Shift", "x":0.25, "y":3, "w":2.25}, {"label":"Z", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}, {"label":",", "x":9.5, "y":3}, {"label":".", "x":10.5, "y":3}, {"label":"/", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":1.75}, {"label":"Fn", "x":14.25, "y":3}, {"label":"\u2191", "x":15.25, "y":3}, {"label":"Super", "x":0, "y":4, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.37, "y":4, "w":1.25}, {"x":4.62, "y":4, "w":2.75}, {"x":7.37, "y":4, "w":2.25}, {"x":9.62, "y":4, "w":1.25}, {"label":"Alt", "x":10.87, "y":4, "w":1.25}, {"label":"Function", "x":12.12, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4}, {"label":"\u2193", "x":15.25, "y":4}, {"label":"\u2192", "x":16.25, "y":4}]
+            "layout": [
+                {"label":"Mute", "x":0.5, "y":0},
+                {"label":"Esc", "x":1.5, "y":0},
+                {"label":"1", "x":2.5, "y":0},
+                {"label":"2", "x":3.5, "y":0},
+                {"label":"3", "x":4.5, "y":0},
+                {"label":"4", "x":5.5, "y":0},
+                {"label":"5", "x":6.5, "y":0},
+                {"label":"6", "x":7.5, "y":0},
+                {"label":"7", "x":8.5, "y":0},
+                {"label":"8", "x":9.5, "y":0},
+                {"label":"9", "x":10.5, "y":0},
+                {"label":"0", "x":11.5, "y":0},
+                {"label":"_", "x":12.5, "y":0},
+                {"label":"+", "x":13.5, "y":0},
+                {"label":"Backspace", "x":14.5, "y":0, "w":2},
+
+                {"label":"Tab", "x":1, "y":1, "w":1.5},
+                {"label":"Q", "x":2.5, "y":1},
+                {"label":"W", "x":3.5, "y":1},
+                {"label":"E", "x":4.5, "y":1},
+                {"label":"R", "x":5.5, "y":1},
+                {"label":"T", "x":6.5, "y":1},
+                {"label":"Y", "x":7.5, "y":1},
+                {"label":"U", "x":8.5, "y":1},
+                {"label":"I", "x":9.5, "y":1},
+                {"label":"O", "x":10.5, "y":1},
+                {"label":"P", "x":11.5, "y":1},
+                {"label":"[", "x":12.5, "y":1},
+                {"label":"]", "x":13.5, "y":1},
+                {"label":"\\", "x":14.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75},
+                {"label":"A", "x":2.5, "y":2},
+                {"label":"S", "x":3.5, "y":2},
+                {"label":"D", "x":4.5, "y":2},
+                {"label":"F", "x":5.5, "y":2},
+                {"label":"G", "x":6.5, "y":2},
+                {"label":"H", "x":7.5, "y":2},
+                {"label":"J", "x":8.5, "y":2},
+                {"label":"K", "x":9.5, "y":2},
+                {"label":"L", "x":10.5, "y":2},
+                {"label":";", "x":11.5, "y":2},
+                {"label":"'", "x":12.5, "y":2},
+                {"label":"Enter", "x":13.5, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0.25, "y":3, "w":2.25},
+                {"label":"Z", "x":2.5, "y":3},
+                {"label":"X", "x":3.5, "y":3},
+                {"label":"C", "x":4.5, "y":3},
+                {"label":"V", "x":5.5, "y":3},
+                {"label":"B", "x":6.5, "y":3},
+                {"label":"N", "x":7.5, "y":3},
+                {"label":"M", "x":8.5, "y":3},
+                {"label":",", "x":9.5, "y":3},
+                {"label":".", "x":10.5, "y":3},
+                {"label":"/", "x":11.5, "y":3},
+                {"label":"Shift", "x":12.5, "y":3, "w":1.75},
+                {"label":"Fn", "x":14.25, "y":3},
+                {"label":"\u2191", "x":15.25, "y":3},
+
+                {"label":"Super", "x":0, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":3.37, "y":4, "w":1.25},
+                {"x":4.62, "y":4, "w":2.75},
+                {"x":7.37, "y":4, "w":2.25},
+                {"x":9.62, "y":4, "w":1.25},
+                {"label":"Alt", "x":10.87, "y":4, "w":1.25},
+                {"label":"Function", "x":12.12, "y":4, "w":1.25},
+                {"label":"\u2190", "x":14.25, "y":4},
+                {"label":"\u2193", "x":15.25, "y":4},
+                {"label":"\u2192", "x":16.25, "y":4}
+            ]
         },
         "LAYOUT_bc5": {
-            "layout": [{"label":"Mute", "x":0.5, "y":0}, {"label":"Esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"\u2190", "x":14.5, "y":0}, {"label":"Del", "x":15.5, "y":0}, {"label":"Tab", "x":1, "y":1, "w":1.5}, {"label":"Q", "x":2.5, "y":1}, {"label":"W", "x":3.5, "y":1}, {"label":"E", "x":4.5, "y":1}, {"label":"R", "x":5.5, "y":1}, {"label":"T", "x":6.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"[", "x":12.5, "y":1}, {"label":"]", "x":13.5, "y":1}, {"label":"\\", "x":14.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"H", "x":7.5, "y":2}, {"label":"J", "x":8.5, "y":2}, {"label":"K", "x":9.5, "y":2}, {"label":"L", "x":10.5, "y":2}, {"label":";", "x":11.5, "y":2}, {"label":"'", "x":12.5, "y":2}, {"label":"Enter", "x":13.5, "y":2, "w":2.25}, {"label":"Shift", "x":0.25, "y":3, "w":2.25}, {"label":"Z", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}, {"label":",", "x":9.5, "y":3}, {"label":".", "x":10.5, "y":3}, {"label":"/", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":2.75}, {"label":"\u2191", "x":15.25, "y":3}, {"label":"Super", "x":0, "y":4, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.37, "y":4, "w":1.25}, {"x":4.62, "y":4, "w":6.25}, {"label":"Alt", "x":10.87, "y":4, "w":1.25}, {"label":"Function", "x":12.12, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4}, {"label":"\u2193", "x":15.25, "y":4}, {"label":"\u2192", "x":16.25, "y":4}]
+            "layout": [
+                {"label":"Mute", "x":0.5, "y":0},
+                {"label":"Esc", "x":1.5, "y":0},
+                {"label":"1", "x":2.5, "y":0},
+                {"label":"2", "x":3.5, "y":0},
+                {"label":"3", "x":4.5, "y":0},
+                {"label":"4", "x":5.5, "y":0},
+                {"label":"5", "x":6.5, "y":0},
+                {"label":"6", "x":7.5, "y":0},
+                {"label":"7", "x":8.5, "y":0},
+                {"label":"8", "x":9.5, "y":0},
+                {"label":"9", "x":10.5, "y":0},
+                {"label":"0", "x":11.5, "y":0},
+                {"label":"_", "x":12.5, "y":0},
+                {"label":"+", "x":13.5, "y":0},
+                {"label":"\u2190", "x":14.5, "y":0},
+                {"label":"Del", "x":15.5, "y":0},
+
+                {"label":"Tab", "x":1, "y":1, "w":1.5},
+                {"label":"Q", "x":2.5, "y":1},
+                {"label":"W", "x":3.5, "y":1},
+                {"label":"E", "x":4.5, "y":1},
+                {"label":"R", "x":5.5, "y":1},
+                {"label":"T", "x":6.5, "y":1},
+                {"label":"Y", "x":7.5, "y":1},
+                {"label":"U", "x":8.5, "y":1},
+                {"label":"I", "x":9.5, "y":1},
+                {"label":"O", "x":10.5, "y":1},
+                {"label":"P", "x":11.5, "y":1},
+                {"label":"[", "x":12.5, "y":1},
+                {"label":"]", "x":13.5, "y":1},
+                {"label":"\\", "x":14.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75},
+                {"label":"A", "x":2.5, "y":2},
+                {"label":"S", "x":3.5, "y":2},
+                {"label":"D", "x":4.5, "y":2},
+                {"label":"F", "x":5.5, "y":2},
+                {"label":"G", "x":6.5, "y":2},
+                {"label":"H", "x":7.5, "y":2},
+                {"label":"J", "x":8.5, "y":2},
+                {"label":"K", "x":9.5, "y":2},
+                {"label":"L", "x":10.5, "y":2},
+                {"label":";", "x":11.5, "y":2},
+                {"label":"'", "x":12.5, "y":2},
+                {"label":"Enter", "x":13.5, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0.25, "y":3, "w":2.25},
+                {"label":"Z", "x":2.5, "y":3},
+                {"label":"X", "x":3.5, "y":3},
+                {"label":"C", "x":4.5, "y":3},
+                {"label":"V", "x":5.5, "y":3},
+                {"label":"B", "x":6.5, "y":3},
+                {"label":"N", "x":7.5, "y":3},
+                {"label":"M", "x":8.5, "y":3},
+                {"label":",", "x":9.5, "y":3},
+                {"label":".", "x":10.5, "y":3},
+                {"label":"/", "x":11.5, "y":3},
+                {"label":"Shift", "x":12.5, "y":3, "w":2.75},
+                {"label":"\u2191", "x":15.25, "y":3},
+
+                {"label":"Super", "x":0, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":3.37, "y":4, "w":1.25},
+                {"x":4.62, "y":4, "w":6.25},
+                {"label":"Alt", "x":10.87, "y":4, "w":1.25},
+                {"label":"Function", "x":12.12, "y":4, "w":1.25},
+                {"label":"\u2190", "x":14.25, "y":4},
+                {"label":"\u2193", "x":15.25, "y":4},
+                {"label":"\u2192", "x":16.25, "y":4}
+            ]
         },
         "LAYOUT_bcs": {
-            "layout": [{"label":"Mute", "x":0.5, "y":0}, {"label":"Esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"\u2190", "x":14.5, "y":0}, {"label":"Del", "x":15.5, "y":0}, {"label":"Tab", "x":1, "y":1, "w":1.5}, {"label":"Q", "x":2.5, "y":1}, {"label":"W", "x":3.5, "y":1}, {"label":"E", "x":4.5, "y":1}, {"label":"R", "x":5.5, "y":1}, {"label":"T", "x":6.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"[", "x":12.5, "y":1}, {"label":"]", "x":13.5, "y":1}, {"label":"\\", "x":14.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"H", "x":7.5, "y":2}, {"label":"J", "x":8.5, "y":2}, {"label":"K", "x":9.5, "y":2}, {"label":"L", "x":10.5, "y":2}, {"label":";", "x":11.5, "y":2}, {"label":"'", "x":12.5, "y":2}, {"label":"Enter", "x":13.5, "y":2, "w":2.25}, {"label":"Shift", "x":0.25, "y":3, "w":2.25}, {"label":"Z", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}, {"label":",", "x":9.5, "y":3}, {"label":".", "x":10.5, "y":3}, {"label":"/", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":2.75}, {"label":"\u2191", "x":15.25, "y":3}, {"label":"Super", "x":0, "y":4, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.37, "y":4, "w":1.25}, {"x":4.62, "y":4, "w":2.75}, {"x":7.37, "y":4, "w":2.25}, {"x":9.62, "y":4, "w":1.25}, {"label":"Alt", "x":10.87, "y":4, "w":1.25}, {"label":"Function", "x":12.12, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4}, {"label":"\u2193", "x":15.25, "y":4}, {"label":"\u2192", "x":16.25, "y":4}]
+            "layout": [
+                {"label":"Mute", "x":0.5, "y":0},
+                {"label":"Esc", "x":1.5, "y":0},
+                {"label":"1", "x":2.5, "y":0},
+                {"label":"2", "x":3.5, "y":0},
+                {"label":"3", "x":4.5, "y":0},
+                {"label":"4", "x":5.5, "y":0},
+                {"label":"5", "x":6.5, "y":0},
+                {"label":"6", "x":7.5, "y":0},
+                {"label":"7", "x":8.5, "y":0},
+                {"label":"8", "x":9.5, "y":0},
+                {"label":"9", "x":10.5, "y":0},
+                {"label":"0", "x":11.5, "y":0},
+                {"label":"_", "x":12.5, "y":0},
+                {"label":"+", "x":13.5, "y":0},
+                {"label":"\u2190", "x":14.5, "y":0},
+                {"label":"Del", "x":15.5, "y":0},
+
+                {"label":"Tab", "x":1, "y":1, "w":1.5},
+                {"label":"Q", "x":2.5, "y":1},
+                {"label":"W", "x":3.5, "y":1},
+                {"label":"E", "x":4.5, "y":1},
+                {"label":"R", "x":5.5, "y":1},
+                {"label":"T", "x":6.5, "y":1},
+                {"label":"Y", "x":7.5, "y":1},
+                {"label":"U", "x":8.5, "y":1},
+                {"label":"I", "x":9.5, "y":1},
+                {"label":"O", "x":10.5, "y":1},
+                {"label":"P", "x":11.5, "y":1},
+                {"label":"[", "x":12.5, "y":1},
+                {"label":"]", "x":13.5, "y":1},
+                {"label":"\\", "x":14.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75},
+                {"label":"A", "x":2.5, "y":2},
+                {"label":"S", "x":3.5, "y":2},
+                {"label":"D", "x":4.5, "y":2},
+                {"label":"F", "x":5.5, "y":2},
+                {"label":"G", "x":6.5, "y":2},
+                {"label":"H", "x":7.5, "y":2},
+                {"label":"J", "x":8.5, "y":2},
+                {"label":"K", "x":9.5, "y":2},
+                {"label":"L", "x":10.5, "y":2},
+                {"label":";", "x":11.5, "y":2},
+                {"label":"'", "x":12.5, "y":2},
+                {"label":"Enter", "x":13.5, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0.25, "y":3, "w":2.25},
+                {"label":"Z", "x":2.5, "y":3},
+                {"label":"X", "x":3.5, "y":3},
+                {"label":"C", "x":4.5, "y":3},
+                {"label":"V", "x":5.5, "y":3},
+                {"label":"B", "x":6.5, "y":3},
+                {"label":"N", "x":7.5, "y":3},
+                {"label":"M", "x":8.5, "y":3},
+                {"label":",", "x":9.5, "y":3},
+                {"label":".", "x":10.5, "y":3},
+                {"label":"/", "x":11.5, "y":3},
+                {"label":"Shift", "x":12.5, "y":3, "w":2.75},
+                {"label":"\u2191", "x":15.25, "y":3},
+
+                {"label":"Super", "x":0, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":3.37, "y":4, "w":1.25},
+                {"x":4.62, "y":4, "w":2.75},
+                {"x":7.37, "y":4, "w":2.25},
+                {"x":9.62, "y":4, "w":1.25},
+                {"label":"Alt", "x":10.87, "y":4, "w":1.25},
+                {"label":"Function", "x":12.12, "y":4, "w":1.25},
+                {"label":"\u2190", "x":14.25, "y":4},
+                {"label":"\u2193", "x":15.25, "y":4},
+                {"label":"\u2192", "x":16.25, "y":4}
+            ]
         },
         "LAYOUT_bd5": {
-            "layout": [{"label":"Mute", "x":0.5, "y":0}, {"label":"Esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"\u2190", "x":14.5, "y":0}, {"label":"Del", "x":15.5, "y":0}, {"label":"Tab", "x":1, "y":1, "w":1.5}, {"label":"Q", "x":2.5, "y":1}, {"label":"W", "x":3.5, "y":1}, {"label":"E", "x":4.5, "y":1}, {"label":"R", "x":5.5, "y":1}, {"label":"T", "x":6.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"[", "x":12.5, "y":1}, {"label":"]", "x":13.5, "y":1}, {"label":"\\", "x":14.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"H", "x":7.5, "y":2}, {"label":"J", "x":8.5, "y":2}, {"label":"K", "x":9.5, "y":2}, {"label":"L", "x":10.5, "y":2}, {"label":";", "x":11.5, "y":2}, {"label":"'", "x":12.5, "y":2}, {"label":"Enter", "x":13.5, "y":2, "w":2.25}, {"label":"Shift", "x":0.25, "y":3, "w":2.25}, {"label":"Z", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}, {"label":",", "x":9.5, "y":3}, {"label":".", "x":10.5, "y":3}, {"label":"/", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":1.75}, {"label":"Fn", "x":14.25, "y":3}, {"label":"\u2191", "x":15.25, "y":3}, {"label":"Super", "x":0, "y":4, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.37, "y":4, "w":1.25}, {"x":4.62, "y":4, "w":6.25}, {"label":"Alt", "x":10.87, "y":4, "w":1.25}, {"label":"Function", "x":12.12, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4}, {"label":"\u2193", "x":15.25, "y":4}, {"label":"\u2192", "x":16.25, "y":4}]
+            "layout": [
+                {"label":"Mute", "x":0.5, "y":0},
+                {"label":"Esc", "x":1.5, "y":0},
+                {"label":"1", "x":2.5, "y":0},
+                {"label":"2", "x":3.5, "y":0},
+                {"label":"3", "x":4.5, "y":0},
+                {"label":"4", "x":5.5, "y":0},
+                {"label":"5", "x":6.5, "y":0},
+                {"label":"6", "x":7.5, "y":0},
+                {"label":"7", "x":8.5, "y":0},
+                {"label":"8", "x":9.5, "y":0},
+                {"label":"9", "x":10.5, "y":0},
+                {"label":"0", "x":11.5, "y":0},
+                {"label":"_", "x":12.5, "y":0},
+                {"label":"+", "x":13.5, "y":0},
+                {"label":"\u2190", "x":14.5, "y":0},
+                {"label":"Del", "x":15.5, "y":0},
+
+                {"label":"Tab", "x":1, "y":1, "w":1.5},
+                {"label":"Q", "x":2.5, "y":1},
+                {"label":"W", "x":3.5, "y":1},
+                {"label":"E", "x":4.5, "y":1},
+                {"label":"R", "x":5.5, "y":1},
+                {"label":"T", "x":6.5, "y":1},
+                {"label":"Y", "x":7.5, "y":1},
+                {"label":"U", "x":8.5, "y":1},
+                {"label":"I", "x":9.5, "y":1},
+                {"label":"O", "x":10.5, "y":1},
+                {"label":"P", "x":11.5, "y":1},
+                {"label":"[", "x":12.5, "y":1},
+                {"label":"]", "x":13.5, "y":1},
+                {"label":"\\", "x":14.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75},
+                {"label":"A", "x":2.5, "y":2},
+                {"label":"S", "x":3.5, "y":2},
+                {"label":"D", "x":4.5, "y":2},
+                {"label":"F", "x":5.5, "y":2},
+                {"label":"G", "x":6.5, "y":2},
+                {"label":"H", "x":7.5, "y":2},
+                {"label":"J", "x":8.5, "y":2},
+                {"label":"K", "x":9.5, "y":2},
+                {"label":"L", "x":10.5, "y":2},
+                {"label":";", "x":11.5, "y":2},
+                {"label":"'", "x":12.5, "y":2},
+                {"label":"Enter", "x":13.5, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0.25, "y":3, "w":2.25},
+                {"label":"Z", "x":2.5, "y":3},
+                {"label":"X", "x":3.5, "y":3},
+                {"label":"C", "x":4.5, "y":3},
+                {"label":"V", "x":5.5, "y":3},
+                {"label":"B", "x":6.5, "y":3},
+                {"label":"N", "x":7.5, "y":3},
+                {"label":"M", "x":8.5, "y":3},
+                {"label":",", "x":9.5, "y":3},
+                {"label":".", "x":10.5, "y":3},
+                {"label":"/", "x":11.5, "y":3},
+                {"label":"Shift", "x":12.5, "y":3, "w":1.75},
+                {"label":"Fn", "x":14.25, "y":3},
+                {"label":"\u2191", "x":15.25, "y":3},
+
+                {"label":"Super", "x":0, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":3.37, "y":4, "w":1.25},
+                {"x":4.62, "y":4, "w":6.25},
+                {"label":"Alt", "x":10.87, "y":4, "w":1.25},
+                {"label":"Function", "x":12.12, "y":4, "w":1.25},
+                {"label":"\u2190", "x":14.25, "y":4},
+                {"label":"\u2193", "x":15.25, "y":4},
+                {"label":"\u2192", "x":16.25, "y":4}
+            ]
         },
         "LAYOUT_bds": {
-            "layout": [{"label":"Mute", "x":0.5, "y":0}, {"label":"Esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"\u2190", "x":14.5, "y":0}, {"label":"Del", "x":15.5, "y":0}, {"label":"Tab", "x":1, "y":1, "w":1.5}, {"label":"Q", "x":2.5, "y":1}, {"label":"W", "x":3.5, "y":1}, {"label":"E", "x":4.5, "y":1}, {"label":"R", "x":5.5, "y":1}, {"label":"T", "x":6.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"[", "x":12.5, "y":1}, {"label":"]", "x":13.5, "y":1}, {"label":"\\", "x":14.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"H", "x":7.5, "y":2}, {"label":"J", "x":8.5, "y":2}, {"label":"K", "x":9.5, "y":2}, {"label":"L", "x":10.5, "y":2}, {"label":";", "x":11.5, "y":2}, {"label":"'", "x":12.5, "y":2}, {"label":"Enter", "x":13.5, "y":2, "w":2.25}, {"label":"Shift", "x":0.25, "y":3, "w":2.25}, {"label":"Z", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}, {"label":",", "x":9.5, "y":3}, {"label":".", "x":10.5, "y":3}, {"label":"/", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":1.75}, {"label":"Fn", "x":14.25, "y":3}, {"label":"\u2191", "x":15.25, "y":3}, {"label":"Super", "x":0, "y":4, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.37, "y":4, "w":1.25}, {"x":4.62, "y":4, "w":2.75}, {"x":7.37, "y":4, "w":2.25}, {"x":9.62, "y":4, "w":1.25}, {"label":"Alt", "x":10.87, "y":4, "w":1.25}, {"label":"Function", "x":12.12, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4}, {"label":"\u2193", "x":15.25, "y":4}, {"label":"\u2192", "x":16.25, "y":4}]
+            "layout": [
+                {"label":"Mute", "x":0.5, "y":0},
+                {"label":"Esc", "x":1.5, "y":0},
+                {"label":"1", "x":2.5, "y":0},
+                {"label":"2", "x":3.5, "y":0},
+                {"label":"3", "x":4.5, "y":0},
+                {"label":"4", "x":5.5, "y":0},
+                {"label":"5", "x":6.5, "y":0},
+                {"label":"6", "x":7.5, "y":0},
+                {"label":"7", "x":8.5, "y":0},
+                {"label":"8", "x":9.5, "y":0},
+                {"label":"9", "x":10.5, "y":0},
+                {"label":"0", "x":11.5, "y":0},
+                {"label":"_", "x":12.5, "y":0},
+                {"label":"+", "x":13.5, "y":0},
+                {"label":"\u2190", "x":14.5, "y":0},
+                {"label":"Del", "x":15.5, "y":0},
+
+                {"label":"Tab", "x":1, "y":1, "w":1.5},
+                {"label":"Q", "x":2.5, "y":1},
+                {"label":"W", "x":3.5, "y":1},
+                {"label":"E", "x":4.5, "y":1},
+                {"label":"R", "x":5.5, "y":1},
+                {"label":"T", "x":6.5, "y":1},
+                {"label":"Y", "x":7.5, "y":1},
+                {"label":"U", "x":8.5, "y":1},
+                {"label":"I", "x":9.5, "y":1},
+                {"label":"O", "x":10.5, "y":1},
+                {"label":"P", "x":11.5, "y":1},
+                {"label":"[", "x":12.5, "y":1},
+                {"label":"]", "x":13.5, "y":1},
+                {"label":"\\", "x":14.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75},
+                {"label":"A", "x":2.5, "y":2},
+                {"label":"S", "x":3.5, "y":2},
+                {"label":"D", "x":4.5, "y":2},
+                {"label":"F", "x":5.5, "y":2},
+                {"label":"G", "x":6.5, "y":2},
+                {"label":"H", "x":7.5, "y":2},
+                {"label":"J", "x":8.5, "y":2},
+                {"label":"K", "x":9.5, "y":2},
+                {"label":"L", "x":10.5, "y":2},
+                {"label":";", "x":11.5, "y":2},
+                {"label":"'", "x":12.5, "y":2},
+                {"label":"Enter", "x":13.5, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0.25, "y":3, "w":2.25},
+                {"label":"Z", "x":2.5, "y":3},
+                {"label":"X", "x":3.5, "y":3},
+                {"label":"C", "x":4.5, "y":3},
+                {"label":"V", "x":5.5, "y":3},
+                {"label":"B", "x":6.5, "y":3},
+                {"label":"N", "x":7.5, "y":3},
+                {"label":"M", "x":8.5, "y":3},
+                {"label":",", "x":9.5, "y":3},
+                {"label":".", "x":10.5, "y":3},
+                {"label":"/", "x":11.5, "y":3},
+                {"label":"Shift", "x":12.5, "y":3, "w":1.75},
+                {"label":"Fn", "x":14.25, "y":3},
+                {"label":"\u2191", "x":15.25, "y":3},
+
+                {"label":"Super", "x":0, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":3.37, "y":4, "w":1.25},
+                {"x":4.62, "y":4, "w":2.75},
+                {"x":7.37, "y":4, "w":2.25},
+                {"x":9.62, "y":4, "w":1.25},
+                {"label":"Alt", "x":10.87, "y":4, "w":1.25},
+                {"label":"Function", "x":12.12, "y":4, "w":1.25},
+                {"label":"\u2190", "x":14.25, "y":4},
+                {"label":"\u2193", "x":15.25, "y":4},
+                {"label":"\u2192", "x":16.25, "y":4}
+            ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/ez_maker/directpins/teensy_32/info.json b/keyboards/ez_maker/directpins/teensy_32/info.json
index 5cebcae152..0a6ac5c374 100644
--- a/keyboards/ez_maker/directpins/teensy_32/info.json
+++ b/keyboards/ez_maker/directpins/teensy_32/info.json
@@ -4,6 +4,7 @@
     "maintainer": "skullydazed",
     "debounce": 5,
     "processor": "MK20DX256",
+    "bootloader": "halfkay",
     "features": {
         "bootmagic": true,
         "extrakey": true,
diff --git a/keyboards/ez_maker/directpins/teensy_lc/info.json b/keyboards/ez_maker/directpins/teensy_lc/info.json
index 856a462bb7..1e88239d41 100644
--- a/keyboards/ez_maker/directpins/teensy_lc/info.json
+++ b/keyboards/ez_maker/directpins/teensy_lc/info.json
@@ -4,6 +4,7 @@
     "maintainer": "skullydazed",
     "debounce": 5,
     "processor": "MKL26Z64",
+    "bootloader": "halfkay",
     "features": {
         "bootmagic": true,
         "extrakey": true,
diff --git a/keyboards/fjlabs/7vhotswap/7vhotswap.h b/keyboards/fjlabs/7vhotswap/7vhotswap.h
index f0f710dac5..741f7d53af 100644
--- a/keyboards/fjlabs/7vhotswap/7vhotswap.h
+++ b/keyboards/fjlabs/7vhotswap/7vhotswap.h
@@ -18,12 +18,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 /* === All used matrix spots populated === */
 #define LAYOUT_75_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,       \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,  \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D,       \
-    K50, K51, K52,           K55,                K59, K5A,      K5C, K5D, K5E  \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,           \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3D, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2E, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,           K3E, \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D,           \
+    K50, K51, K52,           K55,                K59, K5A,      K5C, K5D, K5E       \
 ) { \
     { K00, K01, K02, K03,   K04,   K05, K06,   K07,   K08,   K09, K0A, K0B,   K0C,   K0D, KC_NO },  \
     { K10, K11, K12, K13,   K14,   K15, K16,   K17,   K18,   K19, K1A, K1B,   K1C,   K1D, K1E   },  \
diff --git a/keyboards/fjlabs/7vhotswap/info.json b/keyboards/fjlabs/7vhotswap/info.json
index a4955756e9..07404031e3 100644
--- a/keyboards/fjlabs/7vhotswap/info.json
+++ b/keyboards/fjlabs/7vhotswap/info.json
@@ -1,7 +1,7 @@
 {
     "keyboard_name": "7V Hotswap PCBs",
     "url": "http://www.fjlaboratories.com/",
-    "maintainer": "FJLabs",
+    "maintainer": "mrnoisytiger",
     "layouts": {
         "LAYOUT_75_all": {
             "layout": [
@@ -20,19 +20,19 @@
                 {"label":"F12", "x":12.75, "y":0},
                 {"label":"Print Screen", "x":14, "y":0},
 
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"@", "x":2, "y":1.25},
-                {"label":"#", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
                 {"label":"Back Space", "x":13, "y":1.25},
                 {"label":"Back Space", "x":14, "y":1.25},
                 {"label":"Delete", "x":15.25, "y":1.25},
@@ -48,9 +48,9 @@
                 {"label":"I", "x":8.5, "y":2.25},
                 {"label":"O", "x":9.5, "y":2.25},
                 {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
                 {"label":"Page Up", "x":15.25, "y":2.25},
 
                 {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
@@ -63,8 +63,8 @@
                 {"label":"J", "x":7.75, "y":3.25},
                 {"label":"K", "x":8.75, "y":3.25},
                 {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"SQ", "x":11.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
                 {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
                 {"label":"Page Down", "x":15.25, "y":3.25},
 
@@ -76,21 +76,21 @@
                 {"label":"B", "x":6.25, "y":4.25},
                 {"label":"N", "x":7.25, "y":4.25},
                 {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
                 {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
                 {"label":"\u2191", "x":14.25, "y":4.5},
 
                 {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
                 {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
                 {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"MO(1)", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":12.75, "y":5.5},
-                {"label":"\u2193", "x":13.75, "y":5.5},
-                {"label":"\u2192", "x":14.75, "y":5.5}
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.5},
+                {"label":"MO(1)", "x":11.5, "y":5.25, "w":1.5},
+                {"label":"\u2190", "x":13.25, "y":5.5},
+                {"label":"\u2193", "x":14.25, "y":5.5},
+                {"label":"\u2192", "x":15.25, "y":5.5}
             ]
         }
     }
diff --git a/keyboards/fjlabs/7vhotswap/keymaps/default/keymap.c b/keyboards/fjlabs/7vhotswap/keymaps/default/keymap.c
index 5484ab9f8c..86b34a0446 100644
--- a/keyboards/fjlabs/7vhotswap/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/7vhotswap/keymaps/default/keymap.c
@@ -22,20 +22,20 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_75_all(
-        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_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, 
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 
-        KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_BSPC, KC_PGDN,
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+        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_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_BSPC,    KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,              KC_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     [_LAYER1] = LAYOUT_75_all(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,             KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     )
 };
diff --git a/keyboards/fjlabs/7vhotswap/keymaps/via/keymap.c b/keyboards/fjlabs/7vhotswap/keymaps/via/keymap.c
index e6c2397a16..67838a1a84 100644
--- a/keyboards/fjlabs/7vhotswap/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/7vhotswap/keymaps/via/keymap.c
@@ -24,38 +24,38 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_75_all(
-        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_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, 
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 
-        KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_BSPC, KC_PGDN,
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+        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_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_BSPC,    KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,              KC_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     [_LAYER1] = LAYOUT_75_all(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,             KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
 
     [_LAYER2] = LAYOUT_75_all(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,             KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
 
     [_LAYER3] = LAYOUT_75_all(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,             KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     )
-};
\ No newline at end of file
+};
diff --git a/keyboards/fjlabs/7vhotswap/readme.md b/keyboards/fjlabs/7vhotswap/readme.md
index 41f0014105..0f6f847285 100644
--- a/keyboards/fjlabs/7vhotswap/readme.md
+++ b/keyboards/fjlabs/7vhotswap/readme.md
@@ -1,7 +1,8 @@
 # 7V Hotswap PCB by FJLaboratories
 
 The following is the QMK Firmware for the 7V Hotswap PCB by [FJLaboratories](https://www.fjlaboratories.com/).
-* Keyboard Maintainer: FJLaboratories
+
+* Keyboard Maintainer: [FJLaboratories](https://github.com/mrnoisytiger)
 * Hardware Supported: 7V Hotswap
 
 Make example for this keyboard (after setting up your build environment):
diff --git a/keyboards/butterstick/butterstick.c b/keyboards/gboards/butterstick/butterstick.c
similarity index 100%
rename from keyboards/butterstick/butterstick.c
rename to keyboards/gboards/butterstick/butterstick.c
diff --git a/keyboards/butterstick/butterstick.h b/keyboards/gboards/butterstick/butterstick.h
similarity index 100%
rename from keyboards/butterstick/butterstick.h
rename to keyboards/gboards/butterstick/butterstick.h
diff --git a/keyboards/butterstick/config.h b/keyboards/gboards/butterstick/config.h
similarity index 100%
rename from keyboards/butterstick/config.h
rename to keyboards/gboards/butterstick/config.h
diff --git a/keyboards/butterstick/info.json b/keyboards/gboards/butterstick/info.json
similarity index 100%
rename from keyboards/butterstick/info.json
rename to keyboards/gboards/butterstick/info.json
diff --git a/keyboards/butterstick/keymaps/default/keymap.c b/keyboards/gboards/butterstick/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/butterstick/keymaps/default/keymap.c
rename to keyboards/gboards/butterstick/keymaps/default/keymap.c
diff --git a/keyboards/butterstick/keymaps/dennytom/README.md b/keyboards/gboards/butterstick/keymaps/dennytom/README.md
similarity index 100%
rename from keyboards/butterstick/keymaps/dennytom/README.md
rename to keyboards/gboards/butterstick/keymaps/dennytom/README.md
diff --git a/keyboards/butterstick/keymaps/dennytom/keymap.c b/keyboards/gboards/butterstick/keymaps/dennytom/keymap.c
similarity index 100%
rename from keyboards/butterstick/keymaps/dennytom/keymap.c
rename to keyboards/gboards/butterstick/keymaps/dennytom/keymap.c
diff --git a/keyboards/butterstick/keymaps/dennytom/keymap_def.json b/keyboards/gboards/butterstick/keymaps/dennytom/keymap_def.json
similarity index 100%
rename from keyboards/butterstick/keymaps/dennytom/keymap_def.json
rename to keyboards/gboards/butterstick/keymaps/dennytom/keymap_def.json
diff --git a/keyboards/butterstick/keymaps/dennytom/rules.mk b/keyboards/gboards/butterstick/keymaps/dennytom/rules.mk
similarity index 100%
rename from keyboards/butterstick/keymaps/dennytom/rules.mk
rename to keyboards/gboards/butterstick/keymaps/dennytom/rules.mk
diff --git a/keyboards/butterstick/readme.md b/keyboards/gboards/butterstick/readme.md
similarity index 95%
rename from keyboards/butterstick/readme.md
rename to keyboards/gboards/butterstick/readme.md
index 8bae8ba5a0..37e9375d88 100644
--- a/keyboards/butterstick/readme.md
+++ b/keyboards/gboards/butterstick/readme.md
@@ -9,6 +9,6 @@ Hardware Availability: [g Heavy Industries](https://www.gboards.ca/product/butte
 
 Make example for this keyboard (after setting up your build environment):
 
-    make butterstick:default
+    make gboards/butterstick:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/butterstick/rules.mk b/keyboards/gboards/butterstick/rules.mk
similarity index 100%
rename from keyboards/butterstick/rules.mk
rename to keyboards/gboards/butterstick/rules.mk
diff --git a/keyboards/butterstick/sten.c b/keyboards/gboards/butterstick/sten.c
similarity index 100%
rename from keyboards/butterstick/sten.c
rename to keyboards/gboards/butterstick/sten.c
diff --git a/keyboards/butterstick/sten.h b/keyboards/gboards/butterstick/sten.h
similarity index 100%
rename from keyboards/butterstick/sten.h
rename to keyboards/gboards/butterstick/sten.h
diff --git a/keyboards/ergotaco/config.h b/keyboards/gboards/ergotaco/config.h
similarity index 100%
rename from keyboards/ergotaco/config.h
rename to keyboards/gboards/ergotaco/config.h
diff --git a/keyboards/ergotaco/ergotaco.c b/keyboards/gboards/ergotaco/ergotaco.c
similarity index 100%
rename from keyboards/ergotaco/ergotaco.c
rename to keyboards/gboards/ergotaco/ergotaco.c
diff --git a/keyboards/ergotaco/ergotaco.h b/keyboards/gboards/ergotaco/ergotaco.h
similarity index 100%
rename from keyboards/ergotaco/ergotaco.h
rename to keyboards/gboards/ergotaco/ergotaco.h
diff --git a/keyboards/ergotaco/info.json b/keyboards/gboards/ergotaco/info.json
similarity index 100%
rename from keyboards/ergotaco/info.json
rename to keyboards/gboards/ergotaco/info.json
diff --git a/keyboards/ergotaco/keymaps/default/keymap.c b/keyboards/gboards/ergotaco/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ergotaco/keymaps/default/keymap.c
rename to keyboards/gboards/ergotaco/keymaps/default/keymap.c
diff --git a/keyboards/ergotaco/keymaps/default/readme.md b/keyboards/gboards/ergotaco/keymaps/default/readme.md
similarity index 79%
rename from keyboards/ergotaco/keymaps/default/readme.md
rename to keyboards/gboards/ergotaco/keymaps/default/readme.md
index 653f3774ea..d9c7c1601f 100644
--- a/keyboards/ergotaco/keymaps/default/readme.md
+++ b/keyboards/gboards/ergotaco/keymaps/default/readme.md
@@ -1,6 +1,6 @@
 This is the default keymap for the ErgoTaco, Make it your own!
 
 ## Settings
-To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/ergotaco/keymaps/default/rules.mk
+To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gboards/ergotaco/keymaps/default/rules.mk
 
 Ideally you should copy this directory and make your changes there. If you come up with a good layout submit a PR!
diff --git a/keyboards/ergotaco/keymaps/default/rules.mk b/keyboards/gboards/ergotaco/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/ergotaco/keymaps/default/rules.mk
rename to keyboards/gboards/ergotaco/keymaps/default/rules.mk
diff --git a/keyboards/ergotaco/matrix.c b/keyboards/gboards/ergotaco/matrix.c
similarity index 100%
rename from keyboards/ergotaco/matrix.c
rename to keyboards/gboards/ergotaco/matrix.c
diff --git a/keyboards/ergotaco/post_rules.mk b/keyboards/gboards/ergotaco/post_rules.mk
similarity index 100%
rename from keyboards/ergotaco/post_rules.mk
rename to keyboards/gboards/ergotaco/post_rules.mk
diff --git a/keyboards/ergotaco/readme.md b/keyboards/gboards/ergotaco/readme.md
similarity index 91%
rename from keyboards/ergotaco/readme.md
rename to keyboards/gboards/ergotaco/readme.md
index 40077e2a8d..dc9db3bb64 100644
--- a/keyboards/ergotaco/readme.md
+++ b/keyboards/gboards/ergotaco/readme.md
@@ -11,13 +11,13 @@ Hardware Availability: [gboards.ca](http://gboards.ca)
 ## Firmware building
 Clone the QMK Repo and install dfu-programmer, flash with:
 
-    make ergotaco:default:dfu
+    make gboards/ergotaco:default:dfu
 
 And reset your keyboard!
 
 To just test if your build system is sane, try compiling the default keymap using:
    
-    make ergotaco:default
+    make gboards/ergotaco:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
diff --git a/keyboards/ergotaco/rules.mk b/keyboards/gboards/ergotaco/rules.mk
similarity index 100%
rename from keyboards/ergotaco/rules.mk
rename to keyboards/gboards/ergotaco/rules.mk
diff --git a/keyboards/georgi/config.h b/keyboards/gboards/georgi/config.h
similarity index 100%
rename from keyboards/georgi/config.h
rename to keyboards/gboards/georgi/config.h
diff --git a/keyboards/georgi/georgi.c b/keyboards/gboards/georgi/georgi.c
similarity index 100%
rename from keyboards/georgi/georgi.c
rename to keyboards/gboards/georgi/georgi.c
diff --git a/keyboards/georgi/georgi.h b/keyboards/gboards/georgi/georgi.h
similarity index 100%
rename from keyboards/georgi/georgi.h
rename to keyboards/gboards/georgi/georgi.h
diff --git a/keyboards/georgi/info.json b/keyboards/gboards/georgi/info.json
similarity index 100%
rename from keyboards/georgi/info.json
rename to keyboards/gboards/georgi/info.json
diff --git a/keyboards/georgi/keymaps/colemak-dh/keymap.c b/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c
similarity index 100%
rename from keyboards/georgi/keymaps/colemak-dh/keymap.c
rename to keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c
diff --git a/keyboards/georgi/keymaps/colemak-dh/readme.md b/keyboards/gboards/georgi/keymaps/colemak-dh/readme.md
similarity index 100%
rename from keyboards/georgi/keymaps/colemak-dh/readme.md
rename to keyboards/gboards/georgi/keymaps/colemak-dh/readme.md
diff --git a/keyboards/georgi/keymaps/colemak-dh/rules.mk b/keyboards/gboards/georgi/keymaps/colemak-dh/rules.mk
similarity index 100%
rename from keyboards/georgi/keymaps/colemak-dh/rules.mk
rename to keyboards/gboards/georgi/keymaps/colemak-dh/rules.mk
diff --git a/keyboards/georgi/keymaps/default-flipped/keymap.c b/keyboards/gboards/georgi/keymaps/default-flipped/keymap.c
similarity index 100%
rename from keyboards/georgi/keymaps/default-flipped/keymap.c
rename to keyboards/gboards/georgi/keymaps/default-flipped/keymap.c
diff --git a/keyboards/georgi/keymaps/default-flipped/readme.md b/keyboards/gboards/georgi/keymaps/default-flipped/readme.md
similarity index 100%
rename from keyboards/georgi/keymaps/default-flipped/readme.md
rename to keyboards/gboards/georgi/keymaps/default-flipped/readme.md
diff --git a/keyboards/georgi/keymaps/default-flipped/rules.mk b/keyboards/gboards/georgi/keymaps/default-flipped/rules.mk
similarity index 100%
rename from keyboards/georgi/keymaps/default-flipped/rules.mk
rename to keyboards/gboards/georgi/keymaps/default-flipped/rules.mk
diff --git a/keyboards/georgi/keymaps/default/keymap.c b/keyboards/gboards/georgi/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/georgi/keymaps/default/keymap.c
rename to keyboards/gboards/georgi/keymaps/default/keymap.c
diff --git a/keyboards/georgi/keymaps/default/readme.md b/keyboards/gboards/georgi/keymaps/default/readme.md
similarity index 100%
rename from keyboards/georgi/keymaps/default/readme.md
rename to keyboards/gboards/georgi/keymaps/default/readme.md
diff --git a/keyboards/georgi/keymaps/default/rules.mk b/keyboards/gboards/georgi/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/georgi/keymaps/default/rules.mk
rename to keyboards/gboards/georgi/keymaps/default/rules.mk
diff --git a/keyboards/georgi/keymaps/dennytom/README.md b/keyboards/gboards/georgi/keymaps/dennytom/README.md
similarity index 100%
rename from keyboards/georgi/keymaps/dennytom/README.md
rename to keyboards/gboards/georgi/keymaps/dennytom/README.md
diff --git a/keyboards/georgi/keymaps/dennytom/keymap.c b/keyboards/gboards/georgi/keymaps/dennytom/keymap.c
similarity index 100%
rename from keyboards/georgi/keymaps/dennytom/keymap.c
rename to keyboards/gboards/georgi/keymaps/dennytom/keymap.c
diff --git a/keyboards/georgi/keymaps/dennytom/keymap_def.json b/keyboards/gboards/georgi/keymaps/dennytom/keymap_def.json
similarity index 100%
rename from keyboards/georgi/keymaps/dennytom/keymap_def.json
rename to keyboards/gboards/georgi/keymaps/dennytom/keymap_def.json
diff --git a/keyboards/georgi/keymaps/dennytom/rules.mk b/keyboards/gboards/georgi/keymaps/dennytom/rules.mk
similarity index 100%
rename from keyboards/georgi/keymaps/dennytom/rules.mk
rename to keyboards/gboards/georgi/keymaps/dennytom/rules.mk
diff --git a/keyboards/georgi/keymaps/minimal/keymap.c b/keyboards/gboards/georgi/keymaps/minimal/keymap.c
similarity index 100%
rename from keyboards/georgi/keymaps/minimal/keymap.c
rename to keyboards/gboards/georgi/keymaps/minimal/keymap.c
diff --git a/keyboards/georgi/keymaps/minimal/readme.md b/keyboards/gboards/georgi/keymaps/minimal/readme.md
similarity index 100%
rename from keyboards/georgi/keymaps/minimal/readme.md
rename to keyboards/gboards/georgi/keymaps/minimal/readme.md
diff --git a/keyboards/georgi/keymaps/minimal/rules.mk b/keyboards/gboards/georgi/keymaps/minimal/rules.mk
similarity index 100%
rename from keyboards/georgi/keymaps/minimal/rules.mk
rename to keyboards/gboards/georgi/keymaps/minimal/rules.mk
diff --git a/keyboards/georgi/keymaps/norman/keymap.c b/keyboards/gboards/georgi/keymaps/norman/keymap.c
similarity index 100%
rename from keyboards/georgi/keymaps/norman/keymap.c
rename to keyboards/gboards/georgi/keymaps/norman/keymap.c
diff --git a/keyboards/georgi/keymaps/norman/readme.md b/keyboards/gboards/georgi/keymaps/norman/readme.md
similarity index 100%
rename from keyboards/georgi/keymaps/norman/readme.md
rename to keyboards/gboards/georgi/keymaps/norman/readme.md
diff --git a/keyboards/georgi/keymaps/norman/rules.mk b/keyboards/gboards/georgi/keymaps/norman/rules.mk
similarity index 100%
rename from keyboards/georgi/keymaps/norman/rules.mk
rename to keyboards/gboards/georgi/keymaps/norman/rules.mk
diff --git a/keyboards/georgi/matrix.c b/keyboards/gboards/georgi/matrix.c
similarity index 100%
rename from keyboards/georgi/matrix.c
rename to keyboards/gboards/georgi/matrix.c
diff --git a/keyboards/georgi/readme.md b/keyboards/gboards/georgi/readme.md
similarity index 80%
rename from keyboards/georgi/readme.md
rename to keyboards/gboards/georgi/readme.md
index 247219b934..2ba259ab7e 100644
--- a/keyboards/georgi/readme.md
+++ b/keyboards/gboards/georgi/readme.md
@@ -13,13 +13,13 @@ Hardware Availability: [gboards.ca](http://gboards.ca)
 ## Firmware building
 After cloning the QMK repo and installing dfu-programmer build and flash with. Be sure to reset your keyboard!
 
-    make georgi:default:dfu
+    make gboards/georgi:default:dfu
 
 To just test your build with the default keymap
    
-    make georgi:default
+    make gboards/georgi:default
 
-Build options can be enabled/disabled in keyboards/georgi/keymaps/default/rules.mk . Copy the default directory and make any changes to your layout, if you think they're worth sharing submit a PR!
+Build options can be enabled/disabled in keyboards/gboards/georgi/keymaps/default/rules.mk . Copy the default directory and make any changes to your layout, if you think they're worth sharing submit a PR!
 
 ## Documentation
 Is hosted over on [docs.gboards.ca](http://docs.gboards.ca/). Please take a look at the docs for customizing your firmware!
diff --git a/keyboards/georgi/rules.mk b/keyboards/gboards/georgi/rules.mk
similarity index 100%
rename from keyboards/georgi/rules.mk
rename to keyboards/gboards/georgi/rules.mk
diff --git a/keyboards/georgi/sten.c b/keyboards/gboards/georgi/sten.c
similarity index 100%
rename from keyboards/georgi/sten.c
rename to keyboards/gboards/georgi/sten.c
diff --git a/keyboards/georgi/sten.h b/keyboards/gboards/georgi/sten.h
similarity index 100%
rename from keyboards/georgi/sten.h
rename to keyboards/gboards/georgi/sten.h
diff --git a/keyboards/gergo/config.h b/keyboards/gboards/gergo/config.h
similarity index 100%
rename from keyboards/gergo/config.h
rename to keyboards/gboards/gergo/config.h
diff --git a/keyboards/gergo/gergo.c b/keyboards/gboards/gergo/gergo.c
similarity index 100%
rename from keyboards/gergo/gergo.c
rename to keyboards/gboards/gergo/gergo.c
diff --git a/keyboards/gergo/gergo.h b/keyboards/gboards/gergo/gergo.h
similarity index 100%
rename from keyboards/gergo/gergo.h
rename to keyboards/gboards/gergo/gergo.h
diff --git a/keyboards/gergo/info.json b/keyboards/gboards/gergo/info.json
similarity index 100%
rename from keyboards/gergo/info.json
rename to keyboards/gboards/gergo/info.json
diff --git a/keyboards/gergo/keymaps/abstractkb/config.h b/keyboards/gboards/gergo/keymaps/abstractkb/config.h
similarity index 100%
rename from keyboards/gergo/keymaps/abstractkb/config.h
rename to keyboards/gboards/gergo/keymaps/abstractkb/config.h
diff --git a/keyboards/gergo/keymaps/abstractkb/keymap.c b/keyboards/gboards/gergo/keymaps/abstractkb/keymap.c
similarity index 100%
rename from keyboards/gergo/keymaps/abstractkb/keymap.c
rename to keyboards/gboards/gergo/keymaps/abstractkb/keymap.c
diff --git a/keyboards/gergo/keymaps/abstractkb/readme.md b/keyboards/gboards/gergo/keymaps/abstractkb/readme.md
similarity index 88%
rename from keyboards/gergo/keymaps/abstractkb/readme.md
rename to keyboards/gboards/gergo/keymaps/abstractkb/readme.md
index 0b07136e89..863b21e8e2 100644
--- a/keyboards/gergo/keymaps/abstractkb/readme.md
+++ b/keyboards/gboards/gergo/keymaps/abstractkb/readme.md
@@ -5,6 +5,6 @@
 This is my personal modification to the stock gergo keymap.
 
 ## Settings
-To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gergo/keymaps/default/rules.mk
+To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gboards/gergo/keymaps/default/rules.mk
 
 Ideally you should copy this directory and make your changes there. If you come up with a good layout submit a PR!
diff --git a/keyboards/gergo/keymaps/abstractkb/rules.mk b/keyboards/gboards/gergo/keymaps/abstractkb/rules.mk
similarity index 96%
rename from keyboards/gergo/keymaps/abstractkb/rules.mk
rename to keyboards/gboards/gergo/keymaps/abstractkb/rules.mk
index b87e599734..4b4e56c4a0 100644
--- a/keyboards/gergo/keymaps/abstractkb/rules.mk
+++ b/keyboards/gboards/gergo/keymaps/abstractkb/rules.mk
@@ -27,6 +27,7 @@ ifneq ($(strip $(SCROLLSTEP)),)
 endif
 ifeq ($(strip $(BALLER)), yes)
 	POINTING_DEVICE_ENABLE	= yes
+    POINTING_DEVICE_DRIVER = custom
     OPT_DEFS += -DBALLER
 endif
 ifeq ($(strip $(DEBUG_BALLER)), yes)
diff --git a/keyboards/gergo/keymaps/colemak/keymap.c b/keyboards/gboards/gergo/keymaps/colemak/keymap.c
similarity index 100%
rename from keyboards/gergo/keymaps/colemak/keymap.c
rename to keyboards/gboards/gergo/keymaps/colemak/keymap.c
diff --git a/keyboards/gergo/keymaps/colemak/readme.md b/keyboards/gboards/gergo/keymaps/colemak/readme.md
similarity index 92%
rename from keyboards/gergo/keymaps/colemak/readme.md
rename to keyboards/gboards/gergo/keymaps/colemak/readme.md
index 1c1cc7bdea..5cfe3b8306 100644
--- a/keyboards/gergo/keymaps/colemak/readme.md
+++ b/keyboards/gboards/gergo/keymaps/colemak/readme.md
@@ -11,6 +11,6 @@ You can view this layout over at
 [keyboad-layout-editor.com](http://www.keyboard-layout-editor.com/#/gists/f04d6a3b0cd3db91407c51f7ba36aeb3).
 
 ## Settings
-To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gergo/keymaps/default/rules.mk
+To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gboards/gergo/keymaps/default/rules.mk
 
 Ideally you should copy this directory and make your changes there. If you come up with a good layout submit a PR!
diff --git a/keyboards/gergo/keymaps/colemak/rules.mk b/keyboards/gboards/gergo/keymaps/colemak/rules.mk
similarity index 100%
rename from keyboards/gergo/keymaps/colemak/rules.mk
rename to keyboards/gboards/gergo/keymaps/colemak/rules.mk
diff --git a/keyboards/gergo/keymaps/default/config.h b/keyboards/gboards/gergo/keymaps/default/config.h
similarity index 100%
rename from keyboards/gergo/keymaps/default/config.h
rename to keyboards/gboards/gergo/keymaps/default/config.h
diff --git a/keyboards/gergo/keymaps/default/keymap.c b/keyboards/gboards/gergo/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/gergo/keymaps/default/keymap.c
rename to keyboards/gboards/gergo/keymaps/default/keymap.c
diff --git a/keyboards/gergo/keymaps/oled/readme.md b/keyboards/gboards/gergo/keymaps/default/readme.md
similarity index 90%
rename from keyboards/gergo/keymaps/oled/readme.md
rename to keyboards/gboards/gergo/keymaps/default/readme.md
index 471a20fbdf..8e49b2f5b0 100644
--- a/keyboards/gergo/keymaps/oled/readme.md
+++ b/keyboards/gboards/gergo/keymaps/default/readme.md
@@ -5,6 +5,6 @@
 This is the default keymap for Gergo, it's based heavily off of the naps62 ErgoDox layout and is aimed at a programmer friendly keymap.
 
 ## Settings
-To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gergo/keymaps/default/rules.mk
+To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gboards/gergo/keymaps/default/rules.mk
 
 Ideally you should copy this directory and make your changes there. If you come up with a good layout submit a PR!
diff --git a/keyboards/gergo/keymaps/default/rules.mk b/keyboards/gboards/gergo/keymaps/default/rules.mk
similarity index 96%
rename from keyboards/gergo/keymaps/default/rules.mk
rename to keyboards/gboards/gergo/keymaps/default/rules.mk
index 351c525583..bc2b3cf43b 100644
--- a/keyboards/gergo/keymaps/default/rules.mk
+++ b/keyboards/gboards/gergo/keymaps/default/rules.mk
@@ -27,6 +27,7 @@ ifneq ($(strip $(SCROLLSTEP)),)
 endif
 ifeq ($(strip $(BALLER)), yes)
 	POINTING_DEVICE_ENABLE	= yes
+    POINTING_DEVICE_DRIVER = custom
     OPT_DEFS += -DBALLER
 endif
 ifeq ($(strip $(DEBUG_BALLER)), yes)
diff --git a/keyboards/gergo/keymaps/drashna/keymap.c b/keyboards/gboards/gergo/keymaps/drashna/keymap.c
similarity index 100%
rename from keyboards/gergo/keymaps/drashna/keymap.c
rename to keyboards/gboards/gergo/keymaps/drashna/keymap.c
diff --git a/keyboards/gergo/keymaps/drashna/rules.mk b/keyboards/gboards/gergo/keymaps/drashna/rules.mk
similarity index 100%
rename from keyboards/gergo/keymaps/drashna/rules.mk
rename to keyboards/gboards/gergo/keymaps/drashna/rules.mk
diff --git a/keyboards/gergo/keymaps/germ/config.h b/keyboards/gboards/gergo/keymaps/germ/config.h
similarity index 100%
rename from keyboards/gergo/keymaps/germ/config.h
rename to keyboards/gboards/gergo/keymaps/germ/config.h
diff --git a/keyboards/gergo/keymaps/germ/keymap.c b/keyboards/gboards/gergo/keymaps/germ/keymap.c
similarity index 100%
rename from keyboards/gergo/keymaps/germ/keymap.c
rename to keyboards/gboards/gergo/keymaps/germ/keymap.c
diff --git a/keyboards/gergo/keymaps/germ/readme.md b/keyboards/gboards/gergo/keymaps/germ/readme.md
similarity index 90%
rename from keyboards/gergo/keymaps/germ/readme.md
rename to keyboards/gboards/gergo/keymaps/germ/readme.md
index 471a20fbdf..8e49b2f5b0 100644
--- a/keyboards/gergo/keymaps/germ/readme.md
+++ b/keyboards/gboards/gergo/keymaps/germ/readme.md
@@ -5,6 +5,6 @@
 This is the default keymap for Gergo, it's based heavily off of the naps62 ErgoDox layout and is aimed at a programmer friendly keymap.
 
 ## Settings
-To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gergo/keymaps/default/rules.mk
+To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gboards/gergo/keymaps/default/rules.mk
 
 Ideally you should copy this directory and make your changes there. If you come up with a good layout submit a PR!
diff --git a/keyboards/gergo/keymaps/germ/rules.mk b/keyboards/gboards/gergo/keymaps/germ/rules.mk
similarity index 96%
rename from keyboards/gergo/keymaps/germ/rules.mk
rename to keyboards/gboards/gergo/keymaps/germ/rules.mk
index badfe7bb99..0fd941bb53 100644
--- a/keyboards/gergo/keymaps/germ/rules.mk
+++ b/keyboards/gboards/gergo/keymaps/germ/rules.mk
@@ -28,6 +28,7 @@ endif
 ifeq ($(strip $(BALLER)), yes)
     OPT_DEFS += -DBALLER
 	POINTING_DEVICE_ENABLE = yes
+    POINTING_DEVICE_DRIVER = custom
 endif
 ifeq ($(strip $(DEBUG_BALLER)), yes)
     OPT_DEFS += -DDEBUG_BALLER
diff --git a/keyboards/gergo/keymaps/gotham/config.h b/keyboards/gboards/gergo/keymaps/gotham/config.h
similarity index 100%
rename from keyboards/gergo/keymaps/gotham/config.h
rename to keyboards/gboards/gergo/keymaps/gotham/config.h
diff --git a/keyboards/gergo/keymaps/gotham/keymap.c b/keyboards/gboards/gergo/keymaps/gotham/keymap.c
similarity index 100%
rename from keyboards/gergo/keymaps/gotham/keymap.c
rename to keyboards/gboards/gergo/keymaps/gotham/keymap.c
diff --git a/keyboards/gergo/keymaps/gotham/readme.md b/keyboards/gboards/gergo/keymaps/gotham/readme.md
similarity index 100%
rename from keyboards/gergo/keymaps/gotham/readme.md
rename to keyboards/gboards/gergo/keymaps/gotham/readme.md
diff --git a/keyboards/gergo/keymaps/gotham/rules.mk b/keyboards/gboards/gergo/keymaps/gotham/rules.mk
similarity index 96%
rename from keyboards/gergo/keymaps/gotham/rules.mk
rename to keyboards/gboards/gergo/keymaps/gotham/rules.mk
index 351c525583..bc2b3cf43b 100644
--- a/keyboards/gergo/keymaps/gotham/rules.mk
+++ b/keyboards/gboards/gergo/keymaps/gotham/rules.mk
@@ -27,6 +27,7 @@ ifneq ($(strip $(SCROLLSTEP)),)
 endif
 ifeq ($(strip $(BALLER)), yes)
 	POINTING_DEVICE_ENABLE	= yes
+    POINTING_DEVICE_DRIVER = custom
     OPT_DEFS += -DBALLER
 endif
 ifeq ($(strip $(DEBUG_BALLER)), yes)
diff --git a/keyboards/gergo/keymaps/manna-harbour_miryoku/config.h b/keyboards/gboards/gergo/keymaps/manna-harbour_miryoku/config.h
similarity index 100%
rename from keyboards/gergo/keymaps/manna-harbour_miryoku/config.h
rename to keyboards/gboards/gergo/keymaps/manna-harbour_miryoku/config.h
diff --git a/keyboards/gergo/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/gboards/gergo/keymaps/manna-harbour_miryoku/keymap.c
similarity index 100%
rename from keyboards/gergo/keymaps/manna-harbour_miryoku/keymap.c
rename to keyboards/gboards/gergo/keymaps/manna-harbour_miryoku/keymap.c
diff --git a/keyboards/gboards/gergo/keymaps/oled/config.h b/keyboards/gboards/gergo/keymaps/oled/config.h
new file mode 100644
index 0000000000..af960a1eed
--- /dev/null
+++ b/keyboards/gboards/gergo/keymaps/oled/config.h
@@ -0,0 +1,4 @@
+#pragma once
+
+#define IGNORE_MOD_TAP_INTERRUPT
+#define OLED_FONT_H "keyboards/gboards/gergo/keymaps/oled/glcdfont.c"
diff --git a/keyboards/gergo/keymaps/oled/glcdfont.c b/keyboards/gboards/gergo/keymaps/oled/glcdfont.c
similarity index 100%
rename from keyboards/gergo/keymaps/oled/glcdfont.c
rename to keyboards/gboards/gergo/keymaps/oled/glcdfont.c
diff --git a/keyboards/gergo/keymaps/oled/keymap.c b/keyboards/gboards/gergo/keymaps/oled/keymap.c
similarity index 100%
rename from keyboards/gergo/keymaps/oled/keymap.c
rename to keyboards/gboards/gergo/keymaps/oled/keymap.c
diff --git a/keyboards/gergo/keymaps/default/readme.md b/keyboards/gboards/gergo/keymaps/oled/readme.md
similarity index 90%
rename from keyboards/gergo/keymaps/default/readme.md
rename to keyboards/gboards/gergo/keymaps/oled/readme.md
index 471a20fbdf..8e49b2f5b0 100644
--- a/keyboards/gergo/keymaps/default/readme.md
+++ b/keyboards/gboards/gergo/keymaps/oled/readme.md
@@ -5,6 +5,6 @@
 This is the default keymap for Gergo, it's based heavily off of the naps62 ErgoDox layout and is aimed at a programmer friendly keymap.
 
 ## Settings
-To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gergo/keymaps/default/rules.mk
+To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gboards/gergo/keymaps/default/rules.mk
 
 Ideally you should copy this directory and make your changes there. If you come up with a good layout submit a PR!
diff --git a/keyboards/gergo/keymaps/oled/rules.mk b/keyboards/gboards/gergo/keymaps/oled/rules.mk
similarity index 96%
rename from keyboards/gergo/keymaps/oled/rules.mk
rename to keyboards/gboards/gergo/keymaps/oled/rules.mk
index 6318088988..7880416719 100644
--- a/keyboards/gergo/keymaps/oled/rules.mk
+++ b/keyboards/gboards/gergo/keymaps/oled/rules.mk
@@ -29,6 +29,7 @@ ifneq ($(strip $(SCROLLSTEP)),)
 endif
 ifeq ($(strip $(BALLER)), yes)
 	POINTING_DEVICE_ENABLE	= yes
+    POINTING_DEVICE_DRIVER = custom
     OPT_DEFS += -DBALLER
 endif
 ifeq ($(strip $(DEBUG_BALLER)), yes)
diff --git a/keyboards/gergo/matrix.c b/keyboards/gboards/gergo/matrix.c
similarity index 100%
rename from keyboards/gergo/matrix.c
rename to keyboards/gboards/gergo/matrix.c
diff --git a/keyboards/gergo/readme.md b/keyboards/gboards/gergo/readme.md
similarity index 77%
rename from keyboards/gergo/readme.md
rename to keyboards/gboards/gergo/readme.md
index 3436090b27..b2558e6715 100644
--- a/keyboards/gergo/readme.md
+++ b/keyboards/gboards/gergo/readme.md
@@ -13,13 +13,13 @@ Hardware Availability: [gboards.ca](http://gboards.ca)
 ## Firmware building
 After cloning the QMK repo and installing dfu-programmer build and flash with. Be sure to reset your keyboard!
 
-    make gergo:germ:dfu
+    make gboards/gergo:germ:dfu
 
 To just test your build with the default keymap
    
-    make gergo:germ
+    make gboards/gergo:germ
 
-Gadgets and options can be enabled/disabled in keyboards/gergo/keymaps/default/rules.mk . Copy the default directory and make any changes to your layout, if you think they're worth sharing submit a PR!
+Gadgets and options can be enabled/disabled in keyboards/gboards/gergo/keymaps/default/rules.mk . Copy the default directory and make any changes to your layout, if you think they're worth sharing submit a PR!
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
diff --git a/keyboards/gergo/rules.mk b/keyboards/gboards/gergo/rules.mk
similarity index 100%
rename from keyboards/gergo/rules.mk
rename to keyboards/gboards/gergo/rules.mk
diff --git a/keyboards/gboards/readme.md b/keyboards/gboards/readme.md
index 743bacbcc1..384b568d89 100644
--- a/keyboards/gboards/readme.md
+++ b/keyboards/gboards/readme.md
@@ -22,11 +22,11 @@ multi-chords! You can browse the available combo lists in combos/
 
 ## Engine
 This is the onboard chording engine for all sorts of fun shenanigans. Be aware that this currently is a bit of a QMK 
-replacement focused on pure chording. Take a look at the configuration in keyboards/ginny for ideas, all these dicts
+replacement focused on pure chording. Take a look at the configuration in keyboards/gboards/ginny for ideas, all these dicts
 are stored over in dicts/
 
 ## Installation
-You will need to add the following bits to your rules.mk, refer to keyboards/ginny for a working example
+You will need to add the following bits to your rules.mk, refer to keyboards/gboards/ginny for a working example
 `VPATH               +=  keyboards/gboards/`
 
 And if you're using the chording engine, this as well.
@@ -35,5 +35,5 @@ And if you're using the chording engine, this as well.
 For combos, add `#include "g/keymap_combos.h"` to keymap.c to compile your combos.def into your keymap
 
 For the chording engine, add `#include "g/keymap_engine.h"` to keymap.c compile your dicts.def into your keymap. If you
-don't have a config_engine.h file for your keyboard, you will need to create it. (Once again, look at keyboards/ginny/
+don't have a config_engine.h file for your keyboard, you will need to create it. (Once again, look at keyboards/gboards/ginny/
 for a example of how to do this.
diff --git a/keyboards/gergo/keymaps/oled/config.h b/keyboards/gergo/keymaps/oled/config.h
deleted file mode 100644
index b186080681..0000000000
--- a/keyboards/gergo/keymaps/oled/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#define IGNORE_MOD_TAP_INTERRUPT
-#define OLED_FONT_H "keyboards/gergo/keymaps/oled/glcdfont.c"
diff --git a/keyboards/gl516/a52gl/a52gl.c b/keyboards/gl516/a52gl/a52gl.c
new file mode 100644
index 0000000000..67c27d2d7d
--- /dev/null
+++ b/keyboards/gl516/a52gl/a52gl.c
@@ -0,0 +1,18 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+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 "a52gl.h"
diff --git a/keyboards/gl516/a52gl/a52gl.h b/keyboards/gl516/a52gl/a52gl.h
new file mode 100644
index 0000000000..6ff00c541f
--- /dev/null
+++ b/keyboards/gl516/a52gl/a52gl.h
@@ -0,0 +1,37 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+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 LAYOUT( \
+    L00, L01, L02, L03, L04, L05,    L06, R00, R01, R02, R03, R04, R05, R06, \
+    L10, L11, L12, L13, L14, L15,    L16, R10, R11, R12, R13, R14, R15,      \
+    L20, L21, L22, L23, L24, L25,    L26, R20, R21, R22, R23, R24, R25, R26, \
+    L30, L31, L32,   L34,    L35,      L36,    R31,      R33, R34, R35, R36  \
+  ) \
+  { \
+    {   L00,   L01,   L02,   L03,   L04,   L05,   L06 }, \
+    {   L10,   L11,   L12,   L13,   L14,   L15,   L16 }, \
+    {   L20,   L21,   L22,   L23,   L24,   L25,   L26 }, \
+    {   L30,   L31,   L32, KC_NO,   L34,   L35,   L36 }, \
+    {   R00,   R01,   R02,   R03,   R04,   R05,   R06 }, \
+    {   R10,   R11,   R12,   R13,   R14,   R15, KC_NO }, \
+    {   R20,   R21,   R22,   R23,   R24,   R25,   R26 }, \
+    { KC_NO,   R31, KC_NO,   R33,   R34,   R35,   R36 }  \
+  }
diff --git a/keyboards/gl516/a52gl/config.h b/keyboards/gl516/a52gl/config.h
new file mode 100644
index 0000000000..c9f54e0928
--- /dev/null
+++ b/keyboards/gl516/a52gl/config.h
@@ -0,0 +1,44 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+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"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x04D8
+#define PRODUCT_ID      0xE8D1
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Salicylic_Acid
+#define PRODUCT         a52gl
+
+/* key matrix size */
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 7
+
+// wiring of each half
+#define MATRIX_ROW_PINS { D1, D0, D4, C6 }
+#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
+#define UNUSED_PINS
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/gl516/a52gl/info.json b/keyboards/gl516/a52gl/info.json
new file mode 100644
index 0000000000..b2332c0eda
--- /dev/null
+++ b/keyboards/gl516/a52gl/info.json
@@ -0,0 +1,63 @@
+{
+    "keyboard_name": "a52gl", 
+    "url": "https://salicylic-acid3.hatenablog.com/", 
+    "maintainer": "Salicylic_acid3", 
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1, "y":0},
+                {"label":"0,2", "x":2.25, "y":0},
+                {"label":"0,3", "x":3.25, "y":0},
+                {"label":"0,4", "x":4.25, "y":0},
+                {"label":"0,5", "x":5.25, "y":0},
+                {"label":"0,6", "x":7.75, "y":0},
+                {"label":"4,0", "x":8.75, "y":0},
+                {"label":"4,1", "x":9.75, "y":0},
+                {"label":"4,2", "x":10.75, "y":0},
+                {"label":"4,3", "x":12, "y":0},
+                {"label":"4,4", "x":13, "y":0},
+                {"label":"4,5", "x":14, "y":0},
+                {"label":"4,6", "x":15, "y":0, "w":1.5},
+                {"label":"1,0", "x":0, "y":1, "w":1.25},
+                {"label":"1,1", "x":1.25, "y":1},
+                {"label":"1,2", "x":2.52, "y":1},
+                {"label":"1,3", "x":3.52, "y":1},
+                {"label":"1,4", "x":4.52, "y":1},
+                {"label":"1,5", "x":5.52, "y":1},
+                {"label":"1,6", "x":8, "y":1},
+                {"label":"5,0", "x":9, "y":1},
+                {"label":"5,1", "x":10, "y":1},
+                {"label":"5,2", "x":11, "y":1},
+                {"label":"5,3", "x":12.25, "y":1},
+                {"label":"5,4", "x":13.25, "y":1},
+                {"label":"5,5", "x":14.25, "y":1, "w":2.25},
+                {"label":"2,0", "x":0, "y":2, "w":1.75},
+                {"label":"2,1", "x":1.75, "y":2},
+                {"label":"2,2", "x":3.05, "y":2},
+                {"label":"2,3", "x":4.05, "y":2},
+                {"label":"2,4", "x":5.05, "y":2},
+                {"label":"2,5", "x":6.05, "y":2},
+                {"label":"2,6", "x":7.5, "y":2},
+                {"label":"6,0", "x":8.5, "y":2},
+                {"label":"6,1", "x":9.5, "y":2},
+                {"label":"6,2", "x":10.5, "y":2},
+                {"label":"6,3", "x":12, "y":2},
+                {"label":"6,4", "x":13, "y":2},
+                {"label":"6,5", "x":14.25, "y":2.25},
+                {"label":"6,6", "x":15.5, "y":2},
+                {"label":"3,0", "x":0, "y":3, "w":1.25},
+                {"label":"3,1", "x":1.25, "y":3, "w":1.25},
+                {"label":"3,2", "x":3.05, "y":3},
+                {"label":"3,4", "x":4.05, "y":3, "w":2},
+                {"label":"3,5", "x":6.05, "y":3},
+                {"label":"3,6", "x":7.5, "y":3, "w":2.25},
+                {"label":"7,1", "x":9.75, "y":3, "w":1.25},
+                {"label":"7,3", "x":12.0, "y":3},
+                {"label":"7,4", "x":13.25, "y":3.25},
+                {"label":"7,5", "x":14.25, "y":3.25},
+                {"label":"7,6", "x":15.25, "y":3.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gl516/a52gl/keymaps/default/keymap.c b/keyboards/gl516/a52gl/keymaps/default/keymap.c
new file mode 100644
index 0000000000..adcf71879d
--- /dev/null
+++ b/keyboards/gl516/a52gl/keymaps/default/keymap.c
@@ -0,0 +1,52 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+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
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layer_number {
+  _QWERTY = 0,
+  _FN,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_QWERTY] = LAYOUT(
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+       KC_ESC,    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_BSPC,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+LT(_FN,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_B,KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,   KC_UP, KC_RSFT,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+     KC_LCTL, KC_LGUI, KC_LALT,       KC_SPC,      KC_SPC,         KC_SPC,       KC_LALT,KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+  //|-----------------------------------------------------|   |--------------------------------------------------------------'
+  ),
+  [_FN] = LAYOUT(
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+        RESET,   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_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0, _______, _______, 
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______,_______,_______,_______,_______,_______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______,     _______,      _______,         _______,      _______, _______, _______, _______, _______
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+  )
+};
+
diff --git a/keyboards/gl516/a52gl/keymaps/salicylic/config.h b/keyboards/gl516/a52gl/keymaps/salicylic/config.h
new file mode 100644
index 0000000000..fd96baa819
--- /dev/null
+++ b/keyboards/gl516/a52gl/keymaps/salicylic/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2021 Salicylic_acid3
+ *
+ * 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
+
+/* Select hand configuration */
+
+#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 180
diff --git a/keyboards/gl516/a52gl/keymaps/salicylic/keymap.c b/keyboards/gl516/a52gl/keymaps/salicylic/keymap.c
new file mode 100644
index 0000000000..4607d1dc50
--- /dev/null
+++ b/keyboards/gl516/a52gl/keymaps/salicylic/keymap.c
@@ -0,0 +1,65 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+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 "keymap_jp.h"
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layer_number {
+  _QWERTY = 0,
+  _LOWER,
+  _RAISE,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_QWERTY] = LAYOUT(
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+       KC_ESC,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, JP_LBRC, JP_RBRC, KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+     KC_LCTL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_BSLS,  KC_ENT,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_B,KC_N,    KC_M, KC_COMM,  KC_DOT, JP_SLSH,   KC_UP, KC_RSFT,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+  JP_ZKHK,KC_LALT,LGUI_T(JP_MHEN),LT(_LOWER,KC_ENT),KC_BSPC,LT(_RAISE,KC_SPC),ALT_T(JP_HENK),KC_APP,KC_LEFT, KC_DOWN, KC_RGHT
+  //|-----------------------------------------------------|   |--------------------------------------------------------------'
+  ),
+  [_LOWER] = LAYOUT(
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+       KC_ESC, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD,        KC_6,    KC_7,    KC_8,    KC_9, JP_ASTR, JP_SLSH, XXXXXXX, KC_DEL,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      JP_QUOT, JP_HASH,  JP_DQT, JP_LPRN, JP_RPRN,   JP_AT,     XXXXXXX,    KC_4,    KC_5,    KC_6, JP_MINS,  JP_EQL, _______, 
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE,KC_LSFT,KC_0,    KC_1,    KC_2,    KC_3, JP_PLUS, _______, _______,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, JP_MHEN,   MO(_LOWER),     _______,       MO(_RAISE),      JP_DOT, _______, _______, _______, _______
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+  ),
+  [_RAISE] = LAYOUT(
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+       KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6, XXXXXXX,   KC_UP, XXXXXXX, KC_PGUP,LALT(KC_PSCR),KC_PSCR, KC_DEL,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+LCTL_T(KC_F11),  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,     XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, _______, 
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,KC_LSFT,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, KC_PGDN, _______, _______,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, JP_MHEN,     _______,       KC_DEL,         _______,      JP_HENK, _______, _______, _______, _______
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+  )
+};
+
diff --git a/keyboards/gl516/a52gl/keymaps/via/keymap.c b/keyboards/gl516/a52gl/keymaps/via/keymap.c
new file mode 100644
index 0000000000..77386f8a25
--- /dev/null
+++ b/keyboards/gl516/a52gl/keymaps/via/keymap.c
@@ -0,0 +1,65 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+       KC_ESC,    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_BSPC,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+LT(1,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_B,KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,   KC_UP, KC_RSFT,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+     KC_LCTL, KC_LGUI, KC_LALT,       KC_SPC,      KC_SPC,         KC_SPC,       KC_LALT,KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+  //|-----------------------------------------------------|   |--------------------------------------------------------------'
+  ),
+  [1] = LAYOUT(
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+        RESET,   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_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0, _______, _______, 
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______,_______,_______,_______,_______,_______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______,     _______,      _______,         _______,      _______, _______, _______, _______, _______
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+  ),
+  [2] = LAYOUT(
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+      _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, 
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______,_______,_______,_______,_______,_______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______,     _______,      _______,         _______,      _______, _______, _______, _______, _______
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+  ),
+  [3] = LAYOUT(
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+      _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, 
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______,_______,_______,_______,_______,_______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______,     _______,      _______,         _______,      _______, _______, _______, _______, _______
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+  )
+};
diff --git a/keyboards/pistachio/keymaps/via/rules.mk b/keyboards/gl516/a52gl/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/pistachio/keymaps/via/rules.mk
rename to keyboards/gl516/a52gl/keymaps/via/rules.mk
diff --git a/keyboards/gl516/a52gl/matrix.c b/keyboards/gl516/a52gl/matrix.c
new file mode 100644
index 0000000000..1a97fdfd61
--- /dev/null
+++ b/keyboards/gl516/a52gl/matrix.c
@@ -0,0 +1,158 @@
+/*
+Copyright 2012-2018 Jun Wako, Jack Humbert, Yiancar
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "matrix.h"
+#include "quantum.h"
+
+static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+
+static void select_row(uint8_t row)
+{
+    setPinOutput(row_pins[row]);
+    writePinLow(row_pins[row]);
+}
+
+static void unselect_row(uint8_t row)
+{
+    setPinInputHigh(row_pins[row]);
+}
+
+static void unselect_rows(void)
+{
+    for(uint8_t x = 0; x < MATRIX_ROWS; x++) {
+        setPinInputHigh(row_pins[x]);
+    }
+}
+
+static void select_col(uint8_t col)
+{
+    setPinOutput(col_pins[col]);
+    writePinLow(col_pins[col]);
+}
+
+static void unselect_col(uint8_t col)
+{
+    setPinInputHigh(col_pins[col]);
+}
+
+static void unselect_cols(void)
+{
+    for(uint8_t x = 0; x < MATRIX_COLS; x++) {
+        setPinInputHigh(col_pins[x]);
+    }
+}
+
+static void init_pins(void) {
+  unselect_rows();
+  unselect_cols();
+  for (uint8_t x = 0; x < MATRIX_COLS; x++) {
+    setPinInputHigh(col_pins[x]);
+  }
+  for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
+    setPinInputHigh(row_pins[x]);
+  }
+}
+
+static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
+{
+    // Store last value of row prior to reading
+    matrix_row_t last_row_value = current_matrix[current_row];
+
+    // Clear data in matrix row
+    current_matrix[current_row] = 0;
+
+    // Select row and wait for row selecton to stabilize
+    select_row(current_row);
+    matrix_io_delay();
+
+    // For each col...
+    for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
+
+        // Select the col pin to read (active low)
+        uint8_t pin_state = readPin(col_pins[col_index]);
+
+        // Populate the matrix row with the state of the col pin
+        current_matrix[current_row] |=  pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
+    }
+
+    // Unselect row
+    unselect_row(current_row);
+
+    return (last_row_value != current_matrix[current_row]);
+}
+
+static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
+{
+    bool matrix_changed = false;
+
+    // Select col and wait for col selecton to stabilize
+    select_col(current_col);
+    matrix_io_delay();
+
+    // For each row...
+    for(uint8_t row_index = 0; row_index < MATRIX_ROWS/2; row_index++)
+    {
+        uint8_t tmp = row_index + MATRIX_ROWS/2;
+        // Store last value of row prior to reading
+        matrix_row_t last_row_value = current_matrix[tmp];
+
+        // Check row pin state
+        if (readPin(row_pins[row_index]) == 0)
+        {
+            // Pin LO, set col bit
+            current_matrix[tmp] |= (MATRIX_ROW_SHIFTER << current_col);
+        }
+        else
+        {
+            // Pin HI, clear col bit
+            current_matrix[tmp] &= ~(MATRIX_ROW_SHIFTER << current_col);
+        }
+
+        // Determine if the matrix changed state
+        if ((last_row_value != current_matrix[tmp]) && !(matrix_changed))
+        {
+            matrix_changed = true;
+        }
+    }
+
+    // Unselect col
+    unselect_col(current_col);
+
+    return matrix_changed;
+}
+
+void matrix_init_custom(void) {
+    // initialize key pins
+    init_pins();
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[])
+{
+  bool changed = false;
+
+  // Set row, read cols
+  for (uint8_t current_row = 0; current_row < MATRIX_ROWS / 2; current_row++) {
+    changed |= read_cols_on_row(current_matrix, current_row);
+  }
+  //else
+  // Set col, read rows
+  for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
+    changed |= read_rows_on_col(current_matrix, current_col);
+  }
+  
+  return changed;
+}
diff --git a/keyboards/gl516/a52gl/readme.md b/keyboards/gl516/a52gl/readme.md
new file mode 100644
index 0000000000..cfc7277eef
--- /dev/null
+++ b/keyboards/gl516/a52gl/readme.md
@@ -0,0 +1,26 @@
+# a52gl
+
+![a52gl](https://cdn-ak.f.st-hatena.com/images/fotolife/S/Salicylic_acid3/20210911/20210911005227.jpg)
+
+This is 52 keys Alice style keyboard.
+Use the GL516 case.
+
+* Keyboard Maintainer: [Salicylic_acid3](https://github.com/Salicylic-acid3)
+* Hardware Supported: a52gl PCB, Pro Micro
+* Hardware Availability: [PCB & Case Data](https://github.com/Salicylic-acid3/GL516_Exemple), [yushakobo Shop](https://shop.yushakobo.jp/products/3342)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make gl516/a52gl:default
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+[Build guide](https://salicylic-acid3.hatenablog.com/entry/a52gl-j73gl-build-guide)
diff --git a/data/templates/ps2avrgb/rules.mk b/keyboards/gl516/a52gl/rules.mk
similarity index 73%
rename from data/templates/ps2avrgb/rules.mk
rename to keyboards/gl516/a52gl/rules.mk
index 1bbfa8fa0e..37fe9349c6 100644
--- a/data/templates/ps2avrgb/rules.mk
+++ b/keyboards/gl516/a52gl/rules.mk
@@ -1,8 +1,8 @@
 # MCU name
-MCU = atmega32a
+MCU = atmega32u4
 
 # Bootloader selection
-BOOTLOADER = bootloadhid
+BOOTLOADER = caterina
 
 # Build Options
 #   change yes to no to disable
@@ -12,6 +12,11 @@ MOUSEKEY_ENABLE = yes       # Mouse keys
 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            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-WS2812_DRIVER = i2c
+AUDIO_ENABLE = no           # Audio output
+
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c
\ No newline at end of file
diff --git a/keyboards/gl516/j73gl/config.h b/keyboards/gl516/j73gl/config.h
new file mode 100644
index 0000000000..50d745ebb1
--- /dev/null
+++ b/keyboards/gl516/j73gl/config.h
@@ -0,0 +1,63 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+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"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x04D8
+#define PRODUCT_ID      0xE8D0
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Salicylic_Acid
+#define PRODUCT         j73gl
+
+/* key matrix size */
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 8
+
+// wiring of each half
+#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7 }
+#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, E6 }
+#define UNUSED_PINS
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* ws2812 RGB LED */
+#define RGB_DI_PIN D3
+
+#ifndef RGBLED_NUM
+  #define RGBLED_NUM 73
+#endif
+
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
diff --git a/keyboards/gl516/j73gl/info.json b/keyboards/gl516/j73gl/info.json
new file mode 100644
index 0000000000..32b771c983
--- /dev/null
+++ b/keyboards/gl516/j73gl/info.json
@@ -0,0 +1,84 @@
+{
+    "keyboard_name": "j73gl", 
+    "url": "https://salicylic-acid3.hatenablog.com/", 
+    "maintainer": "Salicylic_acid3", 
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1, "y":0},
+                {"label":"0,2", "x":2, "y":0},
+                {"label":"0,3", "x":3, "y":0},
+                {"label":"0,4", "x":4, "y":0},
+                {"label":"0,5", "x":5, "y":0},
+                {"label":"0,6", "x":6, "y":0},
+                {"label":"5,0", "x":7, "y":0},
+                {"label":"5,1", "x":8, "y":0},
+                {"label":"5,2", "x":9, "y":0},
+                {"label":"5,3", "x":10, "y":0},
+                {"label":"5,4", "x":11, "y":0},
+                {"label":"5,5", "x":12, "y":0},
+                {"label":"5,6", "x":13, "y":0},
+                {"label":"6,6", "x":14, "y":0},
+                {"label":"5,7", "x":15, "y":0},
+                {"label":"1,0", "x":0, "y":1, "w":1.5},
+                {"label":"1,1", "x":1.5, "y":1},
+                {"label":"1,2", "x":2.5, "y":1},
+                {"label":"1,3", "x":3.5, "y":1},
+                {"label":"1,4", "x":4.5, "y":1},
+                {"label":"1,5", "x":5.5, "y":1},
+                {"label":"1,6", "x":6.5, "y":1},
+                {"label":"6,0", "x":7.5, "y":1},
+                {"label":"6,1", "x":8.5, "y":1},
+                {"label":"6,2", "x":9.5, "y":1},
+                {"label":"6,3", "x":10.5, "y":1},
+                {"label":"6,4", "x":11.5, "y":1},
+                {"label":"6,5", "x":12.5, "y":1},
+                {"label":"6,7", "x":15, "y":1},
+                {"label":"2,0", "x":0, "y":2, "w":1.75},
+                {"label":"2,1", "x":1.75, "y":2},
+                {"label":"2,2", "x":2.75, "y":2},
+                {"label":"2,3", "x":3.75, "y":2},
+                {"label":"2,4", "x":4.75, "y":2},
+                {"label":"2,5", "x":5.75, "y":2},
+                {"label":"2,6", "x":6.75, "y":2},
+                {"label":"7,0", "x":7.75, "y":2},
+                {"label":"7,1", "x":8.75, "y":2},
+                {"label":"7,2", "x":9.75, "y":2},
+                {"label":"7,3", "x":10.75, "y":2},
+                {"label":"7,4", "x":11.75, "y":2},
+                {"label":"7,5", "x":12.75, "y":2},
+                {"label":"7,6", "x":13.75, "y":1, "w":1.25, "h":2},
+                {"label":"7,7", "x":15, "y":2},
+                {"label":"3,0", "x":0, "y":3, "w":2.25},
+                {"label":"3,1", "x":2.25, "y":3},
+                {"label":"3,2", "x":3.25, "y":3},
+                {"label":"3,3", "x":4.25, "y":3},
+                {"label":"3,4", "x":5.25, "y":3},
+                {"label":"3,5", "x":6.25, "y":3},
+                {"label":"3,6", "x":7.25, "y":3},
+                {"label":"8,0", "x":8.25, "y":3},
+                {"label":"8,1", "x":9.25, "y":3},
+                {"label":"8,2", "x":10.25, "y":3},
+                {"label":"8,3", "x":11.25, "y":3},
+                {"label":"8,5", "x":12.25, "y":3, "w":1.75},
+                {"label":"8,6", "x":14, "y":3},
+                {"label":"8,7", "x":15, "y":3},
+                {"label":"4,0", "x":0, "y":4, "w":1.25},
+                {"label":"4,1", "x":1.25, "y":4},
+                {"label":"4,2", "x":2.25, "y":4, "w":1.25},
+                {"label":"4,3", "x":3.5, "y":4},
+                {"label":"4,4", "x":4.5, "y":4, "w":1.25},
+                {"label":"4,5", "x":5.75, "y":4},
+                {"label":"4,6", "x":6.75, "y":4},
+                {"label":"9,0", "x":7.75, "y":4, "w":1.25},
+                {"label":"9,1", "x":9, "y":4},
+                {"label":"9,2", "x":10, "y":4, "w":1.25},
+                {"label":"9,3", "x":11.25, "y":4, "w":1.25},
+                {"label":"9,5", "x":13, "y":4},
+                {"label":"9,6", "x":14, "y":4},
+                {"label":"9,7", "x":15, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gl516/j73gl/j73gl.c b/keyboards/gl516/j73gl/j73gl.c
new file mode 100644
index 0000000000..483b005844
--- /dev/null
+++ b/keyboards/gl516/j73gl/j73gl.c
@@ -0,0 +1,55 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+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 "j73gl.h"
+
+#ifdef RGB_MATRIX_ENABLE
+    led_config_t g_led_config = { {
+    // Key Matrix to LED Index
+        { 67,66,60,59,50,49,40,39 },
+        {  68,65,61,58,51,46,48,41 },
+        {   69,64,62,57,52,45,47,42 },
+        {     70,63,56,53,46,43,36,33 },
+        {  71, 72, 55, 54, 45,44,35,34 },
+        { 30,29,20,19,10, 9, 8, 0 },
+        {  38,31,28,21,18,11,   1 },
+        {   37,32,27,22,17,12,7,2 },
+        {     26,23,16,  13,  6,3 },
+        {      25, 24, 15, 14,5,4 }
+    }, {
+    // LED Index to Physical Position
+        { 224,   0 }, { 224,  16 }, { 224,  32 }, { 224,  48 }, { 224,  64 },{ 209,  64 }, { 209,  48 }, { 206,  24 }, { 209,   0 }, { 194,   0 },
+        { 179,   0 }, { 188,  16 }, { 191,  32 }, { 189,  48 }, { 194,  64 },{ 171,  64 }, { 169,  48 }, { 176,  32 }, { 173,  16 }, { 165,   0 },
+        { 150,   0 }, { 156,  16 }, { 161,  32 }, { 154,  48 }, { 152,  64 },{ 135,  64 }, { 139,  48 }, { 146,  32 }, { 143,  16 }, { 135,   0 },
+        { 120,   0 }, { 128,  16 }, { 131,  32 }, { 124,  48 }, { 118,  64 },{ 101,  64 }, { 109,  48 }, { 116,  32 }, { 113,  16 }, { 105,   0 },
+        {  90,   0 }, {  98,  16 }, { 101,  32 }, {  94,  48 }, {  86,  64 },{  69,  64 }, {  79,  48 }, {  86,  32 }, {  83,  16 }, {  75,   0 },
+        {  60,   0 }, {  68,  16 }, {  71,  32 }, {  64,  48 }, {  53,  64 },{  36,  64 }, {  49,  48 }, {  56,  32 }, {  53,  16 }, {  45,   0 },
+        {  30,   0 }, {  38,  16 }, {  41,  32 }, {  34,  48 }, {  26,  32 },{  23,  16 }, {  15,  48 }, {   0,   0 }, {  11,  16 }, {  13,  32 },
+        {  17,  48 }, {  2,   64 }, {  19,  64 }
+    }, {
+    // LED Index to Flag
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4
+} };
+#endif
+
diff --git a/keyboards/gl516/j73gl/j73gl.h b/keyboards/gl516/j73gl/j73gl.h
new file mode 100644
index 0000000000..ad4821461a
--- /dev/null
+++ b/keyboards/gl516/j73gl/j73gl.h
@@ -0,0 +1,40 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+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 LAYOUT( \
+    L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R16, R07, \
+    L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15,           R17, \
+    L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25,    R26,   R27, \
+    L30,      L31, L32, L33, L34, L35, L36, R30, R31, R32, R33,      R35, R36, R37, \
+    L40,  L41,  L42, L43,  L44, L45,  L46, R40, R41, R42,  R43,      R45, R46, R47  \
+  ) \
+  { \
+    { L00,   L01,   L02,   L03,   L04,   L05,   L06, KC_NO }, \
+    { L10,   L11,   L12,   L13,   L14,   L15,   L16, KC_NO }, \
+    { L20,   L21,   L22,   L23,   L24,   L25,   L26, KC_NO }, \
+    { L30,   L31,   L32,   L33,   L34,   L35,   L36, KC_NO }, \
+    { L40,   L41,   L42,   L43,   L44,   L45,   L46, KC_NO }, \
+    { R00,   R01,   R02,   R03,   R04,   R05,   R06,   R07 }, \
+    { R10,   R11,   R12,   R13,   R14,   R15,   R16,   R17 }, \
+    { R20,   R21,   R22,   R23,   R24,   R25,   R26,   R27 }, \
+    { R30,   R31,   R32,   R33, KC_NO,   R35,   R36,   R37 }, \
+    { R40,   R41,   R42,   R43, KC_NO,   R45,   R46,   R47 }  \
+  }
diff --git a/keyboards/gl516/j73gl/keymaps/default/keymap.c b/keyboards/gl516/j73gl/keymaps/default/keymap.c
new file mode 100644
index 0000000000..846df7d2b7
--- /dev/null
+++ b/keyboards/gl516/j73gl/keymaps/default/keymap.c
@@ -0,0 +1,57 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+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 "keymap_jp.h"
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layer_number {
+  _QWERTY = 0,
+  _FN,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_QWERTY] = LAYOUT(
+  //,-----------------------------------------------------+--------------------------------------------------------------------------------.
+       KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS, JP_CIRC,  JP_YEN, KC_BSPC, KC_HOME,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,   JP_AT, JP_LBRC,           KC_END,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+LT(_FN,JP_ZKHK),  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, JP_SCLN, JP_COLN, JP_RBRC,  KC_ENT, KC_PGUP,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  RSFT_T(JP_BSLS),   KC_UP, KC_PGDN,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN,  KC_SPC,  KC_SPC,  KC_SPC,  KC_SPC, JP_HENK, JP_KANA,  KC_APP,          KC_LEFT, KC_DOWN, KC_RGHT
+  //|-----------------------------------------------------+--------------------------------------------------------------------------------'
+  ),
+  [_FN] = LAYOUT(
+  //,-----------------------------------------------------+--------------------------------------------------------------------------------.
+        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, _______,  KC_DEL, KC_PSCR,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           KC_INS,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______, _______, _______, _______,          _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______ 
+  //|-----------------------------------------------------+--------------------------------------------------------------------------------'
+  )
+};
+
diff --git a/keyboards/gl516/j73gl/keymaps/via/keymap.c b/keyboards/gl516/j73gl/keymaps/via/keymap.c
new file mode 100644
index 0000000000..3e8fba928d
--- /dev/null
+++ b/keyboards/gl516/j73gl/keymaps/via/keymap.c
@@ -0,0 +1,74 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+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 "keymap_jp.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+  //,-----------------------------------------------------+--------------------------------------------------------------------------------.
+       KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS, JP_CIRC,  JP_YEN, KC_BSPC, KC_HOME,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,   JP_AT, JP_LBRC,           KC_END,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+LT(1,JP_ZKHK),    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, JP_SCLN, JP_COLN, JP_RBRC,  KC_ENT, KC_PGUP,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  RSFT_T(JP_BSLS),   KC_UP, KC_PGDN,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN,  KC_SPC,  KC_SPC,  KC_SPC,  KC_SPC, JP_HENK, JP_KANA,  KC_APP,          KC_LEFT, KC_DOWN, KC_RGHT
+  //|-----------------------------------------------------+--------------------------------------------------------------------------------'
+  ),
+  [1] = LAYOUT(
+  //,-----------------------------------------------------+--------------------------------------------------------------------------------.
+        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, _______,  KC_DEL, KC_PSCR,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           KC_INS,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______, _______, _______, _______,          _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______ 
+  //|-----------------------------------------------------+--------------------------------------------------------------------------------'
+  ),
+  [2] = LAYOUT(
+  //,-----------------------------------------------------+--------------------------------------------------------------------------------.
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______ 
+  //|-----------------------------------------------------+--------------------------------------------------------------------------------'
+  ),
+  [3] = LAYOUT(
+  //,-----------------------------------------------------+--------------------------------------------------------------------------------.
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______ 
+  //|-----------------------------------------------------+--------------------------------------------------------------------------------'
+  )
+};
diff --git a/keyboards/pistachio_mp/keymaps/via/rules.mk b/keyboards/gl516/j73gl/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/pistachio_mp/keymaps/via/rules.mk
rename to keyboards/gl516/j73gl/keymaps/via/rules.mk
diff --git a/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h
new file mode 100644
index 0000000000..d2e1d20893
--- /dev/null
+++ b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h
@@ -0,0 +1,43 @@
+/* Copyright 2018 Salicylic_acid3
+ *
+ * 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
+
+/* Select hand configuration */
+
+#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 180
+
+#ifdef RGBLED_NUM
+  #undef RGBLED_NUM
+#endif
+
+#define DRIVER_LED_TOTAL 73
+
+#ifdef RGB_MATRIX_ENABLE
+#    define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
+// #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
+// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+// #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
+// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
+// #   define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150  // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
+#    define RGB_MATRIX_HUE_STEP 8
+#    define RGB_MATRIX_SAT_STEP 8
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
+#    define RGB_MATRIX_VAL_STEP 5
+#    define RGB_MATRIX_SPD_STEP 10
+#endif
diff --git a/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/keymap.c b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/keymap.c
new file mode 100644
index 0000000000..3e8fba928d
--- /dev/null
+++ b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/keymap.c
@@ -0,0 +1,74 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+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 "keymap_jp.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+  //,-----------------------------------------------------+--------------------------------------------------------------------------------.
+       KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS, JP_CIRC,  JP_YEN, KC_BSPC, KC_HOME,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,   JP_AT, JP_LBRC,           KC_END,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+LT(1,JP_ZKHK),    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, JP_SCLN, JP_COLN, JP_RBRC,  KC_ENT, KC_PGUP,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  RSFT_T(JP_BSLS),   KC_UP, KC_PGDN,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN,  KC_SPC,  KC_SPC,  KC_SPC,  KC_SPC, JP_HENK, JP_KANA,  KC_APP,          KC_LEFT, KC_DOWN, KC_RGHT
+  //|-----------------------------------------------------+--------------------------------------------------------------------------------'
+  ),
+  [1] = LAYOUT(
+  //,-----------------------------------------------------+--------------------------------------------------------------------------------.
+        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, _______,  KC_DEL, KC_PSCR,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           KC_INS,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______, _______, _______, _______,          _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______ 
+  //|-----------------------------------------------------+--------------------------------------------------------------------------------'
+  ),
+  [2] = LAYOUT(
+  //,-----------------------------------------------------+--------------------------------------------------------------------------------.
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______ 
+  //|-----------------------------------------------------+--------------------------------------------------------------------------------'
+  ),
+  [3] = LAYOUT(
+  //,-----------------------------------------------------+--------------------------------------------------------------------------------.
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______ 
+  //|-----------------------------------------------------+--------------------------------------------------------------------------------'
+  )
+};
diff --git a/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/rules.mk b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/rules.mk
new file mode 100644
index 0000000000..294015d80b
--- /dev/null
+++ b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/rules.mk
@@ -0,0 +1,7 @@
+RGBLIGHT_ENABLE = no
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+SPACE_CADET_ENABLE = no
+MAGIC_ENABLE = no
diff --git a/keyboards/gl516/j73gl/matrix.c b/keyboards/gl516/j73gl/matrix.c
new file mode 100644
index 0000000000..1a97fdfd61
--- /dev/null
+++ b/keyboards/gl516/j73gl/matrix.c
@@ -0,0 +1,158 @@
+/*
+Copyright 2012-2018 Jun Wako, Jack Humbert, Yiancar
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "matrix.h"
+#include "quantum.h"
+
+static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+
+static void select_row(uint8_t row)
+{
+    setPinOutput(row_pins[row]);
+    writePinLow(row_pins[row]);
+}
+
+static void unselect_row(uint8_t row)
+{
+    setPinInputHigh(row_pins[row]);
+}
+
+static void unselect_rows(void)
+{
+    for(uint8_t x = 0; x < MATRIX_ROWS; x++) {
+        setPinInputHigh(row_pins[x]);
+    }
+}
+
+static void select_col(uint8_t col)
+{
+    setPinOutput(col_pins[col]);
+    writePinLow(col_pins[col]);
+}
+
+static void unselect_col(uint8_t col)
+{
+    setPinInputHigh(col_pins[col]);
+}
+
+static void unselect_cols(void)
+{
+    for(uint8_t x = 0; x < MATRIX_COLS; x++) {
+        setPinInputHigh(col_pins[x]);
+    }
+}
+
+static void init_pins(void) {
+  unselect_rows();
+  unselect_cols();
+  for (uint8_t x = 0; x < MATRIX_COLS; x++) {
+    setPinInputHigh(col_pins[x]);
+  }
+  for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
+    setPinInputHigh(row_pins[x]);
+  }
+}
+
+static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
+{
+    // Store last value of row prior to reading
+    matrix_row_t last_row_value = current_matrix[current_row];
+
+    // Clear data in matrix row
+    current_matrix[current_row] = 0;
+
+    // Select row and wait for row selecton to stabilize
+    select_row(current_row);
+    matrix_io_delay();
+
+    // For each col...
+    for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
+
+        // Select the col pin to read (active low)
+        uint8_t pin_state = readPin(col_pins[col_index]);
+
+        // Populate the matrix row with the state of the col pin
+        current_matrix[current_row] |=  pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
+    }
+
+    // Unselect row
+    unselect_row(current_row);
+
+    return (last_row_value != current_matrix[current_row]);
+}
+
+static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
+{
+    bool matrix_changed = false;
+
+    // Select col and wait for col selecton to stabilize
+    select_col(current_col);
+    matrix_io_delay();
+
+    // For each row...
+    for(uint8_t row_index = 0; row_index < MATRIX_ROWS/2; row_index++)
+    {
+        uint8_t tmp = row_index + MATRIX_ROWS/2;
+        // Store last value of row prior to reading
+        matrix_row_t last_row_value = current_matrix[tmp];
+
+        // Check row pin state
+        if (readPin(row_pins[row_index]) == 0)
+        {
+            // Pin LO, set col bit
+            current_matrix[tmp] |= (MATRIX_ROW_SHIFTER << current_col);
+        }
+        else
+        {
+            // Pin HI, clear col bit
+            current_matrix[tmp] &= ~(MATRIX_ROW_SHIFTER << current_col);
+        }
+
+        // Determine if the matrix changed state
+        if ((last_row_value != current_matrix[tmp]) && !(matrix_changed))
+        {
+            matrix_changed = true;
+        }
+    }
+
+    // Unselect col
+    unselect_col(current_col);
+
+    return matrix_changed;
+}
+
+void matrix_init_custom(void) {
+    // initialize key pins
+    init_pins();
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[])
+{
+  bool changed = false;
+
+  // Set row, read cols
+  for (uint8_t current_row = 0; current_row < MATRIX_ROWS / 2; current_row++) {
+    changed |= read_cols_on_row(current_matrix, current_row);
+  }
+  //else
+  // Set col, read rows
+  for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
+    changed |= read_rows_on_col(current_matrix, current_col);
+  }
+  
+  return changed;
+}
diff --git a/data/templates/ps2avrgb/readme.md b/keyboards/gl516/j73gl/readme.md
similarity index 52%
rename from data/templates/ps2avrgb/readme.md
rename to keyboards/gl516/j73gl/readme.md
index a2ac4495b6..b6f1ebdc24 100644
--- a/data/templates/ps2avrgb/readme.md
+++ b/keyboards/gl516/j73gl/readme.md
@@ -1,28 +1,27 @@
-# %(KEYBOARD)s
+# j73gl
 
-![%(KEYBOARD)s](imgur.com image replace me!)
+![j73gl](https://cdn-ak.f.st-hatena.com/images/fotolife/S/Salicylic_acid3/20210911/20210911015520.png)
 
-*A short description of the keyboard/project*
+This is 73 keys Japanese style keyboard.
+Use the GL516 case.
 
-* Keyboard Maintainer: [%(YOUR_NAME)s](https://github.com/yourusername)
-* Hardware Supported: *The PCBs, controllers supported*
-* Hardware Availability: *Links to where you can find this hardware*
+* Keyboard Maintainer: [Salicylic_acid3](https://github.com/Salicylic-acid3)
+* Hardware Supported: j73gl PCB, Pro Micro
+* Hardware Availability: [PCB & Case Data](https://github.com/Salicylic-acid3/GL516_Exemple), [yushakobo Shop](https://shop.yushakobo.jp/products/3342)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make %(KEYBOARD)s:default
-
-Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
-
-    make %(KEYBOARD)s:default:flash
-
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+    make gl516/j73gl:default
 
 ## Bootloader
 
 Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
-* **BootloadHID reset**: Hold down the key connected to the `A0` and `B0` pins on the MCU if it is known (often top left or bottom left) and plug in the keyboard
 * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
 * **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+[Build guide](https://salicylic-acid3.hatenablog.com/entry/a52gl-j73gl-build-guide)
+
diff --git a/keyboards/gl516/j73gl/rules.mk b/keyboards/gl516/j73gl/rules.mk
new file mode 100644
index 0000000000..a7521a0e40
--- /dev/null
+++ b/keyboards/gl516/j73gl/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+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            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c
\ No newline at end of file
diff --git a/keyboards/gl516/n51gl/config.h b/keyboards/gl516/n51gl/config.h
new file mode 100644
index 0000000000..ea50fcfa1a
--- /dev/null
+++ b/keyboards/gl516/n51gl/config.h
@@ -0,0 +1,67 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+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"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x04D8
+#define PRODUCT_ID      0xE8CF
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Salicylic_Acid
+#define PRODUCT         n51gl
+
+/* key matrix size */
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 7
+
+// wiring of each half
+#define MATRIX_ROW_PINS { D1, D0, D4, C6 }
+#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
+#define UNUSED_PINS
+
+#define ENCODERS_PAD_A { D7 }
+#define ENCODERS_PAD_B { E6 }
+#define ENCODER_RESOLUTION 3
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* ws2812 RGB LED */
+#define RGB_DI_PIN D3
+
+#ifndef RGBLED_NUM
+  #define RGBLED_NUM 15
+#endif
+
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
diff --git a/keyboards/gl516/n51gl/info.json b/keyboards/gl516/n51gl/info.json
new file mode 100644
index 0000000000..6c94d32e30
--- /dev/null
+++ b/keyboards/gl516/n51gl/info.json
@@ -0,0 +1,66 @@
+{
+    "keyboard_name": "n51gl", 
+    "url": "https://salicylic-acid3.hatenablog.com/", 
+    "maintainer": "Salicylic_acid3", 
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"L00", "x":0.25, "y":0},
+                {"label":"L01", "x":1.25, "y":0},
+                {"label":"L02", "x":2.25, "y":0},
+                {"label":"L03", "x":3.25, "y":0},
+                {"label":"L04", "x":4.25, "y":0},
+                {"label":"L05", "x":5.25, "y":0},
+                {"label":"L06", "x":6.25, "y":0},
+                {"label":"R00", "x":9.25, "y":0},
+                {"label":"R01", "x":10.25, "y":0},
+                {"label":"R02", "x":11.25, "y":0},
+                {"label":"R03", "x":12.25, "y":0},
+                {"label":"R04", "x":13.25, "y":0},
+                {"label":"R05", "x":14.25, "y":0},
+                {"label":"R06", "x":15.25, "y":0},
+
+                {"label":"L11", "x":0.25, "y":1, "w":1.75},
+                {"label":"L12", "x":2, "y":1},
+                {"label":"L13", "x":3.25, "y":1},
+                {"label":"L14", "x":4.25, "y":1},
+                {"label":"L15", "x":5.25, "y":1},
+                {"label":"L16", "x":6.25, "y":1},
+                {"label":"R10", "x":9.25, "y":1},
+                {"label":"R11", "x":10.25, "y":1},
+                {"label":"R12", "x":11.25, "y":1},
+                {"label":"R13", "x":12.25, "y":1},
+                {"label":"R14", "x":13.5, "y":1},
+                {"label":"R15", "x":14.5, "y":1},
+                {"label":"R16", "x":15.5, "y":1},
+
+                {"label":"L21", "x":0, "y":2, "w":1.75},
+                {"label":"L22", "x":1.75, "y":2},
+                {"label":"L23", "x":3.25, "y":2},
+                {"label":"L24", "x":4.25, "y":2},
+                {"label":"L25", "x":5.25, "y":2},
+                {"label":"L26", "x":6.25, "y":2},
+                {"label":"L20", "x":7.75, "y":2},
+                {"label":"R20", "x":9.25, "y":2},
+                {"label":"R21", "x":10.25, "y":2},
+                {"label":"R22", "x":11.25, "y":2},
+                {"label":"R23", "x":12.25, "y":2},
+                {"label":"R24", "x":13.75, "y":2},
+                {"label":"R25", "x":14.75, "y":2},
+                {"label":"R26", "x":15.75, "y":2},
+
+                {"label":"L31", "x":0.25, "y":3, "w":1.25},
+                {"label":"L32", "x":1.5, "y":3, "w":1.25},
+                {"label":"L34", "x":4.125, "y":3, "w":1.25},
+                {"label":"L35", "x":5.375, "y":3, "w":1.25},
+                {"label":"L36", "x":6.625, "y":3},
+                {"label":"R30", "x":8.875, "y":3},
+                {"label":"R31", "x":9.875, "y":3, "w":1.25},
+                {"label":"R32", "x":11.125, "y":3, "w":1.25},
+                {"label":"R34", "x":13.75, "y":3},
+                {"label":"R35", "x":14.75, "y":3},
+                {"label":"R36", "x":15.75, "y":3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gl516/n51gl/keymaps/default/keymap.c b/keyboards/gl516/n51gl/keymaps/default/keymap.c
new file mode 100644
index 0000000000..469626d851
--- /dev/null
+++ b/keyboards/gl516/n51gl/keymaps/default/keymap.c
@@ -0,0 +1,60 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+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
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layer_number {
+  _QWERTY = 0,
+  _FN,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_QWERTY] = LAYOUT(
+  //,--------------------------------------------------------------|        |--------------------------------------------------------------.
+       KC_ESC,  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_BSPC,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+       LT(_FN,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_MUTE,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,   KC_UP, KC_RSFT,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+              KC_LCTL, KC_LGUI,          KC_LALT,  KC_SPC,  KC_SPC,           KC_SPC,  KC_SPC, KC_LALT,          KC_LEFT, KC_DOWN, KC_RGHT
+  //|--------------------------------------------------------------|        |--------------------------------------------------------------'
+  ),
+  [_FN] = LAYOUT(
+  //,--------------------------------------------------------------|        |--------------------------------------------------------------.
+      _______,   RESET,   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_1,    KC_2,    KC_3,    KC_4,    KC_5,             KC_6,    KC_7,    KC_8,    KC_9,    KC_0, _______, _______, 
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               _______, _______,         _______, _______, _______,          _______, _______, _______,          _______, _______, _______
+  //|--------------------------------------------------------------|        |--------------------------------------------------------------'
+  )
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (clockwise) {
+        tap_code16(KC_VOLD);
+    } else {
+        tap_code16(KC_VOLU);
+    }
+    return true;
+}
diff --git a/keyboards/gl516/n51gl/keymaps/salicylic/config.h b/keyboards/gl516/n51gl/keymaps/salicylic/config.h
new file mode 100644
index 0000000000..fd96baa819
--- /dev/null
+++ b/keyboards/gl516/n51gl/keymaps/salicylic/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2021 Salicylic_acid3
+ *
+ * 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
+
+/* Select hand configuration */
+
+#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 180
diff --git a/keyboards/gl516/n51gl/keymaps/salicylic/keymap.c b/keyboards/gl516/n51gl/keymaps/salicylic/keymap.c
new file mode 100644
index 0000000000..819ac94e37
--- /dev/null
+++ b/keyboards/gl516/n51gl/keymaps/salicylic/keymap.c
@@ -0,0 +1,117 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+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 "keymap_jp.h"
+
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layer_number {
+  _QWERTY = 0,
+  _LOWER,
+  _RAISE,
+  _ADJUST,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_QWERTY] = LAYOUT_rotary_layer(
+  //,--------------------------------------------------------------|        |--------------------------------------------------------------.
+       KC_ESC,  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_BSPC,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+              KC_LCTL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G, KC_VOLU,    KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_BSLS,  KC_ENT,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B, KC_MUTE,    KC_N,    KC_M, KC_COMM,  KC_DOT, JP_SLSH,   KC_UP, KC_RSFT,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+         JP_ZKHK, KC_LALT,LGUI_T(JP_MHEN),LT(_LOWER,KC_ENT),KC_BSPC, KC_VOLD, KC_DEL,LT(_RAISE,KC_SPC),ALT_T(JP_HENK),KC_LEFT, KC_DOWN, KC_RGHT
+  //|--------------------------------------------------------------|        |--------------------------------------------------------------'
+  ),
+  [_LOWER] = LAYOUT_rotary_layer(
+  //,--------------------------------------------------------------|        |--------------------------------------------------------------.
+      _______, _______, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD,             KC_6,    KC_7,    KC_8,    KC_9, JP_ASTR, JP_SLSH, KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               JP_QUOT, JP_HASH,  JP_DQT, JP_LPRN, JP_RPRN,   JP_AT, KC_WH_U, XXXXXXX,    KC_4,    KC_5,    KC_6, JP_MINS,  JP_EQL, _______,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE, KC_BTN3,    KC_0,    KC_1,    KC_2,    KC_3, JP_PLUS, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               _______, _______,       JP_MHEN, MO(_LOWER), _______, KC_WH_D, _______, MO(_RAISE), JP_DOT,        _______, _______, _______
+  //|--------------------------------------------------------------|        |--------------------------------------------------------------'
+  ),
+
+  [_RAISE] = LAYOUT_rotary_layer(
+  //,--------------------------------------------------------------|        |--------------------------------------------------------------.
+      _______, _______,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,             KC_6, XXXXXXX,   KC_UP, XXXXXXX, KC_PGUP,LALT(KC_PSCR),KC_PSCR,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+        LCTL_T(KC_F11),   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5, KC_WH_L, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, _______,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               KC_LSFT,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               _______, _______,          _______, _______, _______, KC_WH_R, _______, _______, JP_HENK,          _______, _______, _______
+  //|--------------------------------------------------------------|        |--------------------------------------------------------------'
+  ),
+
+  [_ADJUST] = LAYOUT_rotary_layer(
+  //,--------------------------------------------------------------|        |--------------------------------------------------------------.
+        RESET,  KC_TAB, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,LALT(KC_PSCR),KC_PSCR,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+              KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_TOG, RGB_MOD, RGB_SAD, RGB_SAI, XXXXXXX, XXXXXXX, _______,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+         SFT_T(KC_F12), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, XXXXXXX, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               _______, _______,          _______, _______, _______,RGB_RMOD, _______, _______, _______,          _______, _______, _______
+  //|--------------------------------------------------------------|        |--------------------------------------------------------------'
+  )
+};
+
+//A description for expressing the layer position in LED mode.
+layer_state_t layer_state_set_user(layer_state_t state) {
+  state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
+#ifdef RGBLIGHT_ENABLE
+    switch (get_highest_layer(state)) {
+    case _LOWER:
+      rgblight_sethsv_at(HSV_BLUE, 0);
+      break;
+    case _RAISE:
+      rgblight_sethsv_at(HSV_RED, 0);
+      break;
+    case _ADJUST:
+      rgblight_sethsv_at(HSV_PURPLE, 0);
+      break;
+    default: //  for any other layers, or the default layer
+      rgblight_sethsv_at( 0, 0, 0, 0);
+      break;
+    }
+    rgblight_set_effect_range( 1, 14);
+#endif
+return state;
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    keypos_t key;
+    if (clockwise) {
+        key.row = 3;
+        key.col = 0;
+    } else {
+        key.row = 1;
+        key.col = 0;
+    }
+    action_exec((keyevent_t){.key = key, .pressed = true, .time = (timer_read() | 1)});
+    action_exec((keyevent_t){.key = key, .pressed = false, .time = (timer_read() | 1)});
+    return true;
+}
diff --git a/keyboards/gl516/n51gl/keymaps/via/config.h b/keyboards/gl516/n51gl/keymaps/via/config.h
new file mode 100644
index 0000000000..fd96baa819
--- /dev/null
+++ b/keyboards/gl516/n51gl/keymaps/via/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2021 Salicylic_acid3
+ *
+ * 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
+
+/* Select hand configuration */
+
+#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 180
diff --git a/keyboards/gl516/n51gl/keymaps/via/keymap.c b/keyboards/gl516/n51gl/keymaps/via/keymap.c
new file mode 100644
index 0000000000..3ad85edcba
--- /dev/null
+++ b/keyboards/gl516/n51gl/keymaps/via/keymap.c
@@ -0,0 +1,102 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_rotary_layer(
+  //,--------------------------------------------------------------|        |--------------------------------------------------------------.
+       KC_ESC,  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_BSPC,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+         LT(1,KC_CAPS),    KC_A,    KC_S,    KC_D,    KC_F,    KC_G, KC_VOLU,    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_MUTE,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,   KC_UP, KC_RSFT,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+              KC_LCTL, KC_LGUI,          KC_LALT,  KC_SPC,  KC_SPC, KC_VOLD,  KC_SPC,  KC_SPC, KC_LALT,          KC_LEFT, KC_DOWN, KC_RGHT
+  //|--------------------------------------------------------------|        |--------------------------------------------------------------'
+  ),
+  [1] = LAYOUT_rotary_layer(
+  //,--------------------------------------------------------------|        |--------------------------------------------------------------.
+      _______,   RESET,   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_1,    KC_2,    KC_3,    KC_4,    KC_5, _______,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, _______, _______, 
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               _______, _______,          _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______
+  //|--------------------------------------------------------------|        |--------------------------------------------------------------'
+  ),
+  [2] = LAYOUT_rotary_layer(
+  //,--------------------------------------------------------------|        |--------------------------------------------------------------.
+      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
+  //|--------------------------------------------------------------|        |--------------------------------------------------------------'
+  ),
+  [3] = LAYOUT_rotary_layer(
+  //,--------------------------------------------------------------|        |--------------------------------------------------------------.
+      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
+  //|--------------------------------------------------------------|        |--------------------------------------------------------------'
+  )
+};
+
+//A description for expressing the layer position in LED mode.
+layer_state_t layer_state_set_user(layer_state_t state) {
+  state = update_tri_layer_state(state, 2, 1, 3);
+#ifdef RGBLIGHT_ENABLE
+    switch (get_highest_layer(state)) {
+    case 1:
+      rgblight_sethsv_at(HSV_BLUE, 0);
+      break;
+    case 2:
+      rgblight_sethsv_at(HSV_RED, 0);
+      break;
+    case 3:
+      rgblight_sethsv_at(HSV_PURPLE, 0);
+      break;
+    default: //  for any other layers, or the default layer
+      rgblight_sethsv_at( 0, 0, 0, 0);
+      break;
+    }
+    rgblight_set_effect_range( 1, 14);
+#endif
+return state;
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    keypos_t key;
+    if (clockwise) {
+        key.row = 3;
+        key.col = 0;
+    } else {
+        key.row = 1;
+        key.col = 0;
+    }
+    action_exec((keyevent_t){.key = key, .pressed = true, .time = (timer_read() | 1)});
+    action_exec((keyevent_t){.key = key, .pressed = false, .time = (timer_read() | 1)});
+    return true;
+}
diff --git a/keyboards/gl516/n51gl/keymaps/via/rules.mk b/keyboards/gl516/n51gl/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/gl516/n51gl/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/gl516/n51gl/matrix.c b/keyboards/gl516/n51gl/matrix.c
new file mode 100644
index 0000000000..1a97fdfd61
--- /dev/null
+++ b/keyboards/gl516/n51gl/matrix.c
@@ -0,0 +1,158 @@
+/*
+Copyright 2012-2018 Jun Wako, Jack Humbert, Yiancar
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "matrix.h"
+#include "quantum.h"
+
+static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+
+static void select_row(uint8_t row)
+{
+    setPinOutput(row_pins[row]);
+    writePinLow(row_pins[row]);
+}
+
+static void unselect_row(uint8_t row)
+{
+    setPinInputHigh(row_pins[row]);
+}
+
+static void unselect_rows(void)
+{
+    for(uint8_t x = 0; x < MATRIX_ROWS; x++) {
+        setPinInputHigh(row_pins[x]);
+    }
+}
+
+static void select_col(uint8_t col)
+{
+    setPinOutput(col_pins[col]);
+    writePinLow(col_pins[col]);
+}
+
+static void unselect_col(uint8_t col)
+{
+    setPinInputHigh(col_pins[col]);
+}
+
+static void unselect_cols(void)
+{
+    for(uint8_t x = 0; x < MATRIX_COLS; x++) {
+        setPinInputHigh(col_pins[x]);
+    }
+}
+
+static void init_pins(void) {
+  unselect_rows();
+  unselect_cols();
+  for (uint8_t x = 0; x < MATRIX_COLS; x++) {
+    setPinInputHigh(col_pins[x]);
+  }
+  for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
+    setPinInputHigh(row_pins[x]);
+  }
+}
+
+static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
+{
+    // Store last value of row prior to reading
+    matrix_row_t last_row_value = current_matrix[current_row];
+
+    // Clear data in matrix row
+    current_matrix[current_row] = 0;
+
+    // Select row and wait for row selecton to stabilize
+    select_row(current_row);
+    matrix_io_delay();
+
+    // For each col...
+    for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
+
+        // Select the col pin to read (active low)
+        uint8_t pin_state = readPin(col_pins[col_index]);
+
+        // Populate the matrix row with the state of the col pin
+        current_matrix[current_row] |=  pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
+    }
+
+    // Unselect row
+    unselect_row(current_row);
+
+    return (last_row_value != current_matrix[current_row]);
+}
+
+static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
+{
+    bool matrix_changed = false;
+
+    // Select col and wait for col selecton to stabilize
+    select_col(current_col);
+    matrix_io_delay();
+
+    // For each row...
+    for(uint8_t row_index = 0; row_index < MATRIX_ROWS/2; row_index++)
+    {
+        uint8_t tmp = row_index + MATRIX_ROWS/2;
+        // Store last value of row prior to reading
+        matrix_row_t last_row_value = current_matrix[tmp];
+
+        // Check row pin state
+        if (readPin(row_pins[row_index]) == 0)
+        {
+            // Pin LO, set col bit
+            current_matrix[tmp] |= (MATRIX_ROW_SHIFTER << current_col);
+        }
+        else
+        {
+            // Pin HI, clear col bit
+            current_matrix[tmp] &= ~(MATRIX_ROW_SHIFTER << current_col);
+        }
+
+        // Determine if the matrix changed state
+        if ((last_row_value != current_matrix[tmp]) && !(matrix_changed))
+        {
+            matrix_changed = true;
+        }
+    }
+
+    // Unselect col
+    unselect_col(current_col);
+
+    return matrix_changed;
+}
+
+void matrix_init_custom(void) {
+    // initialize key pins
+    init_pins();
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[])
+{
+  bool changed = false;
+
+  // Set row, read cols
+  for (uint8_t current_row = 0; current_row < MATRIX_ROWS / 2; current_row++) {
+    changed |= read_cols_on_row(current_matrix, current_row);
+  }
+  //else
+  // Set col, read rows
+  for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
+    changed |= read_rows_on_col(current_matrix, current_col);
+  }
+  
+  return changed;
+}
diff --git a/keyboards/gl516/n51gl/n51gl.c b/keyboards/gl516/n51gl/n51gl.c
new file mode 100644
index 0000000000..f13d0cd78e
--- /dev/null
+++ b/keyboards/gl516/n51gl/n51gl.c
@@ -0,0 +1,18 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+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 "n51gl.h"
diff --git a/keyboards/gl516/n51gl/n51gl.h b/keyboards/gl516/n51gl/n51gl.h
new file mode 100644
index 0000000000..6429b78fd0
--- /dev/null
+++ b/keyboards/gl516/n51gl/n51gl.h
@@ -0,0 +1,54 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+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 LAYOUT( \
+    L00, L01, L02, L03, L04, L05, L06,      R00, R01, R02, R03, R04, R05, R06, \
+         L11, L12, L13, L14, L15, L16,      R10, R11, R12, R13, R14, R15, R16, \
+         L21, L22, L23, L24, L25, L26, L20, R20, R21, R22, R23, R24, R25, R26, \
+         L31, L32,      L34, L35, L36,      R30, R31, R32,      R34, R35, R36  \
+  ) \
+  { \
+    {   L00,   L01,   L02,   L03,   L04,   L05,   L06 }, \
+    { KC_NO,   L11,   L12,   L13,   L14,   L15,   L16 }, \
+    {   L20,   L21,   L22,   L23,   L24,   L25,   L26 }, \
+    { KC_NO,   L31,   L32, KC_NO,   L34,   L35,   L36 }, \
+    {   R00,   R01,   R02,   R03,   R04,   R05,   R06 }, \
+    {   R10,   R11,   R12,   R13,   R14,   R15,   R16 }, \
+    {   R20,   R21,   R22,   R23,   R24,   R25,   R26 }, \
+    {   R30,   R31,   R32, KC_NO,   R34,   R35,   R36 }  \
+  }
+
+#define LAYOUT_rotary_layer( \
+    L00, L01, L02, L03, L04, L05, L06,      R00, R01, R02, R03, R04, R05, R06, \
+         L11, L12, L13, L14, L15, L16, L10, R10, R11, R12, R13, R14, R15, R16, \
+         L21, L22, L23, L24, L25, L26, L20, R20, R21, R22, R23, R24, R25, R26, \
+         L31, L32,      L34, L35, L36, L30, R30, R31, R32,      R34, R35, R36  \
+  ) \
+  { \
+    {   L00,   L01,   L02,   L03,   L04,   L05,   L06 }, \
+    {   L10,   L11,   L12,   L13,   L14,   L15,   L16 }, \
+    {   L20,   L21,   L22,   L23,   L24,   L25,   L26 }, \
+    {   L30,   L31,   L32, KC_NO,   L34,   L35,   L36 }, \
+    {   R00,   R01,   R02,   R03,   R04,   R05,   R06 }, \
+    {   R10,   R11,   R12,   R13,   R14,   R15,   R16 }, \
+    {   R20,   R21,   R22,   R23,   R24,   R25,   R26 }, \
+    {   R30,   R31,   R32, KC_NO,   R34,   R35,   R36 }  \
+  }
diff --git a/keyboards/gl516/n51gl/readme.md b/keyboards/gl516/n51gl/readme.md
new file mode 100644
index 0000000000..916b8ff671
--- /dev/null
+++ b/keyboards/gl516/n51gl/readme.md
@@ -0,0 +1,27 @@
+# n51gl
+
+![n51gl](https://cdn-ak.f.st-hatena.com/images/fotolife/S/Salicylic_acid3/20210911/20210911015705.png)
+
+This is 51 keys Custom keyboard.
+Use the GL516 case.
+
+* Keyboard Maintainer: [Salicylic_acid3](https://github.com/Salicylic-acid3)
+* Hardware Supported: nknl7 PCB, Pro Micro
+* Hardware Availability: [PCB & Case Data](https://github.com/Salicylic-acid3/GL516_Exemple)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make gl516/n51gl:default
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+[Build guide](https://salicylic-acid3.hatenablog.com/entry/a52gl-j73gl-build-guide)
+
diff --git a/keyboards/gl516/n51gl/rules.mk b/keyboards/gl516/n51gl/rules.mk
new file mode 100644
index 0000000000..6279bfb0e0
--- /dev/null
+++ b/keyboards/gl516/n51gl/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+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            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c
\ No newline at end of file
diff --git a/keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/config.h b/keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/config.h
new file mode 100644
index 0000000000..74c018f7f1
--- /dev/null
+++ b/keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2021 Lalit Maganti
+
+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 RGB_DISABLE_WHEN_USB_SUSPENDED
\ No newline at end of file
diff --git a/keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/keymap.c b/keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/keymap.c
new file mode 100644
index 0000000000..7bedf05987
--- /dev/null
+++ b/keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/keymap.c
@@ -0,0 +1,91 @@
+/* Copyright 2021 Lalit Maganti
+
+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
+
+#ifdef PROGRAMMABLE_BUTTON_ENABLE
+#define L1_NUM1 PROGRAMMABLE_BUTTON_1
+#define L1_NUM2 PROGRAMMABLE_BUTTON_2
+#define L1_NUM3 PROGRAMMABLE_BUTTON_3
+#define L1_NUM4 PROGRAMMABLE_BUTTON_4
+#define L1_NUM5 PROGRAMMABLE_BUTTON_5
+#define L1_NUM6 PROGRAMMABLE_BUTTON_6
+#define L1_NUM7 PROGRAMMABLE_BUTTON_7
+#define L1_NUM8 PROGRAMMABLE_BUTTON_8
+#define L1_NUM9 PROGRAMMABLE_BUTTON_9
+#else
+#define L1_NUM1 _______
+#define L1_NUM2 _______
+#define L1_NUM3 _______
+#define L1_NUM4 _______
+#define L1_NUM5 _______
+#define L1_NUM6 _______
+#define L1_NUM7 _______
+#define L1_NUM8 _______
+#define L1_NUM9 _______
+#endif
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,           KC_MUTE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_HOME,
+        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_END,
+        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_PGUP,
+        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_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT(
+        _______, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24, RGB_TOG,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,            _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
+    ),
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (clockwise) {
+      tap_code_delay(KC_VOLU, 10);
+    } else {
+      tap_code_delay(KC_VOLD, 10);
+    }
+    return false;
+}
+
+
+#ifdef RGB_MATRIX_ENABLE
+
+static void set_rgb_side_leds(void);
+
+static void set_rgb_side_leds() {
+    rgb_matrix_set_color(67, RGB_WHITE); // Left side LED 1
+    rgb_matrix_set_color(68, RGB_WHITE); // Right side LED 1
+    rgb_matrix_set_color(91, RGB_WHITE); // Left side LED 8
+    rgb_matrix_set_color(92, RGB_WHITE); // Right side LED 8
+}
+
+void rgb_matrix_indicators_user() {
+    rgb_matrix_set_color_all(0x0, 0x0, 0x0);
+    if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
+        rgb_matrix_set_color(3, RGB_WHITE); // CAPS
+    }
+    set_rgb_side_leds();
+}
+
+#endif
\ No newline at end of file
diff --git a/keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/rules.mk b/keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/rules.mk
new file mode 100644
index 0000000000..0a5b666e85
--- /dev/null
+++ b/keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/rules.mk
@@ -0,0 +1 @@
+MOUSEKEY_ENABLE = no
diff --git a/keyboards/handwired/aball/config.h b/keyboards/handwired/aball/config.h
index 12f13fb4a8..33a6cd2a97 100644
--- a/keyboards/handwired/aball/config.h
+++ b/keyboards/handwired/aball/config.h
@@ -33,3 +33,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIRECT_PINS {{NO_PIN}}
 
 #define ADNS9800_CS_PIN F7
+#define POINTING_DEVICE_INVERT_X
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/rules.mk b/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/rules.mk
index 6d2e27cb41..5ad63b02b7 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/rules.mk
@@ -1,3 +1,3 @@
 KEY_LOCK_ENABLE = yes
 CONSOLE_ENABLE = no
-EXTRAFLAGS += -flto
+LTO_ENABLE = yes
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/config.h
new file mode 100644
index 0000000000..4eca68c542
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/config.h
@@ -0,0 +1,11 @@
+// Copyright 2022 Ulrich Spörlein (@uqs)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define USE_SERIAL
+
+#define RGBLED_NUM 12
+#define RGBLED_SPLIT {6,6}
+#define RGBLIGHT_LIMIT_VAL 127
+
+#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c
new file mode 100644
index 0000000000..211cd91e12
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c
@@ -0,0 +1,170 @@
+// Copyright 2022 Ulrich Spörlein (@uqs)
+// SPDX-License-Identifier: GPL-2.0-or-later
+// vi:et sw=4 cc=5,15,25,35,45,55,65:
+
+#include "uqs.h"
+
+/*
+ * My custom layout macro that allows for easy diff(1) operations between
+ * various keyboards. It probably doesn't make sense to you.
+ */
+#define LAYOUT_uqs(               \
+    L00, L01, L02, L03, L04, L05, \
+    L10, L11, L12, L13, L14, L15, \
+    L20, L21, L22, L23, L24, L25, \
+    L30, L31, L32, L33, L34, L35, \
+              L42, L43,           \
+         L44, L45, L54,           \
+         L55, L52, L53,           \
+    R00, R01, R02, R03, R04, R05, \
+    R10, R11, R12, R13, R14, R15, \
+    R20, R21, R22, R23, R24, R25, \
+    R30, R31, R32, R33, R34, R35, \
+              R42, R43,           \
+         R51, R40, R41,           \
+         R50, R52, R53            \
+)                                 \
+LAYOUT_5x6(                       \
+  L00, L01, L02, L03, L04, L05,                          R00, R01, R02, R03, R04, R05, \
+  L10, L11, L12, L13, L14, L15,                          R10, R11, R12, R13, R14, R15, \
+  L20, L21, L22, L23, L24, L25,                          R20, R21, R22, R23, R24, R25, \
+  L30, L31, L32, L33, L34, L35,                          R30, R31, R32, R33, R34, R35, \
+            L42, L43,                                              R42, R43,           \
+                      L44, L45,                          R40, R41,                     \
+                                L54, L55,      R50, R51,                               \
+                                L52, L53,      R52, R53                                \
+)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [L_QWER] = LAYOUT_uqs(
+     KC_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,
+     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,
+     KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,
+     KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,
+                         KC_LBRC,  KC_RBRC,
+     /*thumb*/ LT_EXTD_ESC, KC_SPC, LT_MOUSE_ALT_SHIFT_INS,
+      /*aux*/  KC_LEAD,  OSM_GUI,  KC_LALT,
+     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINUS,
+     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,  RSFT_T(KC_GRV),
+                         KC_MINS,  KC_EQL,
+     /*thumb*/ LT_FUNC_SHIFT_INS, KC_ENT, LT_NUM_BSPC,
+      /*aux*/  KC_RALT,  KC_APP,   KC_LEAD
+  ),
+
+  [L_WASD] = LAYOUT_uqs(
+     KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,
+     KC_T,     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,
+     KC_G,     KC_LSFT,  KC_A,     KC_S,     KC_D,     KC_F,
+     KC_B,     KC_GRV,   KC_Z,     KC_X,     KC_C,     KC_V,
+                         KC_LBRC,  KC_RBRC,
+     /*thumb*/ KC_LCTL,  KC_SPC,   KC_R,
+      /*aux*/  A(KC_M),  KC_LGUI,  KC_LALT,
+     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_BSPC,
+     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,  RSFT_T(KC_GRV),
+                         KC_MINS,  KC_EQL,
+     /*thumb*/ DF(L_COLM), KC_ENT, KC_BSPC,
+      /*aux*/  KC_F5,    KC_RALT,  KC_APP
+  ),
+
+  [L_COLM] = LAYOUT_uqs(
+     KC_NO,    KC_NO,    KC_BTN2,  KC_BTN3,  KC_BTN1,  KC_NO,
+     KC_BTN2,  KC_Q,     KC_W,     KC_F,     KC_P,     KC_B,
+     KC_BTN1,  KC_G_A,   KC_A_R,   KC_S_S,   KC_C_T,   KC_G,
+     KC_BTN3,  KC_Z,     KC_X,     KC_C,     KC_D,     KC_V,
+                         MS_WHUP,  MS_WHDN,
+     /*thumb*/ LT_EXTD_ESC, SFT_T(KC_SPC), LT(L_MOUSE, KC_TAB),
+      /*aux*/  KC_LEAD,  OSM_GUI,  KC_LALT,
+     KC_NO,    KC_BTN1,  KC_BTN2,  KC_BTN3,  KC_NO,    KC_NO,
+     KC_J,     KC_L,     KC_U,     KC_Y,     KC_QUOT,  KC_NO,
+     KC_M,     KC_C_N,   KC_S_E,   KC_A_I,   KC_G_O,   KC_NO,
+     KC_K,     KC_H,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_NO,
+                         KC_NO,    KC_NO,
+     /*thumb*/ LT_FUNC_SHIFT_INS, KC_ENT, LT_NUM_BSPC,
+      /*aux*/  KC_LEAD,  KC_RALT,  KC_APP
+  ),
+
+  // Updated with inspiration from https://forum.colemak.com/topic/2014-extend-extra-extreme/
+  // I like the AltGr trick from https://stevep99.github.io/seniply/ and should probably incorporate some stuff from it.
+  [L_EXTD] = LAYOUT_uqs(
+     _______,  _______,  _______,  _______,  _______,  _______,
+     _______,  KC_BTN1,  KC_SCTAB, KC_PGUP,  KC_CTAB,  KC_LEAD,
+     _______,  OSM_GUI,  OSM_ALT,  OSM_SFT,  OSM_CTL,  KC_RALT,
+     _______,  ALT_TAB,  MS_WHUP,  MS_WHDN,  KC_PGDN,  INS_HARD,
+                         _______,  _______,
+     /*thumb*/ _______,  _______,  _______,
+      /*aux*/  _______,  _______,  _______,
+               /* ^^^^ can't be used */
+     _______,  _______,  _______,  _______,  _______,  _______,
+     KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,   KC_INS,   KC_NO,
+     KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_DEL,   KC_NO,
+     WIN_LEFT, WIN_DN,   WIN_UP,   WIN_RGHT, KC_PSTE,  KC_NO,  // KC_PSTE works in XTerm to emulate middle-click
+                         _______,  _______,
+     /*thumb*/ _______,  _______,  KC_BSPC,
+      /*aux*/  _______,  _______,  _______
+               /* ^^^^ use these */
+  ),
+
+  // TODO: maybe swap # with ;, that way I can roll :w or :wq which I need
+  // often ... probably better to add a combo?
+  [L_NUM] = LAYOUT_uqs(
+     _______,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
+     _______,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,
+     _______,  KC_SCLN,  KC_COLN,  KC_LCBR,  KC_LPRN,  KC_LBRC,
+     _______,  KC_CIRC,  KC_AMPR,  KC_RCBR,  KC_RPRN,  KC_RBRC,
+                         KC_GRV,   KC_TILDE,
+     /*thumb*/ KC_ESC,   KC_SPC,   KC_0,
+      /*aux*/  _______,  _______,  _______,
+               /* ^^^^ use these */
+     KC_NUMLOCK,KC_NO,   KC_NO,    KC_NO,    KC_NO,    KC_NO,
+     KC_EQUAL, KC_7,     KC_8,     KC_9,     KC_KP_PLUS,_______,
+     KC_KP_ASTERISK,KC_4,KC_5,     KC_6,     MINS_UNDSCR,_______,
+     KC_COMM,  KC_1,     KC_2,     KC_3,     KC_KP_SLASH,KC_KP_ENTER,  // Enter here, because thumb is occupied
+                         KC_0,     KC_KP_DOT,
+     /*thumb*/ _______,  _______,  _______,
+      /*aux*/  _______,  _______,  _______
+               /* ^^^^ can't be used */
+  ),
+
+  [L_FUNC] = LAYOUT_uqs(
+     _______,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
+     _______,  KC_NO,    KC_MUTE,  KC_VOLD,  KC_VOLU,  DF(L_WASD),
+     _______,  KC_LGUI,  KC_LALT,  KC_LSFT,  KC_LCTL,  DF(L_QWER),
+     _______,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    DF(L_COLM),
+                         KC_NO,    KC_NO,
+     /*thumb*/ _______,  _______,  _______,
+      /*aux*/  _______,  _______,  _______,
+               /* ^^^^ use these */
+     KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
+     KC_PSCR,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_NO,
+     KC_SLCK,  KC_F4,    KC_F5,    KC_F6,    KC_F11,   KC_NO,
+     KC_PAUS,  KC_F1,    KC_F2,    KC_F3,    KC_F12,   KC_NO,
+                         KC_NO,    KC_NO,
+     /*thumb*/ _______,  _______,  _______,
+      /*aux*/  _______,  _______,  _______
+               /* ^^^^ can't be used */
+  ),
+
+  [L_MOUSE] = LAYOUT_uqs(
+     _______,  _______,  _______,  _______,  _______,  _______,
+     _______,  KC_NO,    KC_BTN2,  KC_BTN3,  KC_BTN1,  KC_VOLU,
+     _______,  KC_NO,    KC_ACL0,  KC_ACL1,  KC_ACL2,  KC_VOLD,
+     _______,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_MUTE,
+                         KC_NO,    KC_NO,
+     /*thumb*/ _______,  _______,  _______,
+      /*aux*/  _______,  _______,  _______,
+               /* ^^^^ can't be used */
+     _______,  _______,  _______,  _______,  _______,  _______,
+     _______,  _______,  KC_MS_UP, MS_WHUP,  _______,  _______,
+     MS_WHLEFT,KC_MS_L,  KC_MS_D,  KC_MS_R,  MS_WHRGHT,_______,
+     _______,  MS_WHDN,  KC_BTN3,  KC_BTN4,  KC_BTN5,  _______,
+                         KC_NO,    KC_NO,
+     /*thumb*/ KC_NO,    KC_BTN1,  KC_BTN2,
+      /*aux*/  _______,  _______,  _______
+               /* use these ^^^^ */
+  ),
+};
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/rules.mk b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/rules.mk
new file mode 100644
index 0000000000..2cd3745fa1
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/rules.mk
@@ -0,0 +1 @@
+#VIA_ENABLE = yes  # doesn't fit with 7 layers :/
diff --git a/keyboards/viktus/sp111/mcp23018.h b/keyboards/handwired/macroboard/chconf.h
similarity index 52%
rename from keyboards/viktus/sp111/mcp23018.h
rename to keyboards/handwired/macroboard/chconf.h
index dc2251b72f..de4ab83ec3 100644
--- a/keyboards/viktus/sp111/mcp23018.h
+++ b/keyboards/handwired/macroboard/chconf.h
@@ -1,4 +1,4 @@
-/* Copyright 2020 zvecr<git@zvecr.com>
+/* 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
@@ -13,22 +13,27 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/blackpill_f401/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ */
+
 #pragma once
 
-#include <stdint.h>
-#include <stdbool.h>
+#define CH_CFG_ST_FREQUENCY 10000
 
-#define mcp23018_PORTA 0
-#define mcp23018_PORTB 1
+#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
 
-#define ALL_OUTPUT 0
-#define ALL_INPUT 0xFF
-#define ALL_LOW 0
-#define ALL_HIGH 0xFF
+#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
+
+#define CH_CFG_FACTORY_SEMAPHORES TRUE
+
+#define CH_CFG_FACTORY_MAILBOXES TRUE
+
+#define CH_CFG_FACTORY_OBJ_FIFOS TRUE
+
+#define CH_CFG_FACTORY_PIPES TRUE
+
+#include_next <chconf.h>
 
-void mcp23018_init(uint8_t addr);
-bool mcp23018_set_config(uint8_t slave_addr, uint8_t port, uint8_t conf);
-bool mcp23018_set_output(uint8_t slave_addr, uint8_t port, uint8_t conf);
-bool mcp23018_set_output_all(uint8_t slave_addr, uint8_t confA, uint8_t confB);
-bool mcp23018_readPins(uint8_t slave_addraddr, uint8_t port, uint8_t* ret);
-bool mcp23018_readPins_all(uint8_t slave_addr, uint16_t* ret);
diff --git a/data/templates/avr/config.h b/keyboards/handwired/macroboard/config.h
similarity index 63%
rename from data/templates/avr/config.h
rename to keyboards/handwired/macroboard/config.h
index 97f7bb6fad..92b633d75c 100644
--- a/data/templates/avr/config.h
+++ b/keyboards/handwired/macroboard/config.h
@@ -1,5 +1,19 @@
-// Copyright %(YEAR)s %(YOUR_NAME)s (@%(USER_NAME)s)
-// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+Copyright 2021 Michał Szczepaniak
+
+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
 
@@ -7,14 +21,13 @@
 
 /* USB Device descriptor parameter */
 #define VENDOR_ID    0xFEED
-#define PRODUCT_ID   0x0000
+#define PRODUCT_ID   0x6465
 #define DEVICE_VER   0x0001
-#define MANUFACTURER %(USER_NAME)s
-#define PRODUCT      %(KEYBOARD)s
+#define MANUFACTURER QMK
 
 /* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 3
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 6
 
 /*
  * Keyboard Matrix Assignments
@@ -26,17 +39,16 @@
  *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
  *
  */
-#define MATRIX_ROW_PINS { D0, D5 }
-#define MATRIX_COL_PINS { F1, F0, B0 }
+#define MATRIX_ROW_PINS { A15, B3, B4, B5, B7 }
+#define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A10 }
 #define UNUSED_PINS
 
-/* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
 /*
  * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
  */
-#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+//#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
 
 //#define LED_NUM_LOCK_PIN B0
 //#define LED_CAPS_LOCK_PIN B1
@@ -46,35 +58,26 @@
 
 //#define BACKLIGHT_PIN B7
 //#define BACKLIGHT_LEVELS 3
-//#define BACKLIGHT_BREATHING
+// #define BACKLIGHT_BREATHING
 
-//#define RGB_DI_PIN E2
-//#ifdef RGB_DI_PIN
-//#    define RGBLED_NUM 16
-//#    define RGBLIGHT_HUE_STEP 8
-//#    define RGBLIGHT_SAT_STEP 8
-//#    define RGBLIGHT_VAL_STEP 8
-//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+#define RGB_DI_PIN B9
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 24
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
 //#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
-/*== customize breathing effect ==*/
-/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
-//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
-/*==== use exp() and sin() ====*/
-//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
-//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
-//#endif
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
@@ -129,6 +132,10 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/handwired/macroboard/info.json b/keyboards/handwired/macroboard/info.json
new file mode 100644
index 0000000000..2aa44eb803
--- /dev/null
+++ b/keyboards/handwired/macroboard/info.json
@@ -0,0 +1,41 @@
+{
+    "keyboard_name": "macroboard",
+    "url": "",
+    "maintainer": "Michał Szczepaniak",
+    "layouts": {
+        "LAYOUT_ortho_5x6": {
+            "layout": [
+                {"label": "k00", "x": 0, "y": 0},
+                {"label": "k01", "x": 1, "y": 0},
+                {"label": "k02", "x": 2, "y": 0},
+                {"label": "k03", "x": 3, "y": 0},
+                {"label": "k04", "x": 4, "y": 0},
+                {"label": "k05", "x": 5, "y": 0},
+                {"label": "k10", "x": 0, "y": 1},
+                {"label": "k11", "x": 1, "y": 1},
+                {"label": "k12", "x": 2, "y": 1},
+                {"label": "k13", "x": 3, "y": 1},
+                {"label": "k14", "x": 4, "y": 1},
+                {"label": "k15", "x": 5, "y": 1},
+                {"label": "k20", "x": 0, "y": 2},
+                {"label": "k21", "x": 1, "y": 2},
+                {"label": "k22", "x": 2, "y": 2},
+                {"label": "k23", "x": 3, "y": 2},
+                {"label": "k24", "x": 4, "y": 2},
+                {"label": "k25", "x": 5, "y": 2},
+                {"label": "k30", "x": 0, "y": 3},
+                {"label": "k31", "x": 1, "y": 3},
+                {"label": "k32", "x": 2, "y": 3},
+                {"label": "k33", "x": 3, "y": 3},
+                {"label": "k34", "x": 4, "y": 3},
+                {"label": "k35", "x": 5, "y": 3},
+                {"label": "k40", "x": 0, "y": 4},
+                {"label": "k41", "x": 1, "y": 4},
+                {"label": "k42", "x": 2, "y": 4},
+                {"label": "k43", "x": 3, "y": 4},
+                {"label": "k44", "x": 4, "y": 4},
+                {"label": "k45", "x": 5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/macroboard/keymaps/default/keymap.c b/keyboards/handwired/macroboard/keymaps/default/keymap.c
new file mode 100644
index 0000000000..ec587ee25d
--- /dev/null
+++ b/keyboards/handwired/macroboard/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2021 Michał Szczepaniak
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ortho_5x6(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,
+        KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,
+        KC_LCTL, KC_LGUI, RGB_TOG, KC_LALT, RESET,   KC_SPC
+    )
+};
+
diff --git a/keyboards/handwired/macroboard/keymaps/default/readme.md b/keyboards/handwired/macroboard/keymaps/default/readme.md
new file mode 100644
index 0000000000..39fa5888ed
--- /dev/null
+++ b/keyboards/handwired/macroboard/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for macroboard
diff --git a/keyboards/handwired/macroboard/macroboard.c b/keyboards/handwired/macroboard/macroboard.c
new file mode 100644
index 0000000000..f9d41ff162
--- /dev/null
+++ b/keyboards/handwired/macroboard/macroboard.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Michał Szczepaniak
+ *
+ * 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 "macroboard.h"
diff --git a/keyboards/handwired/macroboard/macroboard.h b/keyboards/handwired/macroboard/macroboard.h
new file mode 100644
index 0000000000..9909e63afc
--- /dev/null
+++ b/keyboards/handwired/macroboard/macroboard.h
@@ -0,0 +1,41 @@
+/* Copyright 2021 Michał Szczepaniak
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_ortho_5x6( \
+    k00, k01, k02, k03, k04, k05, \
+    k10, k11, k12, k13, k14, k15, \
+    k20, k21, k22, k23, k24, k25, \
+    k30, k31, k32, k33, k34, k35, \
+    k40, k41, k42, k43, k44, k45 \
+) { \
+    { k00, k01, k02, k03, k04, k05 }, \
+    { k10, k11, k12, k13, k14, k15 }, \
+    { k20, k21, k22, k23, k24, k25 }, \
+    { k30, k31, k32, k33, k34, k35 }, \
+    { k40, k41, k42, k43, k44, k45 } \
+}
diff --git a/keyboards/handwired/macroboard/readme.md b/keyboards/handwired/macroboard/readme.md
new file mode 100644
index 0000000000..ee2351f99f
--- /dev/null
+++ b/keyboards/handwired/macroboard/readme.md
@@ -0,0 +1,27 @@
+# macroboard
+
+![macroboard](https://i.imgur.com/AY5Y1Ez.png)
+
+3D printable half preonic (5x6 OLKB) with purpose of being macroboard or if you want to have different switches for gaming while having normal full keyboard for typing.
+
+* Keyboard Maintainer: [Michał Szczepaniak](https://github.com/Michal-Szczepaniak)
+* Hardware Supported: Blackpill
+* Hardware Availability: [OpenSCAD files](https://github.com/Michal-Szczepaniak/macroboard-openscad)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/macroboard:default
+
+Flashing example for this keyboard:
+
+    make handwired/macroboard:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available, by default 5th column, 5th row
diff --git a/keyboards/handwired/macroboard/rules.mk b/keyboards/handwired/macroboard/rules.mk
new file mode 100644
index 0000000000..2c38ac2807
--- /dev/null
+++ b/keyboards/handwired/macroboard/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = STM32F401
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/promethium/promethium.h b/keyboards/handwired/promethium/promethium.h
index c4c90176b5..e40d67e9fd 100644
--- a/keyboards/handwired/promethium/promethium.h
+++ b/keyboards/handwired/promethium/promethium.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <stdint.h>
+#include "quantum.h"
 
 void battery_poll(uint8_t level);
 void led_set_kb(uint8_t usb_led);
diff --git a/keyboards/handwired/swiftrax/digicarp65/config.h b/keyboards/handwired/swiftrax/digicarp65/config.h
new file mode 100644
index 0000000000..1f11e310d1
--- /dev/null
+++ b/keyboards/handwired/swiftrax/digicarp65/config.h
@@ -0,0 +1,47 @@
+/*
+Copyright 2022 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x04D8
+#define PRODUCT_ID      0xE7F1
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Swiftrax
+#define PRODUCT         DigiCarp65
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+// ROWS: Top to bottom, COLS: Left to right
+
+#define MATRIX_ROW_PINS { B2, B1, F4, F1, F0 }
+#define MATRIX_COL_PINS { F5, C6, F6, F7, C7, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#define ENCODERS_PAD_A { B3 }
+#define ENCODERS_PAD_B { B7 }
diff --git a/keyboards/handwired/swiftrax/digicarp65/digicarp65.c b/keyboards/handwired/swiftrax/digicarp65/digicarp65.c
new file mode 100644
index 0000000000..99823a756c
--- /dev/null
+++ b/keyboards/handwired/swiftrax/digicarp65/digicarp65.c
@@ -0,0 +1,31 @@
+/*
+Copyright 2022 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "digicarp65.h"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code_delay(KC_VOLU, 10);
+        } else {
+            tap_code_delay(KC_VOLD, 10);
+        }
+    }
+    return true;
+}
+#endif
diff --git a/keyboards/handwired/swiftrax/digicarp65/digicarp65.h b/keyboards/handwired/swiftrax/digicarp65/digicarp65.h
new file mode 100644
index 0000000000..2797d771d0
--- /dev/null
+++ b/keyboards/handwired/swiftrax/digicarp65/digicarp65.h
@@ -0,0 +1,78 @@
+/*
+Copyright 2022 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#include "quantum.h"
+
+
+ #define LAYOUT_65_ansi( \
+     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
+     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
+     K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
+     K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
+ ) \
+ { \
+  { K00,   K01, K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A, K0B,   K0C, KC_NO, K0E, K0F }, \
+  { K10, KC_NO, K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A, K1B,   K1C,   K1D, K1E, K1F }, \
+  { K20, KC_NO, K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A, K2B,   K2C,   K2D,KC_NO,K2F }, \
+  { K30, KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A, K3B, KC_NO,   K3D, K3E, K3F }, \
+  { K40,   K41, K42, KC_NO, KC_NO, KC_NO,   K46, KC_NO, KC_NO, KC_NO,   K4A, K4B,   K4C,   K4D, K4E, K4F }, \
+ }
+
+ #define LAYOUT_65_iso( \
+     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
+     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
+     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
+     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
+     K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
+ ) \
+ { \
+     { K00, K01,   K02,   K03,   K04,   K05, K06,   K07,   K08, K09,   K0A, K0B,   K0C,   KC_NO,   K0E, K0F }, \
+     { K10, KC_NO, K12,   K13,   K14,   K15, K16,   K17,   K18, K19,   K1A, K1B,   K1C,     K1D,   K2D, K1F }, \
+     { K20, KC_NO, K22,   K23,   K24,   K25, K26,   K27,   K28, K29,   K2A, K2B,   K2C,   KC_NO,   K2E, K2F }, \
+     { K30,   K31, K32,   K33,   K34,   K35, K36,   K37,   K38, K39,   K3A, K3B, KC_NO,     K3D,   K3E, K3F }, \
+     { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B,   K4C,     K4D,   K4E, K4F }, \
+ }
+ #define LAYOUT_65_ansi_split_bs( \
+     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
+     K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
+     K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
+ ) \
+ { \
+     { K00, K01,   K02,   K03, K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   K0D,   K0E, K0F }, \
+     { K10, KC_NO, K12,   K13, K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K1E, K1F }, \
+     { K20, KC_NO, K22,   K23, K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   KC_NO, K2E, K2F }, \
+     { K30, KC_NO, K32,   K33, K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E, K3F }, \
+     { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B,   K4C, K4D,   K4E, K4F }, \
+ }
+#define LAYOUT_65_iso_split_bs( \
+     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
+     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
+     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
+     K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
+ ) \
+ { \
+     { K00, K01,   K02,   K03,   K04,   K05, K06,   K07,   K08, K09,   K0A, K0B,   K0C,   K0D,   K0E, K0F }, \
+     { K10, KC_NO, K12,   K13,   K14,   K15, K16,   K17,   K18, K19,   K1A, K1B,   K1C,   K1D,   K2D, K1F }, \
+     { K20, KC_NO, K22,   K23,   K24,   K25, K26,   K27,   K28, K29,   K2A, K2B,   K2C, KC_NO,   K2E, K2F }, \
+     { K30,   K31, K32,   K33,   K34,   K35, K36,   K37,   K38, K39,   K3A, K3B, KC_NO,   K3D,   K3E, K3F }, \
+     { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B,   K4C,   K4D,   K4E, K4F }, \
+ }
diff --git a/keyboards/handwired/swiftrax/digicarp65/info.json b/keyboards/handwired/swiftrax/digicarp65/info.json
new file mode 100644
index 0000000000..a5fe908e5d
--- /dev/null
+++ b/keyboards/handwired/swiftrax/digicarp65/info.json
@@ -0,0 +1,315 @@
+{
+    "keyboard_name": "digicarp65",
+    "url": "https://github.com/swiftrax",
+    "maintainer": "swiftrax",
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"label": "r1_01", "x": 0, "y": 0},
+                {"label": "r1_02", "x": 1, "y": 0},
+                {"label": "r1_03", "x": 2, "y": 0},
+                {"label": "r1_04", "x": 3, "y": 0},
+                {"label": "r1_05", "x": 4, "y": 0},
+                {"label": "r1_06", "x": 5, "y": 0},
+                {"label": "r1_07", "x": 6, "y": 0},
+                {"label": "r1_08", "x": 7, "y": 0},
+                {"label": "r1_09", "x": 8, "y": 0},
+                {"label": "r1_10", "x": 9, "y": 0},
+                {"label": "r1_11", "x": 10, "y": 0},
+                {"label": "r1_12", "x": 11, "y": 0},
+                {"label": "r1_13", "x": 12, "y": 0},
+                {"label": "r1_14", "x": 13, "y": 0, "w":2},
+                {"label": "r1_15", "x": 15, "y": 0},
+
+                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
+                {"label": "r2_02", "x": 1.5, "y": 1},
+                {"label": "r2_03", "x": 2.5, "y": 1},
+                {"label": "r2_04", "x": 3.5, "y": 1},
+                {"label": "r2_05", "x": 4.5, "y": 1},
+                {"label": "r2_06", "x": 5.5, "y": 1},
+                {"label": "r2_07", "x": 6.5, "y": 1},
+                {"label": "r2_08", "x": 7.5, "y": 1},
+                {"label": "r2_09", "x": 8.5, "y": 1},
+                {"label": "r2_10", "x": 9.5, "y": 1},
+                {"label": "r2_11", "x": 10.5, "y": 1},
+                {"label": "r2_12", "x": 11.5, "y": 1},
+                {"label": "r2_13", "x": 12.5, "y": 1},
+                {"label": "r2_14", "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "r2_15", "x": 15, "y": 1},
+
+                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
+                {"label": "r3_02", "x": 1.75, "y": 2},
+                {"label": "r3_03", "x": 2.75, "y": 2},
+                {"label": "r3_04", "x": 3.75, "y": 2},
+                {"label": "r3_05", "x": 4.75, "y": 2},
+                {"label": "r3_06", "x": 5.75, "y": 2},
+                {"label": "r3_07", "x": 6.75, "y": 2},
+                {"label": "r3_08", "x": 7.75, "y": 2},
+                {"label": "r3_09", "x": 8.75, "y": 2},
+                {"label": "r3_10", "x": 9.75, "y": 2},
+                {"label": "r3_11", "x": 10.75, "y": 2},
+                {"label": "r3_12", "x": 11.75, "y": 2},
+                {"label": "r3_13", "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "r3_14", "x": 15, "y": 2},
+
+                {"label": "r4_01", "x": 0, "y": 3, "w": 2.25},
+                {"label": "r4_02", "x": 2.25, "y": 3},
+                {"label": "r4_03", "x": 3.25, "y": 3},
+                {"label": "r4_04", "x": 4.25, "y": 3},
+                {"label": "r4_05", "x": 5.25, "y": 3},
+                {"label": "r4_06", "x": 6.25, "y": 3},
+                {"label": "r4_07", "x": 7.25, "y": 3},
+                {"label": "r4_08", "x": 8.25, "y": 3},
+                {"label": "r4_09", "x": 9.25, "y": 3},
+                {"label": "r4_10", "x": 10.25, "y": 3},
+                {"label": "r4_11", "x": 11.25, "y": 3},
+                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "r4_13", "x": 14, "y": 3},
+                {"label": "r4_14", "x": 15, "y": 3},
+
+                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
+                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
+                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
+                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "r4_07", "x": 13, "y": 4},
+                {"label": "r4_08", "x": 14, "y": 4},
+                {"label": "r4_09", "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso": {
+            "layout": [
+                {"label": "r1_01", "x": 0, "y": 0},
+                {"label": "r1_02", "x": 1, "y": 0},
+                {"label": "r1_03", "x": 2, "y": 0},
+                {"label": "r1_04", "x": 3, "y": 0},
+                {"label": "r1_05", "x": 4, "y": 0},
+                {"label": "r1_06", "x": 5, "y": 0},
+                {"label": "r1_07", "x": 6, "y": 0},
+                {"label": "r1_08", "x": 7, "y": 0},
+                {"label": "r1_09", "x": 8, "y": 0},
+                {"label": "r1_10", "x": 9, "y": 0},
+                {"label": "r1_11", "x": 10, "y": 0},
+                {"label": "r1_12", "x": 11, "y": 0},
+                {"label": "r1_13", "x": 12, "y": 0},
+                {"label": "r1_14", "x": 13, "y": 0, "w":2},
+                {"label": "r1_15", "x": 15, "y": 0},
+
+                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
+                {"label": "r2_02", "x": 1.5, "y": 1},
+                {"label": "r2_03", "x": 2.5, "y": 1},
+                {"label": "r2_04", "x": 3.5, "y": 1},
+                {"label": "r2_05", "x": 4.5, "y": 1},
+                {"label": "r2_06", "x": 5.5, "y": 1},
+                {"label": "r2_07", "x": 6.5, "y": 1},
+                {"label": "r2_08", "x": 7.5, "y": 1},
+                {"label": "r2_09", "x": 8.5, "y": 1},
+                {"label": "r2_10", "x": 9.5, "y": 1},
+                {"label": "r2_11", "x": 10.5, "y": 1},
+                {"label": "r2_12", "x": 11.5, "y": 1},
+                {"label": "r2_13", "x": 12.5, "y": 1},
+                {"label": "r2_14", "x": 13.5, "y": 1},
+                {"label": "r2_15", "x": 15, "y": 1},
+
+                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
+                {"label": "r3_02", "x": 1.75, "y": 2},
+                {"label": "r3_03", "x": 2.75, "y": 2},
+                {"label": "r3_04", "x": 3.75, "y": 2},
+                {"label": "r3_05", "x": 4.75, "y": 2},
+                {"label": "r3_06", "x": 5.75, "y": 2},
+                {"label": "r3_07", "x": 6.75, "y": 2},
+                {"label": "r3_08", "x": 7.75, "y": 2},
+                {"label": "r3_09", "x": 8.75, "y": 2},
+                {"label": "r3_10", "x": 9.75, "y": 2},
+                {"label": "r3_11", "x": 10.75, "y": 2},
+                {"label": "r3_12", "x": 11.75, "y": 2},
+                {"label": "r3_13", "x": 12.75, "y": 2},
+                {"label": "r3_14", "x": 13.75, "y": 1, "w":1.25, "h":2},
+                {"label": "r3_15", "x": 15, "y": 2},
+
+
+                {"label": "r4_01", "x": 0, "y": 3, "w": 1.25},
+                {"label": "r4_02", "x": 1.25, "y": 3},
+                {"label": "r4_03", "x": 2.25, "y": 3},
+                {"label": "r4_04", "x": 3.25, "y": 3},
+                {"label": "r4_05", "x": 4.25, "y": 3},
+                {"label": "r4_06", "x": 5.25, "y": 3},
+                {"label": "r4_07", "x": 6.25, "y": 3},
+                {"label": "r4_08", "x": 7.25, "y": 3},
+                {"label": "r4_09", "x": 8.25, "y": 3},
+                {"label": "r4_10", "x": 9.25, "y": 3},
+                {"label": "r4_11", "x": 10.25, "y": 3},
+                {"label": "r4_11", "x": 11.25, "y": 3},
+                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "r4_13", "x": 14, "y": 3},
+                {"label": "r4_14", "x": 15, "y": 3},
+
+                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
+                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
+                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
+                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "r4_07", "x": 13, "y": 4},
+                {"label": "r4_08", "x": 14, "y": 4},
+                {"label": "r4_09", "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_split_bs": {
+            "layout": [
+                {"label": "r1_01", "x": 0, "y": 0},
+                {"label": "r1_02", "x": 1, "y": 0},
+                {"label": "r1_03", "x": 2, "y": 0},
+                {"label": "r1_04", "x": 3, "y": 0},
+                {"label": "r1_05", "x": 4, "y": 0},
+                {"label": "r1_06", "x": 5, "y": 0},
+                {"label": "r1_07", "x": 6, "y": 0},
+                {"label": "r1_08", "x": 7, "y": 0},
+                {"label": "r1_09", "x": 8, "y": 0},
+                {"label": "r1_10", "x": 9, "y": 0},
+                {"label": "r1_11", "x": 10, "y": 0},
+                {"label": "r1_12", "x": 11, "y": 0},
+                {"label": "r1_13", "x": 12, "y": 0},
+                {"label": "r1_14", "x": 13, "y": 0},
+                {"label": "r1_15", "x": 14, "y": 0},
+                {"label": "r1_16", "x": 15, "y": 0},
+
+                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
+                {"label": "r2_02", "x": 1.5, "y": 1},
+                {"label": "r2_03", "x": 2.5, "y": 1},
+                {"label": "r2_04", "x": 3.5, "y": 1},
+                {"label": "r2_05", "x": 4.5, "y": 1},
+                {"label": "r2_06", "x": 5.5, "y": 1},
+                {"label": "r2_07", "x": 6.5, "y": 1},
+                {"label": "r2_08", "x": 7.5, "y": 1},
+                {"label": "r2_09", "x": 8.5, "y": 1},
+                {"label": "r2_10", "x": 9.5, "y": 1},
+                {"label": "r2_11", "x": 10.5, "y": 1},
+                {"label": "r2_12", "x": 11.5, "y": 1},
+                {"label": "r2_13", "x": 12.5, "y": 1},
+                {"label": "r2_14", "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "r2_15", "x": 15, "y": 1},
+
+                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
+                {"label": "r3_02", "x": 1.75, "y": 2},
+                {"label": "r3_03", "x": 2.75, "y": 2},
+                {"label": "r3_04", "x": 3.75, "y": 2},
+                {"label": "r3_05", "x": 4.75, "y": 2},
+                {"label": "r3_06", "x": 5.75, "y": 2},
+                {"label": "r3_07", "x": 6.75, "y": 2},
+                {"label": "r3_08", "x": 7.75, "y": 2},
+                {"label": "r3_09", "x": 8.75, "y": 2},
+                {"label": "r3_10", "x": 9.75, "y": 2},
+                {"label": "r3_11", "x": 10.75, "y": 2},
+                {"label": "r3_12", "x": 11.75, "y": 2},
+                {"label": "r3_13", "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "r3_14", "x": 15, "y": 2},
+
+                {"label": "r4_01", "x": 0, "y": 3, "w": 2.25},
+                {"label": "r4_02", "x": 2.25, "y": 3},
+                {"label": "r4_03", "x": 3.25, "y": 3},
+                {"label": "r4_04", "x": 4.25, "y": 3},
+                {"label": "r4_05", "x": 5.25, "y": 3},
+                {"label": "r4_06", "x": 6.25, "y": 3},
+                {"label": "r4_07", "x": 7.25, "y": 3},
+                {"label": "r4_08", "x": 8.25, "y": 3},
+                {"label": "r4_09", "x": 9.25, "y": 3},
+                {"label": "r4_10", "x": 10.25, "y": 3},
+                {"label": "r4_11", "x": 11.25, "y": 3},
+                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "r4_13", "x": 14, "y": 3},
+                {"label": "r4_14", "x": 15, "y": 3},
+
+                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
+                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
+                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
+                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "r4_07", "x": 13, "y": 4},
+                {"label": "r4_08", "x": 14, "y": 4},
+                {"label": "r4_09", "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_split_bs": {
+            "layout": [
+                {"label": "r1_01", "x": 0, "y": 0},
+                {"label": "r1_02", "x": 1, "y": 0},
+                {"label": "r1_03", "x": 2, "y": 0},
+                {"label": "r1_04", "x": 3, "y": 0},
+                {"label": "r1_05", "x": 4, "y": 0},
+                {"label": "r1_06", "x": 5, "y": 0},
+                {"label": "r1_07", "x": 6, "y": 0},
+                {"label": "r1_08", "x": 7, "y": 0},
+                {"label": "r1_09", "x": 8, "y": 0},
+                {"label": "r1_10", "x": 9, "y": 0},
+                {"label": "r1_11", "x": 10, "y": 0},
+                {"label": "r1_12", "x": 11, "y": 0},
+                {"label": "r1_13", "x": 12, "y": 0},
+                {"label": "r1_14", "x": 13, "y": 0},
+                {"label": "r1_15", "x": 14, "y": 0},
+                {"label": "r1_16", "x": 15, "y": 0},
+
+                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
+                {"label": "r2_02", "x": 1.5, "y": 1},
+                {"label": "r2_03", "x": 2.5, "y": 1},
+                {"label": "r2_04", "x": 3.5, "y": 1},
+                {"label": "r2_05", "x": 4.5, "y": 1},
+                {"label": "r2_06", "x": 5.5, "y": 1},
+                {"label": "r2_07", "x": 6.5, "y": 1},
+                {"label": "r2_08", "x": 7.5, "y": 1},
+                {"label": "r2_09", "x": 8.5, "y": 1},
+                {"label": "r2_10", "x": 9.5, "y": 1},
+                {"label": "r2_11", "x": 10.5, "y": 1},
+                {"label": "r2_12", "x": 11.5, "y": 1},
+                {"label": "r2_13", "x": 12.5, "y": 1},
+                {"label": "r2_14", "x": 13.5, "y": 1},
+                {"label": "r2_15", "x": 15, "y": 1},
+
+                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
+                {"label": "r3_02", "x": 1.75, "y": 2},
+                {"label": "r3_03", "x": 2.75, "y": 2},
+                {"label": "r3_04", "x": 3.75, "y": 2},
+                {"label": "r3_05", "x": 4.75, "y": 2},
+                {"label": "r3_06", "x": 5.75, "y": 2},
+                {"label": "r3_07", "x": 6.75, "y": 2},
+                {"label": "r3_08", "x": 7.75, "y": 2},
+                {"label": "r3_09", "x": 8.75, "y": 2},
+                {"label": "r3_10", "x": 9.75, "y": 2},
+                {"label": "r3_11", "x": 10.75, "y": 2},
+                {"label": "r3_12", "x": 11.75, "y": 2},
+                {"label": "r3_13", "x": 12.75, "y": 2},
+                {"label": "r3_14", "x": 13.75, "y": 1, "w":1.25, "h":2},
+                {"label": "r3_15", "x": 15, "y": 2},
+
+
+                {"label": "r4_01", "x": 0, "y": 3, "w": 1.25},
+                {"label": "r4_02", "x": 1.25, "y": 3},
+                {"label": "r4_03", "x": 2.25, "y": 3},
+                {"label": "r4_04", "x": 3.25, "y": 3},
+                {"label": "r4_05", "x": 4.25, "y": 3},
+                {"label": "r4_06", "x": 5.25, "y": 3},
+                {"label": "r4_07", "x": 6.25, "y": 3},
+                {"label": "r4_08", "x": 7.25, "y": 3},
+                {"label": "r4_09", "x": 8.25, "y": 3},
+                {"label": "r4_10", "x": 9.25, "y": 3},
+                {"label": "r4_11", "x": 10.25, "y": 3},
+                {"label": "r4_11", "x": 11.25, "y": 3},
+                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "r4_13", "x": 14, "y": 3},
+                {"label": "r4_14", "x": 15, "y": 3},
+
+                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
+                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
+                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
+                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "r4_07", "x": 13, "y": 4},
+                {"label": "r4_08", "x": 14, "y": 4},
+                {"label": "r4_09", "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/swiftrax/digicarp65/keymaps/default/keymap.c b/keyboards/handwired/swiftrax/digicarp65/keymaps/default/keymap.c
new file mode 100644
index 0000000000..5de5c63144
--- /dev/null
+++ b/keyboards/handwired/swiftrax/digicarp65/keymaps/default/keymap.c
@@ -0,0 +1,42 @@
+/*
+Copyright 2022 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_65_ansi(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RGUI,   MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_ansi(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_INS,
+        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS,
+        RESET,   KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END
+    ),
+    [2] = LAYOUT_65_ansi(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+};
diff --git a/keyboards/handwired/swiftrax/digicarp65/keymaps/via/keymap.c b/keyboards/handwired/swiftrax/digicarp65/keymaps/via/keymap.c
new file mode 100644
index 0000000000..d3bffe8c4c
--- /dev/null
+++ b/keyboards/handwired/swiftrax/digicarp65/keymaps/via/keymap.c
@@ -0,0 +1,50 @@
+/*
+Copyright 2022 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_65_ansi(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RGUI,   MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_ansi(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_INS,
+        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS,
+        RESET,   KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END
+    ),
+    [2] = LAYOUT_65_ansi(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT_65_ansi(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+};
+
diff --git a/keyboards/handwired/swiftrax/digicarp65/keymaps/via/rules.mk b/keyboards/handwired/swiftrax/digicarp65/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/handwired/swiftrax/digicarp65/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/handwired/swiftrax/digicarp65/readme.md b/keyboards/handwired/swiftrax/digicarp65/readme.md
new file mode 100644
index 0000000000..619ec519f0
--- /dev/null
+++ b/keyboards/handwired/swiftrax/digicarp65/readme.md
@@ -0,0 +1,21 @@
+# DigiCarp65
+
+A 65% keyboard
+
+* Keyboard Maintainer: Swiftrax
+* Hardware Supported: DigiCarp65
+* Hardware Availability: https://github.com/swiftrax
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/swiftrax/digicarp65:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (top left key)and plug in the keyboard
+* **Physical reset button**: Briefly short the pad on the back of the PCB labeled RESET
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/handwired/swiftrax/digicarp65/rules.mk b/keyboards/handwired/swiftrax/digicarp65/rules.mk
new file mode 100644
index 0000000000..7a15812bc8
--- /dev/null
+++ b/keyboards/handwired/swiftrax/digicarp65/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+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            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes        # Rotary Encoder
+
+LAYOUTS = 65_ansi 65_ansi_split_bs 65_iso 65_iso_split_bs
diff --git a/keyboards/handwired/twadlee/tp69/rules.mk b/keyboards/handwired/twadlee/tp69/rules.mk
index 216e797c4b..a1c290cf15 100644
--- a/keyboards/handwired/twadlee/tp69/rules.mk
+++ b/keyboards/handwired/twadlee/tp69/rules.mk
@@ -1,6 +1,9 @@
 # MCU name
 MCU = MKL26Z64
 
+# Bootloader selection
+BOOTLOADER = halfkay
+
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/hhkb/ansi/post_rules.mk b/keyboards/hhkb/ansi/post_rules.mk
index bc6ad5cd4c..eb9a8f0adb 100644
--- a/keyboards/hhkb/ansi/post_rules.mk
+++ b/keyboards/hhkb/ansi/post_rules.mk
@@ -4,14 +4,14 @@ OPT_DEFS += -DHHKB_RN42_ENABLE
 
 # Support for the RN42 Bluetooth module. This is the BT module in Hasu's BT
 # HHKB Alt controller.
-RN42_DIR = ../rn42
+RN42_DIR = keyboards/hhkb/rn42
 
 SRC +=  serial_uart.c \
-	../rn42/suart.S \
-	../rn42/rn42.c \
-	../rn42/rn42_task.c \
-	../rn42/battery.c \
-	../rn42/main.c
+	suart.S \
+	rn42.c \
+	rn42_task.c \
+	battery.c \
+	main.c
 
 VPATH += $(RN42_DIR)
 
diff --git a/keyboards/hhkb/jp/post_rules.mk b/keyboards/hhkb/jp/post_rules.mk
index bc6ad5cd4c..eb9a8f0adb 100644
--- a/keyboards/hhkb/jp/post_rules.mk
+++ b/keyboards/hhkb/jp/post_rules.mk
@@ -4,14 +4,14 @@ OPT_DEFS += -DHHKB_RN42_ENABLE
 
 # Support for the RN42 Bluetooth module. This is the BT module in Hasu's BT
 # HHKB Alt controller.
-RN42_DIR = ../rn42
+RN42_DIR = keyboards/hhkb/rn42
 
 SRC +=  serial_uart.c \
-	../rn42/suart.S \
-	../rn42/rn42.c \
-	../rn42/rn42_task.c \
-	../rn42/battery.c \
-	../rn42/main.c
+	suart.S \
+	rn42.c \
+	rn42_task.c \
+	battery.c \
+	main.c
 
 VPATH += $(RN42_DIR)
 
diff --git a/keyboards/honeycomb/rules.mk b/keyboards/honeycomb/rules.mk
index a6029e3dbf..420e409e43 100755
--- a/keyboards/honeycomb/rules.mk
+++ b/keyboards/honeycomb/rules.mk
@@ -10,6 +10,7 @@ BOOTLOADER = caterina
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
 #MOUSEKEY_ENABLE = yes	# Mouse keys
 POINTING_DEVICE_ENABLE = yes # Generic Pointer, not as big as mouse keys hopefully.
+POINTING_DEVICE_DRIVER = custom
 EXTRAKEY_ENABLE = yes	# Audio control and System control
 CONSOLE_ENABLE = yes	# Console for debug
 COMMAND_ENABLE = yes   # Commands for debug and configuration
diff --git a/keyboards/horrortroll/paws60/config.h b/keyboards/horrortroll/paws60/config.h
new file mode 100644
index 0000000000..d502ee985c
--- /dev/null
+++ b/keyboards/horrortroll/paws60/config.h
@@ -0,0 +1,49 @@
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x7516
+#define PRODUCT_ID      0x6060
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    HorrorTroll
+#define PRODUCT         Paws 60
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
+#define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1 }
+
+#define BOOTMAGIC_LITE_ROW 3
+#define BOOTMAGIC_LITE_COLUMN 6
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Forcing to use NKRO instead 6KRO */
+#define FORCE_NKRO
+
+/* Larger keys per scan */
+#define QMK_KEYS_PER_SCAN 12
diff --git a/keyboards/horrortroll/paws60/info.json b/keyboards/horrortroll/paws60/info.json
new file mode 100644
index 0000000000..1008bf29e2
--- /dev/null
+++ b/keyboards/horrortroll/paws60/info.json
@@ -0,0 +1,285 @@
+{
+    "keyboard_name": "Paws 60",
+    "url": "https://github.com/HorrorTroll/KeebProj/tree/default/paws60/pcb/Hotswap",
+    "maintainer": "HorrorTroll",
+    "layouts": {
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"`~", "x":13, "y":0},
+                {"label":"Backspace", "x":14, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"Shift", "x":14, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4, "w":1.25},
+                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
+                {"label":"Win", "x":12.5, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+            ]
+        }
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":2.75},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4, "w":1.25},
+                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
+                {"label":"Win", "x":12.5, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+            ]
+        }
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":2.75},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Win", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Fn", "x":11, "y":4, "w":1.5},
+                {"label":"Win", "x":12.5, "y":4},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
+        }
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"`~", "x":13, "y":0},
+                {"label":"Backspace", "x":14, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"Shift", "x":14, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Win", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Fn", "x":11, "y":4, "w":1.5},
+                {"label":"Win", "x":12.5, "y":4},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/horrortroll/paws60/keymaps/default/keymap.c b/keyboards/horrortroll/paws60/keymaps/default/keymap.c
new file mode 100644
index 0000000000..33319041d5
--- /dev/null
+++ b/keyboards/horrortroll/paws60/keymaps/default/keymap.c
@@ -0,0 +1,87 @@
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+enum layer_names {
+    _BASE,
+    _FN,
+};
+
+// enum layer_keycodes { };
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+       │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ ` │Bks│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │  Enter │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+       │ LShift │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │RSt│
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
+       │LCrl│GUI │LAlt│         Space          │RAlt│ Fn │ GUI│RCrl│
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+       │   │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ ~ │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+       │ LShift │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │ RSft │RSt│
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
+       │    │    │    │                        │    │    │    │    │
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+*/
+    /*  Row:    0        1        2        3     4     5     6       7     8     9        10       11       12       13       14     */
+    [_BASE] = LAYOUT_60_ansi_split_bs_rshift(
+                KC_ESC,  KC_1,    KC_2,    KC_3, KC_4, KC_5, KC_6,   KC_7, KC_8, KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC,
+                KC_TAB,  KC_Q,    KC_W,    KC_E, KC_R, KC_T, KC_Y,   KC_U, KC_I, KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+                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_RSFT,
+                KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                      KC_RALT, MO(_FN), KC_RGUI, KC_RCTL
+            ),
+
+/*
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+       │ ` │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│   │Del│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+       │Reset│   │ ↑ │   │   │   │   │   │Ins│   │PSc│   │   │     │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+       │      │ ← │ ↓ │ → │   │   │   │   │   │   │   │   │        │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+       │        │   │   │Cal│   │   │   │Mut│VoD│VoU│   │      │   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
+       │    │    │    │                        │    │ Fn │    │    │
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+*/
+    /*  Row:    0        1        2        3         4        5        6        7        8        9        10       11       12       13       14    */
+    [_FN]   = LAYOUT_60_ansi_split_bs_rshift(
+                KC_GRV,  KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,
+                RESET,   _______, KC_UP,   _______,  _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, _______, _______, _______,
+                _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+                _______,          _______, _______,  KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
+                _______, _______, _______,                             _______,                            _______, _______, _______, _______
+            ),
+};
diff --git a/keyboards/horrortroll/paws60/keymaps/default/readme.md b/keyboards/horrortroll/paws60/keymaps/default/readme.md
new file mode 100644
index 0000000000..f450e1a224
--- /dev/null
+++ b/keyboards/horrortroll/paws60/keymaps/default/readme.md
@@ -0,0 +1,3 @@
+# Default Layout
+
+Keymap is default 61 qwerty, 60% layout with split backspace & split right shift
diff --git a/keyboards/horrortroll/paws60/keymaps/via/config.h b/keyboards/horrortroll/paws60/keymaps/via/config.h
new file mode 100644
index 0000000000..4a9ae9bdc2
--- /dev/null
+++ b/keyboards/horrortroll/paws60/keymaps/via/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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 DYNAMIC_KEYMAP_LAYER_COUNT 2
diff --git a/keyboards/horrortroll/paws60/keymaps/via/keymap.c b/keyboards/horrortroll/paws60/keymaps/via/keymap.c
new file mode 100644
index 0000000000..33319041d5
--- /dev/null
+++ b/keyboards/horrortroll/paws60/keymaps/via/keymap.c
@@ -0,0 +1,87 @@
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+enum layer_names {
+    _BASE,
+    _FN,
+};
+
+// enum layer_keycodes { };
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+       │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ ` │Bks│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │  Enter │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+       │ LShift │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │RSt│
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
+       │LCrl│GUI │LAlt│         Space          │RAlt│ Fn │ GUI│RCrl│
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+       │   │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ ~ │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+       │ LShift │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │ RSft │RSt│
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
+       │    │    │    │                        │    │    │    │    │
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+*/
+    /*  Row:    0        1        2        3     4     5     6       7     8     9        10       11       12       13       14     */
+    [_BASE] = LAYOUT_60_ansi_split_bs_rshift(
+                KC_ESC,  KC_1,    KC_2,    KC_3, KC_4, KC_5, KC_6,   KC_7, KC_8, KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC,
+                KC_TAB,  KC_Q,    KC_W,    KC_E, KC_R, KC_T, KC_Y,   KC_U, KC_I, KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+                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_RSFT,
+                KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                      KC_RALT, MO(_FN), KC_RGUI, KC_RCTL
+            ),
+
+/*
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+       │ ` │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│   │Del│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+       │Reset│   │ ↑ │   │   │   │   │   │Ins│   │PSc│   │   │     │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+       │      │ ← │ ↓ │ → │   │   │   │   │   │   │   │   │        │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+       │        │   │   │Cal│   │   │   │Mut│VoD│VoU│   │      │   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
+       │    │    │    │                        │    │ Fn │    │    │
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+*/
+    /*  Row:    0        1        2        3         4        5        6        7        8        9        10       11       12       13       14    */
+    [_FN]   = LAYOUT_60_ansi_split_bs_rshift(
+                KC_GRV,  KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,
+                RESET,   _______, KC_UP,   _______,  _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, _______, _______, _______,
+                _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+                _______,          _______, _______,  KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
+                _______, _______, _______,                             _______,                            _______, _______, _______, _______
+            ),
+};
diff --git a/keyboards/horrortroll/paws60/keymaps/via/readme.md b/keyboards/horrortroll/paws60/keymaps/via/readme.md
new file mode 100644
index 0000000000..13fa492ddf
--- /dev/null
+++ b/keyboards/horrortroll/paws60/keymaps/via/readme.md
@@ -0,0 +1,3 @@
+# Default Layout with VIA
+
+Keymap is default 61 qwerty, 60% layout with split backspace & split right shift
diff --git a/keyboards/plexus75/keymaps/via/rules.mk b/keyboards/horrortroll/paws60/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/plexus75/keymaps/via/rules.mk
rename to keyboards/horrortroll/paws60/keymaps/via/rules.mk
diff --git a/keyboards/horrortroll/paws60/paws60.c b/keyboards/horrortroll/paws60/paws60.c
new file mode 100644
index 0000000000..8734d75070
--- /dev/null
+++ b/keyboards/horrortroll/paws60/paws60.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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 "paws60.h"
diff --git a/keyboards/horrortroll/paws60/paws60.h b/keyboards/horrortroll/paws60/paws60.h
new file mode 100644
index 0000000000..3c79345d7c
--- /dev/null
+++ b/keyboards/horrortroll/paws60/paws60.h
@@ -0,0 +1,129 @@
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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 XXX KC_NO
+
+/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
+ * │40  │41  │42  │46                      │4A  │4B  │4C  │4D  │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ */
+
+#define LAYOUT_60_ansi_split_bs_rshift( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,  \
+     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K1D,   \
+      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K2D,     \
+       K30,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,    K3D, \
+    K40,  K41,  K42,                K46,                K4A,  K4B,  K4C,  K4D   \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, XXX }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX }, \
+    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, XXX }  \
+}
+
+/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0E     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D        │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+ * │40  │41  │42  │46                      │4A  │4B  │4C  │4D  │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ */
+
+#define LAYOUT_60_ansi( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,    K0E,    \
+     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K1D,   \
+      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K2D,     \
+       K30,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,       \
+    K40,  K41,  K42,                K46,                K4A,  K4B,  K4C,  K4D   \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, XXX }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX }, \
+    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, XXX }  \
+}
+
+/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0E     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D        │
+ * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤
+ * │40   │41 │42   │46                         │4B   │4C │4D   │
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ */
+
+#define LAYOUT_60_ansi_tsangan( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,    K0E,    \
+     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K1D,   \
+      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K2D,     \
+       K30,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,       \
+    K40,   K41, K42,                K46,                      K4B,   K4C, K4D   \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, XXX }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX }, \
+    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, K4C, K4D, XXX }  \
+}
+
+/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │
+ * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+ * │40   │41 │42   │46                         │4B   │4C │4D   │
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ */
+
+#define LAYOUT_60_tsangan_hhkb( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,  \
+     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K1D,   \
+      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K2D,     \
+       K30,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,    K3D, \
+    K40,   K41, K42,                K46,                      K4B,   K4C, K4D   \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, XXX }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX }, \
+    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, K4C, K4D, XXX }  \
+}
diff --git a/keyboards/horrortroll/paws60/readme.md b/keyboards/horrortroll/paws60/readme.md
new file mode 100644
index 0000000000..62783d3b5e
--- /dev/null
+++ b/keyboards/horrortroll/paws60/readme.md
@@ -0,0 +1,27 @@
+# Paws 60
+
+A PCB that has been inspired by Bakeneko 60 from kkatano [GitHub](https://github.com/kkatano/bakeneko-60)
+
+But more changes has been added: Hotswap socket, ...
+
+* Keyboard Maintainer: [HorrorTroll](https://github.com/HorrorTroll)
+* Hardware Supported: Atmega32u4
+* Hardware Availability: [Open source on GitHub](https://github.com/HorrorTroll/KeebProj/tree/default/paws60/pcb/Hotswap)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make horrortroll/paws60:default
+
+Flashing example for this keyboard:
+
+    make horrortroll/paws60:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (3,6) in the matrix (B key) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to RESET if it is available
diff --git a/keyboards/horrortroll/paws60/rules.mk b/keyboards/horrortroll/paws60/rules.mk
new file mode 100644
index 0000000000..daf1d593f1
--- /dev/null
+++ b/keyboards/horrortroll/paws60/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = 60_ansi_split_bs_rshift 60_ansi 60_ansi_tsangan 60_tsangan_hhkb
diff --git a/keyboards/idobao/id75/config.h b/keyboards/idobao/id75/v1/config.h
similarity index 98%
rename from keyboards/idobao/id75/config.h
rename to keyboards/idobao/id75/v1/config.h
index ffe0bb7011..caaf7f75dc 100644
--- a/keyboards/idobao/id75/config.h
+++ b/keyboards/idobao/id75/v1/config.h
@@ -23,8 +23,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define VENDOR_ID       0x6964 // ID
 #define PRODUCT_ID      0x0075
 #define DEVICE_VER      0x0001
-#define MANUFACTURER    Generic
-#define PRODUCT         Idobo
+#define MANUFACTURER    IDOBAO
+#define PRODUCT         ID75
 
 /* key matrix size */
 #define MATRIX_ROWS 5
diff --git a/keyboards/idobao/id75/info.json b/keyboards/idobao/id75/v1/info.json
similarity index 100%
rename from keyboards/idobao/id75/info.json
rename to keyboards/idobao/id75/v1/info.json
diff --git a/keyboards/idobao/id75/readme.md b/keyboards/idobao/id75/v1/readme.md
similarity index 96%
rename from keyboards/idobao/id75/readme.md
rename to keyboards/idobao/id75/v1/readme.md
index 9f0f87360c..545f3121f7 100644
--- a/keyboards/idobao/id75/readme.md
+++ b/keyboards/idobao/id75/v1/readme.md
@@ -14,6 +14,6 @@ Hardware Availability:
 
 Make example for this keyboard (after setting up your build environment):
 
-    make idobao/id75:default
+    make idobao/id75/v1:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/idobao/id75/rules.mk b/keyboards/idobao/id75/v1/rules.mk
similarity index 72%
rename from keyboards/idobao/id75/rules.mk
rename to keyboards/idobao/id75/v1/rules.mk
index 721b7f5606..0ce4fe96d9 100644
--- a/keyboards/idobao/id75/rules.mk
+++ b/keyboards/idobao/id75/v1/rules.mk
@@ -11,10 +11,10 @@ BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
+COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes            # Use link time optimization
 
diff --git a/keyboards/idobao/id75/id75.c b/keyboards/idobao/id75/v1/v1.c
similarity index 97%
rename from keyboards/idobao/id75/id75.c
rename to keyboards/idobao/id75/v1/v1.c
index 0a0e08cc32..992a292616 100644
--- a/keyboards/idobao/id75/id75.c
+++ b/keyboards/idobao/id75/v1/v1.c
@@ -13,4 +13,4 @@
  * 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 "id75.h"
+#include "v1.h"
diff --git a/keyboards/idobao/id75/id75.h b/keyboards/idobao/id75/v1/v1.h
similarity index 100%
rename from keyboards/idobao/id75/id75.h
rename to keyboards/idobao/id75/v1/v1.h
diff --git a/keyboards/idobao/id80/ansi/config.h b/keyboards/idobao/id80/v1/ansi/config.h
similarity index 100%
rename from keyboards/idobao/id80/ansi/config.h
rename to keyboards/idobao/id80/v1/ansi/config.h
diff --git a/keyboards/idobao/id80/ansi/keymaps/default/keymap.c b/keyboards/idobao/id80/v1/ansi/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/idobao/id80/ansi/keymaps/default/keymap.c
rename to keyboards/idobao/id80/v1/ansi/keymaps/default/keymap.c
diff --git a/keyboards/idobao/id80/ansi/keymaps/default/readme.md b/keyboards/idobao/id80/v1/ansi/keymaps/default/readme.md
similarity index 100%
rename from keyboards/idobao/id80/ansi/keymaps/default/readme.md
rename to keyboards/idobao/id80/v1/ansi/keymaps/default/readme.md
diff --git a/keyboards/idobao/id80/ansi/keymaps/msf/config.h b/keyboards/idobao/id80/v1/ansi/keymaps/msf/config.h
similarity index 100%
rename from keyboards/idobao/id80/ansi/keymaps/msf/config.h
rename to keyboards/idobao/id80/v1/ansi/keymaps/msf/config.h
diff --git a/keyboards/idobao/id80/ansi/keymaps/msf/keymap.c b/keyboards/idobao/id80/v1/ansi/keymaps/msf/keymap.c
similarity index 100%
rename from keyboards/idobao/id80/ansi/keymaps/msf/keymap.c
rename to keyboards/idobao/id80/v1/ansi/keymaps/msf/keymap.c
diff --git a/keyboards/idobao/id80/ansi/keymaps/msf/readme.md b/keyboards/idobao/id80/v1/ansi/keymaps/msf/readme.md
similarity index 100%
rename from keyboards/idobao/id80/ansi/keymaps/msf/readme.md
rename to keyboards/idobao/id80/v1/ansi/keymaps/msf/readme.md
diff --git a/keyboards/eggman/keymaps/default/rules.mk b/keyboards/idobao/id80/v1/ansi/keymaps/msf/rules.mk
similarity index 100%
rename from keyboards/eggman/keymaps/default/rules.mk
rename to keyboards/idobao/id80/v1/ansi/keymaps/msf/rules.mk
diff --git a/keyboards/idobao/id80/keymaps/rverst/keymap.c b/keyboards/idobao/id80/v1/ansi/keymaps/rverst/keymap.c
similarity index 100%
rename from keyboards/idobao/id80/keymaps/rverst/keymap.c
rename to keyboards/idobao/id80/v1/ansi/keymaps/rverst/keymap.c
diff --git a/keyboards/idobao/id80/keymaps/rverst/readme.md b/keyboards/idobao/id80/v1/ansi/keymaps/rverst/readme.md
similarity index 100%
rename from keyboards/idobao/id80/keymaps/rverst/readme.md
rename to keyboards/idobao/id80/v1/ansi/keymaps/rverst/readme.md
diff --git a/keyboards/idobao/id80/keymaps/rverst/rverst.json b/keyboards/idobao/id80/v1/ansi/keymaps/rverst/rverst.json
similarity index 100%
rename from keyboards/idobao/id80/keymaps/rverst/rverst.json
rename to keyboards/idobao/id80/v1/ansi/keymaps/rverst/rverst.json
diff --git a/keyboards/idobao/id80/ansi/keymaps/via/keymap.c b/keyboards/idobao/id80/v1/ansi/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/idobao/id80/ansi/keymaps/via/keymap.c
rename to keyboards/idobao/id80/v1/ansi/keymaps/via/keymap.c
diff --git a/keyboards/idobao/id80/ansi/keymaps/via/rules.mk b/keyboards/idobao/id80/v1/ansi/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/idobao/id80/ansi/keymaps/via/rules.mk
rename to keyboards/idobao/id80/v1/ansi/keymaps/via/rules.mk
diff --git a/keyboards/idobao/id80/ansi/readme.md b/keyboards/idobao/id80/v1/ansi/readme.md
similarity index 100%
rename from keyboards/idobao/id80/ansi/readme.md
rename to keyboards/idobao/id80/v1/ansi/readme.md
diff --git a/keyboards/idobao/id80/ansi/rules.mk b/keyboards/idobao/id80/v1/ansi/rules.mk
similarity index 100%
rename from keyboards/idobao/id80/ansi/rules.mk
rename to keyboards/idobao/id80/v1/ansi/rules.mk
diff --git a/keyboards/idobao/id80/config.h b/keyboards/idobao/id80/v1/config.h
similarity index 100%
rename from keyboards/idobao/id80/config.h
rename to keyboards/idobao/id80/v1/config.h
diff --git a/keyboards/idobao/id80/info.json b/keyboards/idobao/id80/v1/info.json
similarity index 100%
rename from keyboards/idobao/id80/info.json
rename to keyboards/idobao/id80/v1/info.json
diff --git a/keyboards/idobao/id80/iso/config.h b/keyboards/idobao/id80/v1/iso/config.h
similarity index 100%
rename from keyboards/idobao/id80/iso/config.h
rename to keyboards/idobao/id80/v1/iso/config.h
diff --git a/keyboards/idobao/id80/iso/keymaps/default/keymap.c b/keyboards/idobao/id80/v1/iso/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/idobao/id80/iso/keymaps/default/keymap.c
rename to keyboards/idobao/id80/v1/iso/keymaps/default/keymap.c
diff --git a/keyboards/idobao/id80/iso/keymaps/default/readme.md b/keyboards/idobao/id80/v1/iso/keymaps/default/readme.md
similarity index 100%
rename from keyboards/idobao/id80/iso/keymaps/default/readme.md
rename to keyboards/idobao/id80/v1/iso/keymaps/default/readme.md
diff --git a/keyboards/idobao/id80/iso/keymaps/via/keymap.c b/keyboards/idobao/id80/v1/iso/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/idobao/id80/iso/keymaps/via/keymap.c
rename to keyboards/idobao/id80/v1/iso/keymaps/via/keymap.c
diff --git a/keyboards/idobao/id80/iso/keymaps/via/rules.mk b/keyboards/idobao/id80/v1/iso/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/idobao/id80/iso/keymaps/via/rules.mk
rename to keyboards/idobao/id80/v1/iso/keymaps/via/rules.mk
diff --git a/keyboards/idobao/id80/iso/readme.md b/keyboards/idobao/id80/v1/iso/readme.md
similarity index 100%
rename from keyboards/idobao/id80/iso/readme.md
rename to keyboards/idobao/id80/v1/iso/readme.md
diff --git a/keyboards/idobao/id80/iso/rules.mk b/keyboards/idobao/id80/v1/iso/rules.mk
similarity index 100%
rename from keyboards/idobao/id80/iso/rules.mk
rename to keyboards/idobao/id80/v1/iso/rules.mk
diff --git a/keyboards/idobao/id80/readme.md b/keyboards/idobao/id80/v1/readme.md
similarity index 93%
rename from keyboards/idobao/id80/readme.md
rename to keyboards/idobao/id80/v1/readme.md
index bcc4a25d7d..8a26378b3b 100644
--- a/keyboards/idobao/id80/readme.md
+++ b/keyboards/idobao/id80/v1/readme.md
@@ -12,7 +12,7 @@ A 75% hotswap keyboard from IDOBAO.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make idobao/id80/ansi:default
+    make idobao/id80/v1/ansi:default
     
 ## ISO support:
 
@@ -22,6 +22,6 @@ Make example for this keyboard (after setting up your build environment):
 
 Make example for this keyboard (after setting up your build environment):
 
-    make idobao/id80/iso:default
+    make idobao/id80/v1/iso:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/idobao/id80/rules.mk b/keyboards/idobao/id80/v1/rules.mk
similarity index 95%
rename from keyboards/idobao/id80/rules.mk
rename to keyboards/idobao/id80/v1/rules.mk
index f988be4e29..0baebd07fc 100644
--- a/keyboards/idobao/id80/rules.mk
+++ b/keyboards/idobao/id80/v1/rules.mk
@@ -1,5 +1,5 @@
 # Defalt to the ansi version
-DEFAULT_FOLDER = idobao/id80/ansi
+DEFAULT_FOLDER = idobao/id80/v1/ansi
 
 # MCU name
 MCU = atmega32u4
diff --git a/keyboards/idobao/id80/id80.c b/keyboards/idobao/id80/v1/v1.c
similarity index 97%
rename from keyboards/idobao/id80/id80.c
rename to keyboards/idobao/id80/v1/v1.c
index 4a06660de9..7147b6163e 100644
--- a/keyboards/idobao/id80/id80.c
+++ b/keyboards/idobao/id80/v1/v1.c
@@ -13,4 +13,4 @@
  * 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 "id80.h"
+#include "v1.h"
diff --git a/keyboards/idobao/id80/id80.h b/keyboards/idobao/id80/v1/v1.h
similarity index 100%
rename from keyboards/idobao/id80/id80.h
rename to keyboards/idobao/id80/v1/v1.h
diff --git a/keyboards/idobao/id80/v3/config.h b/keyboards/idobao/id80/v3/config.h
new file mode 100644
index 0000000000..4b2fb8d056
--- /dev/null
+++ b/keyboards/idobao/id80/v3/config.h
@@ -0,0 +1,131 @@
+/*
+Copyright 2020 Sergey Vlasov <sigprof@gmail.com>
+Copyright 2022 peepeetee
+
+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"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x6964 /* "id" */
+#define PRODUCT_ID      0x0080
+#define DEVICE_VER      0x0003
+#define MANUFACTURER    IDOBAO
+#define PRODUCT         ID80 v3
+
+
+/* key matrix size */
+#define MATRIX_ROWS 9
+#define MATRIX_COLS 11
+
+/*
+ * 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)
+ *
+ * The matrix description in the vendor-supplied JSON file for kbfirmware.com
+ * had 9 columns:
+ *     { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
+ * and 12 rows:
+ *     { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 }
+ * However, the row 6 was completely empty, and the pin F0 was not actually
+ * routed anywhere on the PCB, therefore this row was removed to save some
+ * resources (the EEPROM space for dynamic keymaps is especially scarce).
+ *
+ * After doing the above change, the matrix was transposed (rows and columns
+ * were swapped), because a matrix with the COL2ROW layout can be scanned much
+ * more efficiently than a matrix with the ROW2COL layout (depending on various
+ * optimizations, the difference in scan rate can be over 2 times).  Because of
+ * this, the "columns" in the matrix layout now mostly correspond to physical
+ * rows, and the "rows" have mostly vertical physical orientation.
+ */
+#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
+#define MATRIX_COL_PINS { B7, B3, B2, B1, B0, E6, F1, F4, F5, F6, F7 }
+
+#define DIODE_DIRECTION COL2ROW
+
+#undef RGB_DI_PIN
+#define RGB_DI_PIN B6
+#ifdef RGB_MATRIX_ENABLE
+#    define DRIVER_LED_TOTAL 96 /* 16 Bottom 80 top*/
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#    define RGB_MATRIX_KEYPRESSES
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only if RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define ENABLE_RGB_MATRIX_SPLASH
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
+
+/* Bootmagic Lite key configuration: use the Esc key */
+#define BOOTMAGIC_LITE_ROW      0
+#define BOOTMAGIC_LITE_COLUMN   5
+
+#define ENCODERS_PAD_A { C7 }
+#define ENCODERS_PAD_B { C6 }
+
+
+
+
diff --git a/keyboards/idobao/id80/v3/info.json b/keyboards/idobao/id80/v3/info.json
new file mode 100644
index 0000000000..0dc8efaf02
--- /dev/null
+++ b/keyboards/idobao/id80/v3/info.json
@@ -0,0 +1,96 @@
+{
+    "keyboard_name": "ID80 v3",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"Fn", "x":14, "y":0},
+                {"label":"Insert", "x":15.25, "y":0},
+
+                {"label":"`", "x":0, "y":1.25},
+                {"label":"1", "x":1, "y":1.25},
+                {"label":"2", "x":2, "y":1.25},
+                {"label":"3", "x":3, "y":1.25},
+                {"label":"4", "x":4, "y":1.25},
+                {"label":"5", "x":5, "y":1.25},
+                {"label":"6", "x":6, "y":1.25},
+                {"label":"7", "x":7, "y":1.25},
+                {"label":"8", "x":8, "y":1.25},
+                {"label":"9", "x":9, "y":1.25},
+                {"label":"0", "x":10, "y":1.25},
+                {"label":"-", "x":11, "y":1.25},
+                {"label":"=", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Home", "x":15.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[", "x":11.5, "y":2.25},
+                {"label":"]", "x":12.5, "y":2.25},
+                {"label":"\\", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";", "x":10.75, "y":3.25},
+                {"label":"'", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",", "x":9.25, "y":4.25},
+                {"label":".", "x":10.25, "y":4.25},
+                {"label":"/", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"\u2191", "x":14.25, "y":4.5},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.5},
+                {"label":"Ctrl", "x":11.5, "y":5.25, "w":1.5},
+                {"label":"\u2190", "x":13.25, "y":5.5},
+                {"label":"\u2193", "x":14.25, "y":5.5},
+                {"label":"\u2192", "x":15.25, "y":5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/idobao/id80/v3/keymaps/default/keymap.c b/keyboards/idobao/id80/v3/keymaps/default/keymap.c
new file mode 100644
index 0000000000..697c4b9189
--- /dev/null
+++ b/keyboards/idobao/id80/v3/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2020 Sergey Vlasov <sigprof@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,  KC_F11,  KC_F12,     MO(1),     KC_INS,
+        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_HOME,
+        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_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,     KC_RCTL,        KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT(
+        RESET,     _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   KC_MUTE,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______,
+        _______,     RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,        _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,            _______, _______, BL_DEC,  BL_TOGG, BL_INC,  NK_TOGG, _______, _______, _______, _______, _______,          BL_INC,
+        _______,   _______,   _______,                      _______,                              _______,     _______,        BL_TOGG, BL_DEC,  BL_STEP
+    ),
+};
+
diff --git a/keyboards/idobao/id80/v3/keymaps/default/readme.md b/keyboards/idobao/id80/v3/keymaps/default/readme.md
new file mode 100644
index 0000000000..8ae9f656cd
--- /dev/null
+++ b/keyboards/idobao/id80/v3/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for id80
diff --git a/keyboards/idobao/id80/v3/keymaps/via/keymap.c b/keyboards/idobao/id80/v3/keymaps/via/keymap.c
new file mode 100644
index 0000000000..1f37572503
--- /dev/null
+++ b/keyboards/idobao/id80/v3/keymaps/via/keymap.c
@@ -0,0 +1,52 @@
+/* Copyright 2020 Sergey Vlasov <sigprof@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,  KC_F11,  KC_F12,     MO(1),     KC_INS,
+        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_HOME,
+        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_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,     KC_RCTL,        KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT(
+        RESET,     _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   KC_MUTE,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______,
+        _______,     RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,        _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,            _______, _______, BL_DEC,  BL_TOGG, BL_INC,  NK_TOGG, _______, _______, _______, _______, _______,          BL_INC,
+        _______,   _______,   _______,                      _______,                              _______,     _______,        BL_TOGG, BL_DEC,  BL_STEP
+    ),
+    [2] = LAYOUT(
+        _______,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______,
+        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,   _______,   _______,                      _______,                              _______,     _______,        _______, _______, _______
+    ),
+    [3] = LAYOUT(
+        _______,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______,
+        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,   _______,   _______,                      _______,                              _______,     _______,        _______, _______, _______
+    ),
+};
+
diff --git a/keyboards/montex/keymaps/via/rules.mk b/keyboards/idobao/id80/v3/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/montex/keymaps/via/rules.mk
rename to keyboards/idobao/id80/v3/keymaps/via/rules.mk
diff --git a/keyboards/idobao/id80/v3/readme.md b/keyboards/idobao/id80/v3/readme.md
new file mode 100644
index 0000000000..dc6c67b4f4
--- /dev/null
+++ b/keyboards/idobao/id80/v3/readme.md
@@ -0,0 +1,27 @@
+# ID80v3
+
+![ID80v3](https://i.imgur.com/PGvZfQj.jpg)
+
+A 75% hotswap in-switch RGB keyboard with an encoder.
+
+* Keyboard Maintainer: [peepeetee](https://github.com/peepeetee)
+* Hardware Supported: ID80v3
+* Hardware Availability: Not avaliable yet
+
+Make example for this keyboard (after setting up your build environment):
+
+    make idobao/id80/v3:default
+
+Flashing example for this keyboard:
+
+    make idobao/id80/v3:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/idobao/id80/v3/rules.mk b/keyboards/idobao/id80/v3/rules.mk
new file mode 100644
index 0000000000..6805b8f0f9
--- /dev/null
+++ b/keyboards/idobao/id80/v3/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
+LTO_ENABLE = yes
+
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/idobao/id80/v3/v3.c b/keyboards/idobao/id80/v3/v3.c
new file mode 100644
index 0000000000..cd05a26a49
--- /dev/null
+++ b/keyboards/idobao/id80/v3/v3.c
@@ -0,0 +1,62 @@
+// Copyright 2022 peepeetee (@peepeetee)
+// Copyright 2022 Xelus22
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "v3.h"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code_delay(KC_VOLU, 10);
+        } else {
+            tap_code_delay(KC_VOLD, 10);
+        }
+    }
+    return true;
+}
+#endif
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+    // Key Matrix to LED Index
+    { 8,   9,      34,   35,   64,   65,   NO_LED,   NO_LED, NO_LED, NO_LED,   NO_LED },
+    { 7,   NO_LED, 33,   36,   63,   66,   NO_LED,   NO_LED, NO_LED, NO_LED,   NO_LED },
+    { 6,   10,     32,   37,   62,   67,   NO_LED,   NO_LED, 49,     50,       79 },
+    { 0,   11,     31,   38,   61,   68,   21,       NO_LED, 48,     NO_LED,   77 },
+    { 1,   12,     30,   39,   60,   69,   20,       22,     47,     52,   76 },
+    { 2,   13,     29,   40,   59,   70,   19,       23,     46,     53,   75 },
+    { 5,   14,     28,   41,   58,   71,   NO_LED,   NO_LED, NO_LED, 51,   78 },
+    { 3,   15,     27,   42,   57,   72,   18,       24,     45,     54,   74 },
+    { 4,   16,     26,   43,   56,   73,   17,       25,     44,     55,   NO_LED },
+}, {
+    // LED Index to Physical Position
+{224, 64}, {209, 64}, {195, 64}, {173, 61}, {151, 61}, {94 , 61}, {39 , 61}, {20 , 61}, {2  , 61}, {9  , 50}, {33 , 50},
+{48 , 50}, {62 , 50}, {77 , 50}, {92 , 50}, {106, 50}, {121, 50}, {136, 50}, {151, 50}, {165, 50}, {185, 50}, {209, 53},
+{196, 39}, {173, 39}, {158, 39}, {143, 39}, {129, 39}, {114, 39}, {99 , 39}, {84 , 39}, {70 , 39}, {55 , 39}, {40 , 39},
+{26 , 39}, {6  , 39}, {4  , 28}, {22 , 28}, {37 , 28}, {51 , 28}, {66 , 28}, {81 , 28}, {95 , 28}, {110, 28}, {125, 28},
+{140, 28}, {154, 28}, {169, 28}, {184, 28}, {202, 28}, {224, 28}, {224, 17}, {198, 17}, {176, 17}, {162, 17}, {147, 17},
+{132, 17}, {118, 17}, {103, 17}, {88 , 17}, {73 , 17}, {59 , 17}, {44 , 17}, {29 , 17}, {15 , 17}, {0  , 17}, {0  ,  0},
+{18 ,  0}, {33 ,  0}, {48 ,  0}, {62 ,  0}, {81 ,  0}, {95 ,  0}, {110,  0}, {125,  0}, {143,  0}, {158,  0}, {173,  0},
+{187,  0}, {206,  0}, {224,  0},
+
+{ 207,  13},
+{ 207,  32},
+{ 207,  51},{ 174,  51},{ 141,  51},{ 108,  51},{ 73,  51},{ 40,  51},{  13,  51 },
+{ 13,  32},
+{ 13,  13},{ 40,  13},{ 73,  13},{ 108,  13},{ 141,  13},{ 174,  13},
+
+}, {
+    // LED Index to Flag
+1,1,1,1,1,4,1,1,1,
+1,4,4,4,4,4,4,4,4,4,4,1,1,
+1,4,4,4,4,4,4,4,4,4,4,4,1,
+1,4,4,4,4,4,4,4,4,4,4,4,4,4,1,
+1,1,4,4,4,4,4,4,4,4,4,4,4,4,4,
+1,4,4,4,4,1,1,1,1,4,4,4,4,1,1,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+
+} };
+
+#endif
diff --git a/keyboards/idobao/id80/v3/v3.h b/keyboards/idobao/id80/v3/v3.h
new file mode 100644
index 0000000000..94626fe4f6
--- /dev/null
+++ b/keyboards/idobao/id80/v3/v3.h
@@ -0,0 +1,37 @@
+/* Copyright 2020 Sergey Vlasov <sigprof@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+    K50,  K51, K52, K53, K54,  K55, K56, K57, K58,  KA7, KA5, KA4, KA3,   KA6,  KA2,  \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K98, K97, K95, K94, K96,       K92,  \
+    K30,   K31, K32, K33, K34, K35, K36, K37, K38, K88, K87, K85, K84, K83,     K82,  \
+    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K78, K77, K75, K74,               \
+    K10,       K12, K13, K14, K15, K16, K17, K18, K68, K67, K65, K64,      K63,       \
+    K00,  K01,  K02,              K06,                K08,   K07,     K05, K04, K03   \
+) { \
+    { K00,   K10,   K20,   K30,   K40,   K50,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
+    { K01,   KC_NO, K21,   K31,   K41,   K51,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
+    { K02,   K12,   K22,   K32,   K42,   K52,   KC_NO, KC_NO, K82,   K92,   KA2   }, \
+    { K03,   K13,   K23,   K33,   K43,   K53,   K63,   KC_NO, K83,   KC_NO, KA3   }, \
+    { K04,   K14,   K24,   K34,   K44,   K54,   K64,   K74,   K84,   K94,   KA4   }, \
+    { K05,   K15,   K25,   K35,   K45,   K55,   K65,   K75,   K85,   K95,   KA5   }, \
+    { K06,   K16,   K26,   K36,   K46,   K56,   KC_NO, KC_NO, KC_NO, K96,   KA6   }, \
+    { K07,   K17,   K27,   K37,   K47,   K57,   K67,   K77,   K87,   K97,   KA7   }, \
+    { K08,   K18,   K28,   K38,   K48,   K58,   K68,   K78,   K88,   K98,   KC_NO }, \
+}
diff --git a/keyboards/id87/config.h b/keyboards/idobao/id87/v1/config.h
similarity index 100%
rename from keyboards/id87/config.h
rename to keyboards/idobao/id87/v1/config.h
diff --git a/keyboards/id87/info.json b/keyboards/idobao/id87/v1/info.json
similarity index 100%
rename from keyboards/id87/info.json
rename to keyboards/idobao/id87/v1/info.json
diff --git a/keyboards/id87/keymaps/default/keymap.c b/keyboards/idobao/id87/v1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/id87/keymaps/default/keymap.c
rename to keyboards/idobao/id87/v1/keymaps/default/keymap.c
diff --git a/keyboards/id87/keymaps/default/readme.md b/keyboards/idobao/id87/v1/keymaps/default/readme.md
similarity index 100%
rename from keyboards/id87/keymaps/default/readme.md
rename to keyboards/idobao/id87/v1/keymaps/default/readme.md
diff --git a/keyboards/id87/keymaps/via/keymap.c b/keyboards/idobao/id87/v1/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/id87/keymaps/via/keymap.c
rename to keyboards/idobao/id87/v1/keymaps/via/keymap.c
diff --git a/keyboards/idobao/id87/v1/keymaps/via/rules.mk b/keyboards/idobao/id87/v1/keymaps/via/rules.mk
new file mode 100644
index 0000000000..ca9fed0e6b
--- /dev/null
+++ b/keyboards/idobao/id87/v1/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+LTO_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/keyboards/id87/readme.md b/keyboards/idobao/id87/v1/readme.md
similarity index 91%
rename from keyboards/id87/readme.md
rename to keyboards/idobao/id87/v1/readme.md
index ee3604f849..59814f81f7 100644
--- a/keyboards/id87/readme.md
+++ b/keyboards/idobao/id87/v1/readme.md
@@ -10,10 +10,10 @@ A TKL hotswap board from IDOBAO.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make id87:default
+    make idobao/id87/v1:default
 
 Flashing example for this keyboard:
 
-    make id87:default:flash
+    make idobao/id87/v1:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/id87/rules.mk b/keyboards/idobao/id87/v1/rules.mk
similarity index 100%
rename from keyboards/id87/rules.mk
rename to keyboards/idobao/id87/v1/rules.mk
diff --git a/keyboards/id87/id87.c b/keyboards/idobao/id87/v1/v1.c
similarity index 97%
rename from keyboards/id87/id87.c
rename to keyboards/idobao/id87/v1/v1.c
index 145edc1639..59dc3daab4 100644
--- a/keyboards/id87/id87.c
+++ b/keyboards/idobao/id87/v1/v1.c
@@ -12,4 +12,4 @@ 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 "id87.h"
+#include "v1.h"
diff --git a/keyboards/id87/id87.h b/keyboards/idobao/id87/v1/v1.h
similarity index 100%
rename from keyboards/id87/id87.h
rename to keyboards/idobao/id87/v1/v1.h
diff --git a/keyboards/montex/config.h b/keyboards/idobao/montex/v1/config.h
similarity index 100%
rename from keyboards/montex/config.h
rename to keyboards/idobao/montex/v1/config.h
diff --git a/keyboards/montex/info.json b/keyboards/idobao/montex/v1/info.json
similarity index 100%
rename from keyboards/montex/info.json
rename to keyboards/idobao/montex/v1/info.json
diff --git a/keyboards/montex/keymaps/default/keymap.c b/keyboards/idobao/montex/v1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/montex/keymaps/default/keymap.c
rename to keyboards/idobao/montex/v1/keymaps/default/keymap.c
diff --git a/keyboards/montex/keymaps/via/keymap.c b/keyboards/idobao/montex/v1/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/montex/keymaps/via/keymap.c
rename to keyboards/idobao/montex/v1/keymaps/via/keymap.c
diff --git a/keyboards/idobao/montex/v1/keymaps/via/rules.mk b/keyboards/idobao/montex/v1/keymaps/via/rules.mk
new file mode 100644
index 0000000000..ca9fed0e6b
--- /dev/null
+++ b/keyboards/idobao/montex/v1/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+LTO_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/keyboards/montex/readme.md b/keyboards/idobao/montex/v1/readme.md
similarity index 97%
rename from keyboards/montex/readme.md
rename to keyboards/idobao/montex/v1/readme.md
index 8c4a7226ce..e9d84fa674 100644
--- a/keyboards/montex/readme.md
+++ b/keyboards/idobao/montex/v1/readme.md
@@ -16,6 +16,6 @@ Then press the button labeled SW2 located between the 2 upper LEDs.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make montex:default
+    make idobao/montex/v1:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/montex/rules.mk b/keyboards/idobao/montex/v1/rules.mk
similarity index 100%
rename from keyboards/montex/rules.mk
rename to keyboards/idobao/montex/v1/rules.mk
diff --git a/keyboards/montex/montex.c b/keyboards/idobao/montex/v1/v1.c
similarity index 97%
rename from keyboards/montex/montex.c
rename to keyboards/idobao/montex/v1/v1.c
index 4d3ecb1860..e927383097 100644
--- a/keyboards/montex/montex.c
+++ b/keyboards/idobao/montex/v1/v1.c
@@ -14,4 +14,4 @@
 * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.
 */
 
-#include "montex.h"
+#include "v1.h"
diff --git a/keyboards/montex/montex.h b/keyboards/idobao/montex/v1/v1.h
similarity index 100%
rename from keyboards/montex/montex.h
rename to keyboards/idobao/montex/v1/v1.h
diff --git a/keyboards/ergodox_infinity/MEMO.txt b/keyboards/input_club/ergodox_infinity/MEMO.txt
similarity index 100%
rename from keyboards/ergodox_infinity/MEMO.txt
rename to keyboards/input_club/ergodox_infinity/MEMO.txt
diff --git a/keyboards/ergodox_infinity/chconf.h b/keyboards/input_club/ergodox_infinity/chconf.h
similarity index 100%
rename from keyboards/ergodox_infinity/chconf.h
rename to keyboards/input_club/ergodox_infinity/chconf.h
diff --git a/keyboards/ergodox_infinity/config.h b/keyboards/input_club/ergodox_infinity/config.h
similarity index 100%
rename from keyboards/ergodox_infinity/config.h
rename to keyboards/input_club/ergodox_infinity/config.h
diff --git a/keyboards/ergodox_infinity/ergodox_infinity.c b/keyboards/input_club/ergodox_infinity/ergodox_infinity.c
similarity index 100%
rename from keyboards/ergodox_infinity/ergodox_infinity.c
rename to keyboards/input_club/ergodox_infinity/ergodox_infinity.c
diff --git a/keyboards/ergodox_infinity/ergodox_infinity.h b/keyboards/input_club/ergodox_infinity/ergodox_infinity.h
similarity index 100%
rename from keyboards/ergodox_infinity/ergodox_infinity.h
rename to keyboards/input_club/ergodox_infinity/ergodox_infinity.h
diff --git a/keyboards/ergodox_infinity/halconf.h b/keyboards/input_club/ergodox_infinity/halconf.h
similarity index 100%
rename from keyboards/ergodox_infinity/halconf.h
rename to keyboards/input_club/ergodox_infinity/halconf.h
diff --git a/keyboards/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/info.json
similarity index 100%
rename from keyboards/ergodox_infinity/info.json
rename to keyboards/input_club/ergodox_infinity/info.json
diff --git a/keyboards/ergodox_infinity/keymaps/default/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/default/keymap.c
rename to keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/dudeofawesome/README.md b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/README.md
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/dudeofawesome/README.md
rename to keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/README.md
diff --git a/keyboards/ergodox_infinity/keymaps/dudeofawesome/config.h b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/config.h
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/dudeofawesome/config.h
rename to keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/config.h
diff --git a/keyboards/ergodox_infinity/keymaps/dudeofawesome/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/dudeofawesome/keymap.c
rename to keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/dudeofawesome/layers.h b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/layers.h
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/dudeofawesome/layers.h
rename to keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/layers.h
diff --git a/keyboards/ergodox_infinity/keymaps/gordon/config.h b/keyboards/input_club/ergodox_infinity/keymaps/gordon/config.h
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/gordon/config.h
rename to keyboards/input_club/ergodox_infinity/keymaps/gordon/config.h
diff --git a/keyboards/ergodox_infinity/keymaps/gordon/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/gordon/keymap.c
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/gordon/keymap.c
rename to keyboards/input_club/ergodox_infinity/keymaps/gordon/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/gordon/rules.mk b/keyboards/input_club/ergodox_infinity/keymaps/gordon/rules.mk
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/gordon/rules.mk
rename to keyboards/input_club/ergodox_infinity/keymaps/gordon/rules.mk
diff --git a/keyboards/ergodox_infinity/keymaps/halfkeyboard/config.h b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/config.h
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/halfkeyboard/config.h
rename to keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/config.h
diff --git a/keyboards/ergodox_infinity/keymaps/halfkeyboard/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/halfkeyboard/keymap.c
rename to keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/halfkeyboard/rules.mk b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/rules.mk
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/halfkeyboard/rules.mk
rename to keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/rules.mk
diff --git a/keyboards/ergodox_infinity/keymaps/input_club/README.md b/keyboards/input_club/ergodox_infinity/keymaps/input_club/README.md
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/input_club/README.md
rename to keyboards/input_club/ergodox_infinity/keymaps/input_club/README.md
diff --git a/keyboards/ergodox_infinity/keymaps/input_club/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/input_club/keymap.c
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/input_club/keymap.c
rename to keyboards/input_club/ergodox_infinity/keymaps/input_club/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/narze/config.h b/keyboards/input_club/ergodox_infinity/keymaps/narze/config.h
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/narze/config.h
rename to keyboards/input_club/ergodox_infinity/keymaps/narze/config.h
diff --git a/keyboards/ergodox_infinity/keymaps/narze/default.png.md b/keyboards/input_club/ergodox_infinity/keymaps/narze/default.png.md
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/narze/default.png.md
rename to keyboards/input_club/ergodox_infinity/keymaps/narze/default.png.md
diff --git a/keyboards/ergodox_infinity/keymaps/narze/default_highres.png.md b/keyboards/input_club/ergodox_infinity/keymaps/narze/default_highres.png.md
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/narze/default_highres.png.md
rename to keyboards/input_club/ergodox_infinity/keymaps/narze/default_highres.png.md
diff --git a/keyboards/ergodox_infinity/keymaps/narze/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/narze/keymap.c
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/narze/keymap.c
rename to keyboards/input_club/ergodox_infinity/keymaps/narze/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/narze/readme.md b/keyboards/input_club/ergodox_infinity/keymaps/narze/readme.md
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/narze/readme.md
rename to keyboards/input_club/ergodox_infinity/keymaps/narze/readme.md
diff --git a/keyboards/ergodox_infinity/keymaps/narze/rules.mk b/keyboards/input_club/ergodox_infinity/keymaps/narze/rules.mk
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/narze/rules.mk
rename to keyboards/input_club/ergodox_infinity/keymaps/narze/rules.mk
diff --git a/keyboards/ergodox_infinity/keymaps/narze/visualizer.c b/keyboards/input_club/ergodox_infinity/keymaps/narze/visualizer.c
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/narze/visualizer.c
rename to keyboards/input_club/ergodox_infinity/keymaps/narze/visualizer.c
diff --git a/keyboards/ergodox_infinity/keymaps/nordic_ergo/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/nordic_ergo/keymap.c
rename to keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/nordic_ergo/readme.md b/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/readme.md
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/nordic_ergo/readme.md
rename to keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/readme.md
diff --git a/keyboards/ergodox_infinity/keymaps/not-quite-neo/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/not-quite-neo/keymap.c
rename to keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/not-quite-neo/readme.md b/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/readme.md
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/not-quite-neo/readme.md
rename to keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/readme.md
diff --git a/keyboards/ergodox_infinity/keymaps/not-quite-neo/rules.mk b/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/rules.mk
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/not-quite-neo/rules.mk
rename to keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/rules.mk
diff --git a/keyboards/ergodox_infinity/keymaps/rask/README.md b/keyboards/input_club/ergodox_infinity/keymaps/rask/README.md
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/rask/README.md
rename to keyboards/input_club/ergodox_infinity/keymaps/rask/README.md
diff --git a/keyboards/ergodox_infinity/keymaps/rask/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/rask/keymap.c
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/rask/keymap.c
rename to keyboards/input_club/ergodox_infinity/keymaps/rask/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/rjhilgefort/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/keymap.c
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/rjhilgefort/keymap.c
rename to keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/rjhilgefort/readme.md b/keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/readme.md
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/rjhilgefort/readme.md
rename to keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/readme.md
diff --git a/keyboards/ergodox_infinity/keymaps/trulyergonomic/README.md b/keyboards/input_club/ergodox_infinity/keymaps/trulyergonomic/README.md
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/trulyergonomic/README.md
rename to keyboards/input_club/ergodox_infinity/keymaps/trulyergonomic/README.md
diff --git a/keyboards/ergodox_infinity/keymaps/trulyergonomic/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/trulyergonomic/keymap.c
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/trulyergonomic/keymap.c
rename to keyboards/input_club/ergodox_infinity/keymaps/trulyergonomic/keymap.c
diff --git a/keyboards/ergodox_infinity/mcuconf.h b/keyboards/input_club/ergodox_infinity/mcuconf.h
similarity index 100%
rename from keyboards/ergodox_infinity/mcuconf.h
rename to keyboards/input_club/ergodox_infinity/mcuconf.h
diff --git a/keyboards/ergodox_infinity/readme.md b/keyboards/input_club/ergodox_infinity/readme.md
similarity index 83%
rename from keyboards/ergodox_infinity/readme.md
rename to keyboards/input_club/ergodox_infinity/readme.md
index c51bdd7c82..1f8b643340 100644
--- a/keyboards/ergodox_infinity/readme.md
+++ b/keyboards/input_club/ergodox_infinity/readme.md
@@ -5,19 +5,19 @@ for the left and right halves seperately.  To flash them:
 
   - Make sure you are in the top-level qmk_firmware directory
 
-  - Build the firmware with `make ergodox_infinity:keymapname`
+  - Build the firmware with `make input_club/ergodox_infinity:keymapname`
 
   - Plug in the left hand keyboard only.
 
   - Press the program button (back of keyboard, above thumb pad).
 
-  - Install the firmware with `sudo make ergodox_infinity:keymapname:dfu-util`
+  - Install the firmware with `sudo make input_club/ergodox_infinity:keymapname:dfu-util`
 
   - Plug in the right hand keyboard only.
 
   - Press the program button (back of keyboard, above thumb pad).
 
-  - Install the firmware with `sudo make ergodox_infinity:keymapname:dfu-util`
+  - Install the firmware with `sudo make input_club/ergodox_infinity:keymapname:dfu-util`
 
 More information on the Infinity firmware is available in the [TMK/chibios for
 Input Club Infinity Ergodox](https://github.com/fredizzimo/infinity_ergodox/blob/master/README.md)
@@ -43,7 +43,7 @@ They only need to be done once, unless you reset the EEPROM later.
 
   - Plug in the left keyboard half to the computer, and press its program button.
 
-  - Flash the left half with `make ergodox_infinity:default:dfu-util-split-left`
+  - Flash the left half with `make input_club/ergodox_infinity:default:dfu-util-split-left`
     (If you need to use a different method to flash your keyboard, still run this command,
     and abort it with Ctrl+C when the flashing attempts starts to print errors,
     then flash the built firmware).
@@ -53,13 +53,13 @@ They only need to be done once, unless you reset the EEPROM later.
 
   - Plug in the right keyboard half to the computer, and press its program button.
 
-  - Flash the right half with `make ergodox_infinity:default:dfu-util-split-right`
+  - Flash the right half with `make input_club/ergodox_infinity:default:dfu-util-split-right`
 
   - On the right half, press the top vertical 1.5U key (second from the top in the leftmost column) once,
     then the 1U key at the bottom in the opposite corner (bottom right corner).
 
   - Add `#define EE_HANDS` to the config.h file of your keymap, and build your firmware using
-    `make ergodox_infinity:keymapname`.
+    `make input_club/ergodox_infinity:keymapname`.
 
   - After this, you can flash both halves with the same firmware, _without_ risking a mirrored keyboard when connected the wrong way.
     If you reset your EEPROM later, you'll have to follow these steps again, though.
diff --git a/keyboards/ergodox_infinity/rules.mk b/keyboards/input_club/ergodox_infinity/rules.mk
similarity index 100%
rename from keyboards/ergodox_infinity/rules.mk
rename to keyboards/input_club/ergodox_infinity/rules.mk
diff --git a/keyboards/infinity60/chconf.h b/keyboards/input_club/infinity60/chconf.h
similarity index 100%
rename from keyboards/infinity60/chconf.h
rename to keyboards/input_club/infinity60/chconf.h
diff --git a/keyboards/infinity60/config.h b/keyboards/input_club/infinity60/config.h
similarity index 100%
rename from keyboards/infinity60/config.h
rename to keyboards/input_club/infinity60/config.h
diff --git a/keyboards/infinity60/halconf.h b/keyboards/input_club/infinity60/halconf.h
similarity index 100%
rename from keyboards/infinity60/halconf.h
rename to keyboards/input_club/infinity60/halconf.h
diff --git a/keyboards/infinity60/infinity60.c b/keyboards/input_club/infinity60/infinity60.c
similarity index 100%
rename from keyboards/infinity60/infinity60.c
rename to keyboards/input_club/infinity60/infinity60.c
diff --git a/keyboards/infinity60/infinity60.h b/keyboards/input_club/infinity60/infinity60.h
similarity index 100%
rename from keyboards/infinity60/infinity60.h
rename to keyboards/input_club/infinity60/infinity60.h
diff --git a/keyboards/infinity60/info.json b/keyboards/input_club/infinity60/info.json
similarity index 100%
rename from keyboards/infinity60/info.json
rename to keyboards/input_club/infinity60/info.json
diff --git a/keyboards/infinity60/keymaps/default/keymap.c b/keyboards/input_club/infinity60/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/infinity60/keymaps/default/keymap.c
rename to keyboards/input_club/infinity60/keymaps/default/keymap.c
diff --git a/keyboards/infinity60/keymaps/depariel/keymap.c b/keyboards/input_club/infinity60/keymaps/depariel/keymap.c
similarity index 100%
rename from keyboards/infinity60/keymaps/depariel/keymap.c
rename to keyboards/input_club/infinity60/keymaps/depariel/keymap.c
diff --git a/keyboards/infinity60/keymaps/hasu/keymap.c b/keyboards/input_club/infinity60/keymaps/hasu/keymap.c
similarity index 100%
rename from keyboards/infinity60/keymaps/hasu/keymap.c
rename to keyboards/input_club/infinity60/keymaps/hasu/keymap.c
diff --git a/keyboards/infinity60/keymaps/jpetermans/config.h b/keyboards/input_club/infinity60/keymaps/jpetermans/config.h
similarity index 100%
rename from keyboards/infinity60/keymaps/jpetermans/config.h
rename to keyboards/input_club/infinity60/keymaps/jpetermans/config.h
diff --git a/keyboards/infinity60/keymaps/jpetermans/keymap.c b/keyboards/input_club/infinity60/keymaps/jpetermans/keymap.c
similarity index 100%
rename from keyboards/infinity60/keymaps/jpetermans/keymap.c
rename to keyboards/input_club/infinity60/keymaps/jpetermans/keymap.c
diff --git a/keyboards/infinity60/keymaps/jpetermans/readme.md b/keyboards/input_club/infinity60/keymaps/jpetermans/readme.md
similarity index 100%
rename from keyboards/infinity60/keymaps/jpetermans/readme.md
rename to keyboards/input_club/infinity60/keymaps/jpetermans/readme.md
diff --git a/keyboards/infinity60/led.c b/keyboards/input_club/infinity60/led.c
similarity index 100%
rename from keyboards/infinity60/led.c
rename to keyboards/input_club/infinity60/led.c
diff --git a/keyboards/infinity60/led/config.h b/keyboards/input_club/infinity60/led/config.h
similarity index 100%
rename from keyboards/infinity60/led/config.h
rename to keyboards/input_club/infinity60/led/config.h
diff --git a/keyboards/infinity60/led/readme.md b/keyboards/input_club/infinity60/led/readme.md
similarity index 100%
rename from keyboards/infinity60/led/readme.md
rename to keyboards/input_club/infinity60/led/readme.md
diff --git a/keyboards/infinity60/led/rules.mk b/keyboards/input_club/infinity60/led/rules.mk
similarity index 100%
rename from keyboards/infinity60/led/rules.mk
rename to keyboards/input_club/infinity60/led/rules.mk
diff --git a/keyboards/infinity60/led_controller.c b/keyboards/input_club/infinity60/led_controller.c
similarity index 100%
rename from keyboards/infinity60/led_controller.c
rename to keyboards/input_club/infinity60/led_controller.c
diff --git a/keyboards/infinity60/led_controller.h b/keyboards/input_club/infinity60/led_controller.h
similarity index 100%
rename from keyboards/infinity60/led_controller.h
rename to keyboards/input_club/infinity60/led_controller.h
diff --git a/keyboards/infinity60/mcuconf.h b/keyboards/input_club/infinity60/mcuconf.h
similarity index 100%
rename from keyboards/infinity60/mcuconf.h
rename to keyboards/input_club/infinity60/mcuconf.h
diff --git a/keyboards/infinity60/readme.md b/keyboards/input_club/infinity60/readme.md
similarity index 86%
rename from keyboards/infinity60/readme.md
rename to keyboards/input_club/infinity60/readme.md
index d99d1df080..e8ee6a9dad 100644
--- a/keyboards/infinity60/readme.md
+++ b/keyboards/input_club/infinity60/readme.md
@@ -8,10 +8,10 @@ A compact community driven keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make infinity60:default
+    make input_club/infinity60/rev1:default
 
 Flashing example for this keyboard:
 
-    make infinity60:default:flash
+    make input_club/infinity60/rev1:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/infinity60/rev1/config.h b/keyboards/input_club/infinity60/rev1/config.h
similarity index 100%
rename from keyboards/infinity60/rev1/config.h
rename to keyboards/input_club/infinity60/rev1/config.h
diff --git a/keyboards/infinity60/rev1/readme.md b/keyboards/input_club/infinity60/rev1/readme.md
similarity index 100%
rename from keyboards/infinity60/rev1/readme.md
rename to keyboards/input_club/infinity60/rev1/readme.md
diff --git a/keyboards/infinity60/rev1/rules.mk b/keyboards/input_club/infinity60/rev1/rules.mk
similarity index 100%
rename from keyboards/infinity60/rev1/rules.mk
rename to keyboards/input_club/infinity60/rev1/rules.mk
diff --git a/keyboards/infinity60/rules.mk b/keyboards/input_club/infinity60/rules.mk
similarity index 95%
rename from keyboards/infinity60/rules.mk
rename to keyboards/input_club/infinity60/rules.mk
index a3e05edde1..7e21a06a9b 100644
--- a/keyboards/infinity60/rules.mk
+++ b/keyboards/input_club/infinity60/rules.mk
@@ -26,7 +26,7 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-DEFAULT_FOLDER = infinity60/led
+DEFAULT_FOLDER = input_club/infinity60/led
 
 LAYOUTS = 60_ansi_split_bs_rshift
 
diff --git a/keyboards/k_type/chconf.h b/keyboards/input_club/k_type/chconf.h
similarity index 100%
rename from keyboards/k_type/chconf.h
rename to keyboards/input_club/k_type/chconf.h
diff --git a/keyboards/k_type/config.h b/keyboards/input_club/k_type/config.h
similarity index 100%
rename from keyboards/k_type/config.h
rename to keyboards/input_club/k_type/config.h
diff --git a/keyboards/k_type/halconf.h b/keyboards/input_club/k_type/halconf.h
similarity index 100%
rename from keyboards/k_type/halconf.h
rename to keyboards/input_club/k_type/halconf.h
diff --git a/keyboards/k_type/i2c_master.c b/keyboards/input_club/k_type/i2c_master.c
similarity index 100%
rename from keyboards/k_type/i2c_master.c
rename to keyboards/input_club/k_type/i2c_master.c
diff --git a/keyboards/k_type/i2c_master.h b/keyboards/input_club/k_type/i2c_master.h
similarity index 100%
rename from keyboards/k_type/i2c_master.h
rename to keyboards/input_club/k_type/i2c_master.h
diff --git a/keyboards/k_type/info.json b/keyboards/input_club/k_type/info.json
similarity index 100%
rename from keyboards/k_type/info.json
rename to keyboards/input_club/k_type/info.json
diff --git a/keyboards/k_type/is31fl3733-dual.c b/keyboards/input_club/k_type/is31fl3733-dual.c
similarity index 100%
rename from keyboards/k_type/is31fl3733-dual.c
rename to keyboards/input_club/k_type/is31fl3733-dual.c
diff --git a/keyboards/k_type/is31fl3733-dual.h b/keyboards/input_club/k_type/is31fl3733-dual.h
similarity index 100%
rename from keyboards/k_type/is31fl3733-dual.h
rename to keyboards/input_club/k_type/is31fl3733-dual.h
diff --git a/keyboards/k_type/k_type-rgbdriver.c b/keyboards/input_club/k_type/k_type-rgbdriver.c
similarity index 100%
rename from keyboards/k_type/k_type-rgbdriver.c
rename to keyboards/input_club/k_type/k_type-rgbdriver.c
diff --git a/keyboards/k_type/k_type.c b/keyboards/input_club/k_type/k_type.c
similarity index 100%
rename from keyboards/k_type/k_type.c
rename to keyboards/input_club/k_type/k_type.c
diff --git a/keyboards/k_type/k_type.h b/keyboards/input_club/k_type/k_type.h
similarity index 100%
rename from keyboards/k_type/k_type.h
rename to keyboards/input_club/k_type/k_type.h
diff --git a/keyboards/k_type/keymaps/andrew-fahmy/config.h b/keyboards/input_club/k_type/keymaps/andrew-fahmy/config.h
similarity index 100%
rename from keyboards/k_type/keymaps/andrew-fahmy/config.h
rename to keyboards/input_club/k_type/keymaps/andrew-fahmy/config.h
diff --git a/keyboards/k_type/keymaps/andrew-fahmy/keymap.c b/keyboards/input_club/k_type/keymaps/andrew-fahmy/keymap.c
similarity index 100%
rename from keyboards/k_type/keymaps/andrew-fahmy/keymap.c
rename to keyboards/input_club/k_type/keymaps/andrew-fahmy/keymap.c
diff --git a/keyboards/k_type/keymaps/andrew-fahmy/rules.mk b/keyboards/input_club/k_type/keymaps/andrew-fahmy/rules.mk
similarity index 100%
rename from keyboards/k_type/keymaps/andrew-fahmy/rules.mk
rename to keyboards/input_club/k_type/keymaps/andrew-fahmy/rules.mk
diff --git a/keyboards/k_type/keymaps/belak/keymap.c b/keyboards/input_club/k_type/keymaps/belak/keymap.c
similarity index 100%
rename from keyboards/k_type/keymaps/belak/keymap.c
rename to keyboards/input_club/k_type/keymaps/belak/keymap.c
diff --git a/keyboards/k_type/keymaps/default/keymap.c b/keyboards/input_club/k_type/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/k_type/keymaps/default/keymap.c
rename to keyboards/input_club/k_type/keymaps/default/keymap.c
diff --git a/keyboards/k_type/keymaps/default/rules.mk b/keyboards/input_club/k_type/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/k_type/keymaps/default/rules.mk
rename to keyboards/input_club/k_type/keymaps/default/rules.mk
diff --git a/keyboards/k_type/mcuconf.h b/keyboards/input_club/k_type/mcuconf.h
similarity index 100%
rename from keyboards/k_type/mcuconf.h
rename to keyboards/input_club/k_type/mcuconf.h
diff --git a/keyboards/k_type/readme.md b/keyboards/input_club/k_type/readme.md
similarity index 90%
rename from keyboards/k_type/readme.md
rename to keyboards/input_club/k_type/readme.md
index 11123c357c..a69ca38d4d 100644
--- a/keyboards/k_type/readme.md
+++ b/keyboards/input_club/k_type/readme.md
@@ -8,10 +8,10 @@ Firmware for custom keyboard PCB with TKL Key Layout
 
 Make example for this keyboard (after setting up your build environment):
 
-    make k_type:default
+    make input_club/k_type:default
 
 Flashing example for this keyboard:
 
-    make k_type:default:flash
+    make input_club/k_type:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/k_type/rules.mk b/keyboards/input_club/k_type/rules.mk
similarity index 100%
rename from keyboards/k_type/rules.mk
rename to keyboards/input_club/k_type/rules.mk
diff --git a/keyboards/whitefox/board_is31fl3731c.h b/keyboards/input_club/whitefox/board_is31fl3731c.h
similarity index 100%
rename from keyboards/whitefox/board_is31fl3731c.h
rename to keyboards/input_club/whitefox/board_is31fl3731c.h
diff --git a/keyboards/whitefox/chconf.h b/keyboards/input_club/whitefox/chconf.h
similarity index 100%
rename from keyboards/whitefox/chconf.h
rename to keyboards/input_club/whitefox/chconf.h
diff --git a/keyboards/whitefox/config.h b/keyboards/input_club/whitefox/config.h
similarity index 100%
rename from keyboards/whitefox/config.h
rename to keyboards/input_club/whitefox/config.h
diff --git a/keyboards/whitefox/halconf.h b/keyboards/input_club/whitefox/halconf.h
similarity index 100%
rename from keyboards/whitefox/halconf.h
rename to keyboards/input_club/whitefox/halconf.h
diff --git a/keyboards/whitefox/info.json b/keyboards/input_club/whitefox/info.json
similarity index 100%
rename from keyboards/whitefox/info.json
rename to keyboards/input_club/whitefox/info.json
diff --git a/keyboards/whitefox/keymaps/billypython/config.h b/keyboards/input_club/whitefox/keymaps/billypython/config.h
similarity index 100%
rename from keyboards/whitefox/keymaps/billypython/config.h
rename to keyboards/input_club/whitefox/keymaps/billypython/config.h
diff --git a/keyboards/whitefox/keymaps/billypython/keymap.c b/keyboards/input_club/whitefox/keymaps/billypython/keymap.c
similarity index 100%
rename from keyboards/whitefox/keymaps/billypython/keymap.c
rename to keyboards/input_club/whitefox/keymaps/billypython/keymap.c
diff --git a/keyboards/whitefox/keymaps/billypython/rules.mk b/keyboards/input_club/whitefox/keymaps/billypython/rules.mk
similarity index 100%
rename from keyboards/whitefox/keymaps/billypython/rules.mk
rename to keyboards/input_club/whitefox/keymaps/billypython/rules.mk
diff --git a/keyboards/whitefox/keymaps/default/keymap.c b/keyboards/input_club/whitefox/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/whitefox/keymaps/default/keymap.c
rename to keyboards/input_club/whitefox/keymaps/default/keymap.c
diff --git a/keyboards/whitefox/keymaps/dhertz/keymap.c b/keyboards/input_club/whitefox/keymaps/dhertz/keymap.c
similarity index 100%
rename from keyboards/whitefox/keymaps/dhertz/keymap.c
rename to keyboards/input_club/whitefox/keymaps/dhertz/keymap.c
diff --git a/keyboards/whitefox/keymaps/dudeofawesome/keymap.c b/keyboards/input_club/whitefox/keymaps/dudeofawesome/keymap.c
similarity index 100%
rename from keyboards/whitefox/keymaps/dudeofawesome/keymap.c
rename to keyboards/input_club/whitefox/keymaps/dudeofawesome/keymap.c
diff --git a/keyboards/whitefox/keymaps/dudeofawesome/readme.md b/keyboards/input_club/whitefox/keymaps/dudeofawesome/readme.md
similarity index 100%
rename from keyboards/whitefox/keymaps/dudeofawesome/readme.md
rename to keyboards/input_club/whitefox/keymaps/dudeofawesome/readme.md
diff --git a/keyboards/whitefox/keymaps/jetpacktuxedo/keymap.c b/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/keymap.c
similarity index 100%
rename from keyboards/whitefox/keymaps/jetpacktuxedo/keymap.c
rename to keyboards/input_club/whitefox/keymaps/jetpacktuxedo/keymap.c
diff --git a/keyboards/whitefox/keymaps/jetpacktuxedo/readme.md b/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/readme.md
similarity index 100%
rename from keyboards/whitefox/keymaps/jetpacktuxedo/readme.md
rename to keyboards/input_club/whitefox/keymaps/jetpacktuxedo/readme.md
diff --git a/keyboards/whitefox/keymaps/jetpacktuxedo/rules.mk b/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/rules.mk
similarity index 100%
rename from keyboards/whitefox/keymaps/jetpacktuxedo/rules.mk
rename to keyboards/input_club/whitefox/keymaps/jetpacktuxedo/rules.mk
diff --git a/keyboards/whitefox/keymaps/kim-kim/keymap.c b/keyboards/input_club/whitefox/keymaps/kim-kim/keymap.c
similarity index 100%
rename from keyboards/whitefox/keymaps/kim-kim/keymap.c
rename to keyboards/input_club/whitefox/keymaps/kim-kim/keymap.c
diff --git a/keyboards/whitefox/keymaps/konstantin/config.h b/keyboards/input_club/whitefox/keymaps/konstantin/config.h
similarity index 100%
rename from keyboards/whitefox/keymaps/konstantin/config.h
rename to keyboards/input_club/whitefox/keymaps/konstantin/config.h
diff --git a/keyboards/whitefox/keymaps/konstantin/keymap.c b/keyboards/input_club/whitefox/keymaps/konstantin/keymap.c
similarity index 100%
rename from keyboards/whitefox/keymaps/konstantin/keymap.c
rename to keyboards/input_club/whitefox/keymaps/konstantin/keymap.c
diff --git a/keyboards/whitefox/keymaps/konstantin/rules.mk b/keyboards/input_club/whitefox/keymaps/konstantin/rules.mk
similarity index 100%
rename from keyboards/whitefox/keymaps/konstantin/rules.mk
rename to keyboards/input_club/whitefox/keymaps/konstantin/rules.mk
diff --git a/keyboards/whitefox/keymaps/matt3o/keymap.c b/keyboards/input_club/whitefox/keymaps/matt3o/keymap.c
similarity index 100%
rename from keyboards/whitefox/keymaps/matt3o/keymap.c
rename to keyboards/input_club/whitefox/keymaps/matt3o/keymap.c
diff --git a/keyboards/whitefox/keymaps/mattrighetti/keymap.c b/keyboards/input_club/whitefox/keymaps/mattrighetti/keymap.c
similarity index 100%
rename from keyboards/whitefox/keymaps/mattrighetti/keymap.c
rename to keyboards/input_club/whitefox/keymaps/mattrighetti/keymap.c
diff --git a/keyboards/whitefox/keymaps/mattrighetti/rules.mk b/keyboards/input_club/whitefox/keymaps/mattrighetti/rules.mk
similarity index 100%
rename from keyboards/whitefox/keymaps/mattrighetti/rules.mk
rename to keyboards/input_club/whitefox/keymaps/mattrighetti/rules.mk
diff --git a/keyboards/whitefox/mcuconf.h b/keyboards/input_club/whitefox/mcuconf.h
similarity index 100%
rename from keyboards/whitefox/mcuconf.h
rename to keyboards/input_club/whitefox/mcuconf.h
diff --git a/keyboards/whitefox/readme.md b/keyboards/input_club/whitefox/readme.md
similarity index 87%
rename from keyboards/whitefox/readme.md
rename to keyboards/input_club/whitefox/readme.md
index a170723e22..d6676f6ce7 100644
--- a/keyboards/whitefox/readme.md
+++ b/keyboards/input_club/whitefox/readme.md
@@ -8,10 +8,10 @@ A compact 65% keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make whitefox:default
+    make input_club/whitefox:default
 
 Flashing example for this keyboard:
 
-    make whitefox:default:flash
+    make input_club/whitefox:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/whitefox/rules.mk b/keyboards/input_club/whitefox/rules.mk
similarity index 100%
rename from keyboards/whitefox/rules.mk
rename to keyboards/input_club/whitefox/rules.mk
diff --git a/keyboards/whitefox/whitefox.c b/keyboards/input_club/whitefox/whitefox.c
similarity index 100%
rename from keyboards/whitefox/whitefox.c
rename to keyboards/input_club/whitefox/whitefox.c
diff --git a/keyboards/whitefox/whitefox.h b/keyboards/input_club/whitefox/whitefox.h
similarity index 100%
rename from keyboards/whitefox/whitefox.h
rename to keyboards/input_club/whitefox/whitefox.h
diff --git a/keyboards/jm60/jm60.c b/keyboards/jm60/jm60.c
index f7b434f30e..823892dce9 100644
--- a/keyboards/jm60/jm60.c
+++ b/keyboards/jm60/jm60.c
@@ -20,3 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 void board_init(void) {
 	AFIO->MAPR |= AFIO_MAPR_SWJ_CFG_JTAGDISABLE;
 }
+
+void bootloader_jump(void) {
+    // This board doesn't use the "standard" stm32duino bootloader. There's no information on how to jump to the custom bootloader, so all we can do here is reset.
+    NVIC_SystemReset();
+}
diff --git a/keyboards/jm60/rules.mk b/keyboards/jm60/rules.mk
index 6cb13d932d..c6de64a130 100644
--- a/keyboards/jm60/rules.mk
+++ b/keyboards/jm60/rules.mk
@@ -4,6 +4,9 @@ MCU = STM32F103
 MCU_LDSCRIPT = jm60_bootloader
 BOARD = ST_NUCLEO64_F103RB
 
+# Bootloader selection
+BOOTLOADER = custom
+
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/kapl/config.h b/keyboards/kapl/config.h
new file mode 100644
index 0000000000..ba249d4667
--- /dev/null
+++ b/keyboards/kapl/config.h
@@ -0,0 +1,5 @@
+// Copyright 2022 Alexander Lozyuk (@keyzog)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "config_common.h"
diff --git a/keyboards/kapl/info.json b/keyboards/kapl/info.json
new file mode 100644
index 0000000000..67e5470288
--- /dev/null
+++ b/keyboards/kapl/info.json
@@ -0,0 +1,85 @@
+{
+  "keyboard_name": "Kapl",
+  "url": "https://github.com/keyzog/kapl",
+  "maintainer": "keyzog",
+  "layouts": {
+      "LAYOUT": {
+          "layout": [
+              {"label":"L00", "x":0, "y":0.38},
+              {"label":"L01", "x":1, "y":0.38},
+              {"label":"L02", "x":2, "y":0.13},
+              {"label":"L03", "x":3, "y":0},
+              {"label":"L04", "x":4, "y":0.13},
+              {"label":"L05", "x":5, "y":0.25},
+              {"label":"L06", "x":6, "y":0.35},
+              {"label":"R00", "x":8.67, "y":0.35},
+              {"label":"R01", "x":9.67, "y":0.25},
+              {"label":"R02", "x":10.67, "y":0.13},
+              {"label":"R03", "x":11.67, "y":0},
+              {"label":"R04", "x":12.67, "y":0.13},
+              {"label":"R05", "x":13.67, "y":0.38},
+              {"label":"R06", "x":14.67, "y":0.38},
+
+              {"label":"L10", "x":0, "y":1.38},
+              {"label":"L11", "x":1, "y":1.38},
+              {"label":"L12", "x":2, "y":1.13},
+              {"label":"L13", "x":3, "y":1},
+              {"label":"L14", "x":4, "y":1.13},
+              {"label":"L15", "x":5, "y":1.25},
+              {"label":"L16", "x":6, "y":1.35},
+              {"label":"R10", "x":8.67, "y":1.35},
+              {"label":"R11", "x":9.67, "y":1.25},
+              {"label":"R12", "x":10.67, "y":1.13},
+              {"label":"R13", "x":11.67, "y":1},
+              {"label":"R14", "x":12.67, "y":1.13},
+              {"label":"R15", "x":13.67, "y":1.38},
+              {"label":"R16", "x":14.67, "y":1.38},
+
+              {"label":"L20", "x":0, "y":2.38},
+              {"label":"L21", "x":1, "y":2.38},
+              {"label":"L22", "x":2, "y":2.13},
+              {"label":"L23", "x":3, "y":2.0},
+              {"label":"L24", "x":4, "y":2.13},
+              {"label":"L25", "x":5, "y":2.25},
+              {"label":"L26", "x":6, "y":2.35},
+              {"label":"R20", "x":8.67, "y":2.35},
+              {"label":"R21", "x":9.67, "y":2.25},
+              {"label":"R22", "x":10.67, "y":2.13},
+              {"label":"R23", "x":11.67, "y":2.0},
+              {"label":"R24", "x":12.67, "y":2.13},
+              {"label":"R25", "x":13.67, "y":2.38},
+              {"label":"R26", "x":14.67, "y":2.38},
+
+              {"label":"L30", "x":0, "y":3.38},
+              {"label":"L31", "x":1, "y":3.38},
+              {"label":"L32", "x":2, "y":3.13},
+              {"label":"L33", "x":3, "y":3.0},
+              {"label":"L34", "x":4, "y":3.13},
+              {"label":"L35", "x":5, "y":3.25},
+              {"label":"L36", "x":6, "y":3.35},
+              {"label":"R30", "x":8.67, "y":3.35},
+              {"label":"R31", "x":9.67, "y":3.25},
+              {"label":"R32", "x":10.67, "y":3.13},
+              {"label":"R33", "x":11.67, "y":3.0},
+              {"label":"R34", "x":12.67, "y":3.13},
+              {"label":"R35", "x":13.67, "y":3.38},
+              {"label":"R36", "x":14.67, "y":3.38},
+
+              {"label":"L40", "x":0, "y":4.38},
+              {"label":"L41", "x":1, "y":4.38},
+              {"label":"L42", "x":2, "y":4.13},
+              {"label":"L43", "x":3, "y":4.0},
+              {"label":"L44", "x":4, "y":4.13},
+              {"label":"L45", "x":5.35, "y":4.92},
+              {"label":"L46", "x":6.35, "y":4.45, "h":1.5},
+              {"label":"R40", "x":8.02, "y":4.45, "h":1.5},
+              {"label":"R41", "x":9.02, "y":4.92},
+              {"label":"R42", "x":10.67, "y":4.13},
+              {"label":"R43", "x":11.67, "y":4.0},
+              {"label":"R44", "x":12.67, "y":4.13},
+              {"label":"R45", "x":13.67, "y":4.38},
+              {"label":"R46", "x":14.67, "y":4.38}
+          ]
+      }
+  }
+}
diff --git a/keyboards/kapl/kapl.c b/keyboards/kapl/kapl.c
new file mode 100644
index 0000000000..165900e142
--- /dev/null
+++ b/keyboards/kapl/kapl.c
@@ -0,0 +1,3 @@
+// Copyright 2022 Alexander Lozyuk (@keyzog)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "kapl.h"
diff --git a/keyboards/kapl/kapl.h b/keyboards/kapl/kapl.h
new file mode 100644
index 0000000000..019e3267d4
--- /dev/null
+++ b/keyboards/kapl/kapl.h
@@ -0,0 +1,8 @@
+// Copyright 2022 Alexander Lozyuk (@keyzog)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+#include "quantum.h"
+
+#ifdef KEYBOARD_kapl_rev1
+#   include "rev1.h"
+#endif
diff --git a/keyboards/kapl/keymaps/default/config.h b/keyboards/kapl/keymaps/default/config.h
new file mode 100644
index 0000000000..788c3b41bb
--- /dev/null
+++ b/keyboards/kapl/keymaps/default/config.h
@@ -0,0 +1,45 @@
+// Copyright 2022 Alexander Lozyuk (@keyzog)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#ifdef RGBLIGHT_ENABLE
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 16
+#define RGBLIGHT_VAL_STEP 16
+#endif
+
+#ifdef RGB_MATRIX_ENABLE
+#define RGB_MATRIX_HUE_STEP 8
+#define RGB_MATRIX_SAT_STEP 16
+#define RGB_MATRIX_VAL_STEP 16
+#define RGB_MATRIX_SPD_STEP 10
+// EFFECTS
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+// KEYPRESSES EFFECTS
+#define RGB_MATRIX_KEYPRESSES
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
diff --git a/keyboards/kapl/keymaps/default/keymap.c b/keyboards/kapl/keymaps/default/keymap.c
new file mode 100644
index 0000000000..5e2bea1f47
--- /dev/null
+++ b/keyboards/kapl/keymaps/default/keymap.c
@@ -0,0 +1,49 @@
+// Copyright 2022 Alexander Lozyuk (@keyzog)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+#define SPC_FN  LT(1,KC_SPC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐           ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_PGUP,             KC_HOME, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_PGDN,             KC_END,  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_EQL,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_GRV,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_LBRC,             KC_RBRC, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_EXLM,             KC_QUES, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+  //├────────┼────────┼────────┼────────┼────────┼─┬──────┴─┬──────┴─┐       ┌─┴──────┬─┴──────┬─┼────────┼────────┼────────┼────────┼────────┤
+     KC_LCTL, KC_LGUI, KC_LALT, MO(2),   SPC_FN,    KC_BSPC, KC_DEL,          KC_ENT,  KC_SPC,    MO(1),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+  //└────────┴────────┴────────┴────────┴────────┘ └────────┴────────┘       └────────┴────────┘ └────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [1] = LAYOUT( // "FN" Funcional
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐           ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_TRNS,             KC_PSCR, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS, KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS,             KC_TRNS, KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_PMNS, KC_F12,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS, KC_HASH, KC_DLR,  KC_LBRC, KC_RBRC, KC_GRV,  KC_TRNS,             KC_TRNS, KC_PAST, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, KC_F13,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS, KC_PERC, KC_CIRC, KC_LPRN, KC_RPRN, KC_TILD, KC_TRNS,             KC_TRNS, KC_NO,   KC_P1,   KC_P2,   KC_P3,   KC_PENT, KC_F14,
+  //├────────┼────────┼────────┼────────┼────────┼─┬──────┴─┬──────┴─┐       ┌─┴──────┬─┴──────┬─┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS, KC_TRNS, KC_TRNS, KC_NO,   KC_NO,     KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS,   KC_NO,   KC_P0,   KC_PDOT, KC_PENT, KC_F15
+  //└────────┴────────┴────────┴────────┴────────┘ └────────┴────────┘       └────────┴────────┘ └────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [2] = LAYOUT( // "CNT" Control
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐           ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,               KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   RESET,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_NO,   RGB_SAI, RGB_SPI, RGB_VAI, RGB_HUI, RGB_MOD, KC_NO,               KC_NO,   KC_VOLU, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_NO,   RGB_SAD, RGB_SPD, RGB_VAD, RGB_HUD, RGB_RMOD, KC_NO,              KC_NO,   KC_VOLD, KC_MPLY, KC_MNXT, KC_MPRV, KC_NO,   KC_NO,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_NO,   KC_NO,   KC_NO,   KC_NO,   RGB_TOG, RGB_M_P, KC_NO,               KC_NO,   KC_MUTE, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+  //├────────┼────────┼────────┼────────┼────────┼─┬──────┴─┬──────┴─┐       ┌─┴──────┬─┴──────┬─┼────────┼────────┼────────┼────────┼────────┤
+     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,     KC_NO,   KC_NO,           KC_NO,   KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO
+  //└────────┴────────┴────────┴────────┴────────┘ └────────┴────────┘       └────────┴────────┘ └────────┴────────┴────────┴────────┴────────┘
+  )
+};
diff --git a/keyboards/kapl/keymaps/via/config.h b/keyboards/kapl/keymaps/via/config.h
new file mode 100644
index 0000000000..788c3b41bb
--- /dev/null
+++ b/keyboards/kapl/keymaps/via/config.h
@@ -0,0 +1,45 @@
+// Copyright 2022 Alexander Lozyuk (@keyzog)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#ifdef RGBLIGHT_ENABLE
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 16
+#define RGBLIGHT_VAL_STEP 16
+#endif
+
+#ifdef RGB_MATRIX_ENABLE
+#define RGB_MATRIX_HUE_STEP 8
+#define RGB_MATRIX_SAT_STEP 16
+#define RGB_MATRIX_VAL_STEP 16
+#define RGB_MATRIX_SPD_STEP 10
+// EFFECTS
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+// KEYPRESSES EFFECTS
+#define RGB_MATRIX_KEYPRESSES
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
diff --git a/keyboards/kapl/keymaps/via/keymap.c b/keyboards/kapl/keymaps/via/keymap.c
new file mode 100644
index 0000000000..002cc1ef3a
--- /dev/null
+++ b/keyboards/kapl/keymaps/via/keymap.c
@@ -0,0 +1,64 @@
+// Copyright 2022 Alexander Lozyuk (@keyzog)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+#define ____    KC_TRNS
+#define SPC_FN  LT(1,KC_SPC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐           ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_PGUP,             KC_HOME, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_PGDN,             KC_END,  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_EQL,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_GRV,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_LBRC,             KC_RBRC, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_EXLM,             KC_QUES, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+  //├────────┼────────┼────────┼────────┼────────┼─┬──────┴─┬──────┴─┐       ┌─┴──────┬─┴──────┬─┼────────┼────────┼────────┼────────┼────────┤
+     KC_LCTL, KC_LGUI, KC_LALT, MO(2),   SPC_FN,    KC_BSPC, KC_DEL,          KC_ENT,  KC_SPC,    MO(1),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+  //└────────┴────────┴────────┴────────┴────────┘ └────────┴────────┘       └────────┴────────┘ └────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [1] = LAYOUT( // "FN" Funcional
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐           ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_TRNS,             KC_PSCR, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS, KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS,             KC_TRNS, KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_PMNS, KC_F12,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS, KC_HASH, KC_DLR,  KC_LBRC, KC_RBRC, KC_GRV,  KC_TRNS,             KC_TRNS, KC_PAST, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, KC_F13,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS, KC_PERC, KC_CIRC, KC_LPRN, KC_RPRN, KC_TILD, KC_TRNS,             KC_TRNS, KC_NO,   KC_P1,   KC_P2,   KC_P3,   KC_PENT, KC_F14,
+  //├────────┼────────┼────────┼────────┼────────┼─┬──────┴─┬──────┴─┐       ┌─┴──────┬─┴──────┬─┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS, KC_TRNS, KC_TRNS, KC_NO,   KC_NO,     KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS,   KC_NO,   KC_P0,   KC_PDOT, KC_PENT, KC_F15
+  //└────────┴────────┴────────┴────────┴────────┘ └────────┴────────┘       └────────┴────────┘ └────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [2] = LAYOUT( // "CNT" Control
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐           ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,               KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   RESET,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_NO,   RGB_SAI, RGB_SPI, RGB_VAI, RGB_HUI, RGB_MOD, KC_NO,               KC_NO,   KC_VOLU, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_NO,   RGB_SAD, RGB_SPD, RGB_VAD, RGB_HUD, RGB_RMOD,KC_NO,               KC_NO,   KC_VOLD, KC_MPLY, KC_MNXT, KC_MPRV, KC_NO,   KC_NO,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_NO,   KC_NO,   KC_NO,   KC_NO,   RGB_TOG, RGB_M_P, KC_NO,               KC_NO,   KC_MUTE, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+  //├────────┼────────┼────────┼────────┼────────┼─┬──────┴─┬──────┴─┐       ┌─┴──────┬─┴──────┬─┼────────┼────────┼────────┼────────┼────────┤
+     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,     KC_NO,   KC_NO,           KC_NO,   KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO
+  //└────────┴────────┴────────┴────────┴────────┘ └────────┴────────┘       └────────┴────────┘ └────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [3] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐           ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     ____,    ____,    ____,    ____,    ____,    ____,    ____,                ____,    ____,    ____,    ____,    ____,    ____,    ____,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     ____,    ____,    ____,    ____,    ____,    ____,    ____,                ____,    ____,    ____,    ____,    ____,    ____,    ____,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     ____,    ____,    ____,    ____,    ____,    ____,    ____,                ____,    ____,    ____,    ____,    ____,    ____,    ____,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     ____,    ____,    ____,    ____,    ____,    ____,    ____,                ____,    ____,    ____,    ____,    ____,    ____,    ____,
+  //├────────┼────────┼────────┼────────┼────────┼─┬──────┴─┬──────┴─┐       ┌─┴──────┬─┴──────┬─┼────────┼────────┼────────┼────────┼────────┤
+     ____,    ____,    ____,    ____,    ____,      ____,    ____,            ____,    ____,      ____,    ____,    ____,    ____,    ____
+  //└────────┴────────┴────────┴────────┴────────┘ └────────┴────────┘       └────────┴────────┘ └────────┴────────┴────────┴────────┴────────┘
+   )
+};
diff --git a/keyboards/pursuit40/keymaps/via/rules.mk b/keyboards/kapl/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/pursuit40/keymaps/via/rules.mk
rename to keyboards/kapl/keymaps/via/rules.mk
diff --git a/keyboards/kapl/readme.md b/keyboards/kapl/readme.md
new file mode 100644
index 0000000000..c42a5d8947
--- /dev/null
+++ b/keyboards/kapl/readme.md
@@ -0,0 +1,27 @@
+# Kapl Keyboard
+
+![Kapl Keyboard](https://i.imgur.com/XH8APgi.jpg)
+![Kapl PCB](https://i.imgur.com/uir2nQq.jpg)
+
+The Kapl is a split ergonomic keyboard with 70 keys (7x5).
+
+* Keyboard Maintainer: [keyzog](https://github.com/keyzog)
+* Hardware Supported: Kapl PCB / Pro Micro
+* Hardware Availability:  Order PCBs with gerber files from the [repository](https://github.com/keyzog/kapl/tree/main/gerbers)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kapl/rev1:default
+
+Flashing example for this keyboard:
+
+    make kapl/rev1:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the reset button on the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/kapl/rev1/config.h b/keyboards/kapl/rev1/config.h
new file mode 100644
index 0000000000..12007a3a13
--- /dev/null
+++ b/keyboards/kapl/rev1/config.h
@@ -0,0 +1,55 @@
+// Copyright 2022 Alexander Lozyuk (@keyzog)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4C41 // "LA" Lozyuk Alexander
+#define PRODUCT_ID      0x0001
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    keyzog
+#define PRODUCT         Kapl Keyboard
+
+/* key matrix size */
+/* Rows are doubled up */
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 7
+
+// wiring of each half
+#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
+#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+
+/* Serial settings */
+#define USE_SERIAL
+
+/* serial.c configuration for split keyboard */
+#define SOFT_SERIAL_PIN D2
+
+/* Select hand configuration */
+#define MASTER_LEFT
+
+#define RGB_DI_PIN D4
+#define RGBLED_NUM 88
+#define RGBLED_SPLIT { 44, 44 }
+#define RGBLIGHT_SPLIT
+#define RGBLIGHT_LIMIT_VAL 120 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
+
+#define DRIVER_LED_TOTAL 88
+#define RGB_MATRIX_SPLIT { 44, 44 }
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
+#define SPLIT_TRANSPORT_MIRROR
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+#define SPLIT_LAYER_STATE_ENABLE
+#define SPLIT_LED_STATE_ENABLE
diff --git a/keyboards/kapl/rev1/rev1.c b/keyboards/kapl/rev1/rev1.c
new file mode 100644
index 0000000000..b51021307e
--- /dev/null
+++ b/keyboards/kapl/rev1/rev1.c
@@ -0,0 +1,55 @@
+// Copyright 2022 Alexander Lozyuk (@keyzog)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "kapl.h"
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+    // Left Hand
+    // { 8,  7,  6,  5,  4,  3,  2,  1,  0 }, // underglow
+    {  9, 10, 11, 12, 13, 14, 15 },
+    { 22, 21, 20, 19, 18, 17, 16 },
+    { 23, 24, 25, 26, 27, 28, 29 },
+    { 36, 35, 34, 33, 32, 31, 30 },
+    { 37, 38, 39, 40, 41, 42, 43 },
+
+    // Right Hand
+    // { 44,  45,  46,  47,  48,  49,  50,  51,  52 }, // underglow
+    { 53, 54, 55, 56, 57, 58, 59 },
+    { 66, 65, 64, 63, 62, 61, 60 },
+    { 67, 68, 69, 70, 71, 72, 73 },
+    { 80, 79, 78, 77, 76, 75, 74 },
+    { 81, 82, 83, 84, 85, 86, 87 }
+}, {
+    // Left Hand
+    {96, 57},  {112, 44}, {112, 19}, {80, 19}, {48, 19}, {16, 19}, {16, 57}, {48, 57}, {80, 57}, // underglow
+    {0, 0},    {17, 0},   {34, 0},   {52, 0},  {69, 0},  {86, 0},  {103, 0},
+    {103, 16}, {86, 16},  {69, 16},  {52, 16}, {34, 16}, {17, 16}, {0, 16},
+    {0, 32},   {17, 32},  {34, 32},  {52, 32}, {69, 32}, {86, 32}, {103, 32},
+    {103, 48}, {86, 48},  {69, 48},  {52, 48}, {34, 48}, {17, 48}, {0, 48},
+    {0, 64},   {17, 64},  {34, 64},  {52, 64}, {69, 64}, {86, 64}, {103, 64},
+
+    // Right Hand
+    {144, 57}, {128, 44}, {128, 19}, {160, 19}, {192, 19}, {224, 19}, {224, 57}, {192, 57}, {160, 57}, // underglow
+    {224, 0},  {207, 0},  {190, 0},  {172, 0},  {155, 0},  {138, 0},  {121, 0},
+    {121, 16}, {138, 16}, {155, 16}, {172, 16}, {190, 16}, {207, 16}, {224, 16},
+    {224, 32}, {207, 32}, {190, 32}, {172, 32}, {155, 32}, {138, 32}, {121, 32},
+    {121, 48}, {138, 48}, {155, 48}, {172, 48}, {190, 48}, {207, 48}, {224, 48},
+    {224, 64}, {207, 64}, {190, 64}, {172, 64}, {155, 64}, {138, 64}, {121, 64}
+}, {
+    // Left Hand
+    2, 2, 2, 2, 2, 2, 2, 2, 2, // underglow
+    1, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 1,
+    1, 1, 1, 1, 1, 1, 1,
+
+    // Right Hand
+    2, 2, 2, 2, 2, 2, 2, 2, 2, // underglow
+    1, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 1,
+    1, 1, 1, 1, 1, 1, 1
+} };
+#endif
diff --git a/keyboards/kapl/rev1/rev1.h b/keyboards/kapl/rev1/rev1.h
new file mode 100644
index 0000000000..68649a7991
--- /dev/null
+++ b/keyboards/kapl/rev1/rev1.h
@@ -0,0 +1,34 @@
+// Copyright 2022 Alexander Lozyuk (@keyzog)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "kapl.h"
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+#define LAYOUT( \
+  L00, L01, L02, L03, L04, L05, L06,        R00, R01, R02, R03, R04, R05, R06, \
+  L10, L11, L12, L13, L14, L15, L16,        R10, R11, R12, R13, R14, R15, R16, \
+  L20, L21, L22, L23, L24, L25, L26,        R20, R21, R22, R23, R24, R25, R26, \
+  L30, L31, L32, L33, L34, L35, L36,        R30, R31, R32, R33, R34, R35, R36, \
+  L40, L41, L42, L43, L44,   L45, L46,    R40, R41,   R42, R43, R44, R45, R46  \
+) \
+{ \
+    { L00, L01, L02, L03, L04, L05, L06 }, \
+    { L10, L11, L12, L13, L14, L15, L16 }, \
+    { L20, L21, L22, L23, L24, L25, L26 }, \
+    { L30, L31, L32, L33, L34, L35, L36 }, \
+    { L40, L41, L42, L43, L44, L45, L46 }, \
+    { R06, R05, R04, R03, R02, R01, R00 }, \
+    { R16, R15, R14, R13, R12, R11, R10 }, \
+    { R26, R25, R24, R23, R22, R21, R20 }, \
+    { R36, R35, R34, R33, R32, R31, R30 }, \
+    { R46, R45, R44, R43, R42, R41, R40 }  \
+}
diff --git a/keyboards/kapl/rev1/rules.mk b/keyboards/kapl/rev1/rules.mk
new file mode 100644
index 0000000000..e3a4137694
--- /dev/null
+++ b/keyboards/kapl/rev1/rules.mk
@@ -0,0 +1,5 @@
+# Do not enable RGB_MATRIX_ENABLE together with RGBLIGHT_ENABLE
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
+
+LTO_ENABLE = yes
diff --git a/keyboards/kapl/rules.mk b/keyboards/kapl/rules.mk
new file mode 100644
index 0000000000..19a0cb5fa4
--- /dev/null
+++ b/keyboards/kapl/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes      # Mouse keys
+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           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no          # Audio output
+SPLIT_KEYBOARD = yes       # Split common
+
+DEFAULT_FOLDER = kapl/rev1
diff --git a/keyboards/kbdfans/kbd19x/info.json b/keyboards/kbdfans/kbd19x/info.json
index b271d7e537..68832438d0 100644
--- a/keyboards/kbdfans/kbd19x/info.json
+++ b/keyboards/kbdfans/kbd19x/info.json
@@ -1,7 +1,7 @@
 {
     "keyboard_name": "KBD19x",
     "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/kbdfans/kbd19x",
-    "maintainer": "qmk",
+    "maintainer": "jshuf, mechmerlin",
     "layouts": {
         "LAYOUT_ansi": {
             "layout": [
@@ -23,6 +23,7 @@
                 {"label":"Pause", "x":16.5, "y":0},
                 {"label":"Insert", "x":17.5, "y":0},
                 {"label":"Home", "x":18.5, "y":0},
+
                 {"label":"`~", "x":0, "y":1.5},
                 {"label":"1!", "x":1, "y":1.5},
                 {"label":"2@", "x":2, "y":1.5},
@@ -41,6 +42,7 @@
                 {"label":"/", "x":16.5, "y":1.5},
                 {"label":"*", "x":17.5, "y":1.5},
                 {"label":"-", "x":18.5, "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},
@@ -59,6 +61,7 @@
                 {"label":"8", "x":16.5, "y":2.5},
                 {"label":"9", "x":17.5, "y":2.5},
                 {"label":"+", "x":18.5, "y":2.5, "h":2},
+
                 {"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},
@@ -75,6 +78,7 @@
                 {"label":"4", "x":15.5, "y":3.5},
                 {"label":"5", "x":16.5, "y":3.5},
                 {"label":"6", "x":17.5, "y":3.5},
+
                 {"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},
@@ -92,6 +96,7 @@
                 {"label":"2", "x":16.5, "y":4.5},
                 {"label":"3", "x":17.5, "y":4.5},
                 {"label":"Enter", "x":18.5, "y":4.5, "h":2},
+
                 {"label":"Control", "x":0, "y":5.5, "w":1.25},
                 {"label":"GUI", "x":1.25, "y":5.5},
                 {"label":"Alt", "x":2.25, "y":5.5, "w":1.25},
@@ -100,8 +105,117 @@
                 {"label":"Fn", "x":10.75, "y":5.5},
                 {"label":"Control", "x":11.75, "y":5.5, "w":1.25},
                 {"label":"Left", "x":13.25, "y":5.75},
-                {"label":"Right", "x":14.25, "y":5.75},
-                {"label":"Down", "x":15.25, "y":5.75},
+                {"label":"Down", "x":14.25, "y":5.75},
+                {"label":"Right", "x":15.25, "y":5.75},
+                {"label":"0", "x":16.5, "y":5.5},
+                {"label":".", "x":17.5, "y":5.5}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"Extra Esc", "x":14, "y":0},
+                {"label":"PrtSc", "x":15.5, "y":0},
+                {"label":"Pause", "x":16.5, "y":0},
+                {"label":"Insert", "x":17.5, "y":0},
+                {"label":"Home", "x":18.5, "y":0},
+
+                {"label":"`\u00ac", "x":0, "y":1.5},
+                {"label":"1!", "x":1, "y":1.5},
+                {"label":"2\"", "x":2, "y":1.5},
+                {"label":"3\u00a3", "x":3, "y":1.5},
+                {"label":"4$", "x":4, "y":1.5},
+                {"label":"5%", "x":5, "y":1.5},
+                {"label":"6^", "x":6, "y":1.5},
+                {"label":"7&", "x":7, "y":1.5},
+                {"label":"8*", "x":8, "y":1.5},
+                {"label":"9(", "x":9, "y":1.5},
+                {"label":"0)", "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":"Num Lock", "x":15.5, "y":1.5},
+                {"label":"/", "x":16.5, "y":1.5},
+                {"label":"*", "x":17.5, "y":1.5},
+                {"label":"-", "x":18.5, "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":"7", "x":15.5, "y":2.5},
+                {"label":"8", "x":16.5, "y":2.5},
+                {"label":"9", "x":17.5, "y":2.5},
+                {"label":"+", "x":18.5, "y":2.5, "h":2},
+
+                {"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":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
+                {"label":"4", "x":15.5, "y":3.5},
+                {"label":"5", "x":16.5, "y":3.5},
+                {"label":"6", "x":17.5, "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":1.75},
+                {"label":"Up", "x":14.25, "y":4.75},
+                {"label":"1", "x":15.5, "y":4.5},
+                {"label":"2", "x":16.5, "y":4.5},
+                {"label":"3", "x":17.5, "y":4.5},
+                {"label":"Enter", "x":18.5, "y":4.5, "h":2},
+
+                {"label":"Control", "x":0, "y":5.5, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.5},
+                {"label":"Alt", "x":2.25, "y":5.5, "w":1.25},
+                {"label":"Space", "x":3.5, "y":5.5, "w":6.25},
+                {"label":"Alt", "x":9.75, "y":5.5},
+                {"label":"Fn", "x":10.75, "y":5.5},
+                {"label":"Control", "x":11.75, "y":5.5, "w":1.25},
+                {"label":"Left", "x":13.25, "y":5.75},
+                {"label":"Down", "x":14.25, "y":5.75},
+                {"label":"Right", "x":15.25, "y":5.75},
                 {"label":"0", "x":16.5, "y":5.5},
                 {"label":".", "x":17.5, "y":5.5}
             ]
@@ -126,6 +240,7 @@
                 {"label":"Pause", "x":16.5, "y":0},
                 {"label":"Insert", "x":17.5, "y":0},
                 {"label":"Home", "x":18.5, "y":0},
+
                 {"label":"`~", "x":0, "y":1.5},
                 {"label":"1!", "x":1, "y":1.5},
                 {"label":"2@", "x":2, "y":1.5},
@@ -145,6 +260,7 @@
                 {"label":"/", "x":16.5, "y":1.5},
                 {"label":"*", "x":17.5, "y":1.5},
                 {"label":"-", "x":18.5, "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},
@@ -163,6 +279,7 @@
                 {"label":"8", "x":16.5, "y":2.5},
                 {"label":"9", "x":17.5, "y":2.5},
                 {"label":"Split + (Top)", "x":18.5, "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},
@@ -180,6 +297,7 @@
                 {"label":"5", "x":16.5, "y":3.5},
                 {"label":"6", "x":17.5, "y":3.5},
                 {"label":"Split + (Bottom)", "x":18.5, "y":3.5},
+
                 {"label":"Shift", "x":0, "y":4.5, "w":1.25},
                 {"label":"ISO Backslash", "x":1.25, "y":4.5},
                 {"label":"Z", "x":2.25, "y":4.5},
@@ -198,6 +316,7 @@
                 {"label":"2", "x":16.5, "y":4.5},
                 {"label":"3", "x":17.5, "y":4.5},
                 {"label":"Split Enter (Top)", "x":18.5, "y":4.5},
+
                 {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
                 {"label":"GUI", "x":1.25, "y":5.5},
                 {"label":"Alt", "x":2.25, "y":5.5, "w":1.25},
diff --git a/keyboards/kbdfans/kbd19x/kbd19x.h b/keyboards/kbdfans/kbd19x/kbd19x.h
index 41c27230f2..d3766eadba 100644
--- a/keyboards/kbdfans/kbd19x/kbd19x.h
+++ b/keyboards/kbdfans/kbd19x/kbd19x.h
@@ -32,37 +32,26 @@ inline void kbd19x_nmlk_led_off(void)   { writePinLow(LED_NUM_LOCK_PIN); }
 // readability
 #define XXX KC_NO
 
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
+/*
+ *              ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┬───┐
+ *              │00 ││01 │02 │03 │04 ││60 │61 │62 │63 ││05 │06 │07 │08 ││72 │ │09 │0A │0B │0C │
+ *              └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┴───┘
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┐    ┌───────┐
+ *              │10 │11 │12 │13 │14 │64 │65 │66 │67 │15 │16 │17 │18 │70 │71 │ │19 │1A │1B │1C │    │71     │ 2u Backspace
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┼───┤    └─┬─────┤                ┌───┐
+ *              │20   │21 │22 │23 │24 │68 │69 │6a │6b │25 │26 │27 │28 │73   │ │29 │2A │2B │2C │      │     │                │   │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┼───┼───┼───┤   ┌──┴┐38  │ ISO Enter      │2C │ 2u Plus
+ *  LShift      │30    │31 │32 │33 │34 │6c │75 │76 │77 │35 │36 │37 │38      │ │39 │3A │3B │3C │   │73 │    │                │   │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┼───┼───┼───┤   └───┴────┘                ├───┤
+ * │40      │   │40  │41 │42 │43 │44 │78 │79 │7a │7b │45 │46 │47 │48    │┌───┐│49 │4A │4B │4C │                             │   │
+ * └────────┘   ├────┼───┼───┴┬──┴───┴───┴───┴───┴───┴─┬─┴─┬─┴─┬─┴──┬───┘│74 │└───┼───┼───┼───┤                             │4C │ 2u Enter
+ *              │50  │51 │52  │59                      │55 │56 │57  │┌───┼───┼───┐│5A │5B │5C │                             │   │
+ *              └────┴───┴────┴────────────────────────┴───┴───┴────┘│58 │53 │54 │└───┴───┴───┘                             └───┘
+ *              ┌─────┬─────┬───────────────────────────┬─────┬─────┐└───┴───┴───┘
+ *              │50   │52   │59                         │55   │57   │ WKL
+ *              └─────┴─────┴───────────────────────────┴─────┴─────┘
  */
 
-// 2u backspace: XXX, k71
-// split backspace: k70, k71
-
-// 2u numpad +: k2c, XXX
-// split numpad +: k2c, k3c
-
-// 2u numpad enter: k4c, XXX
-// split numpad enter: k4c, k5c
-
-// 2.25u lshift: k40, XXX
-// split (1.25u, 1u) lshift: k40, k41
-
-// ANSI enter or ISO enter: k38
-// Key next to ISO enter: k72
-// backslash or NUHS: k73
-
-// left winkey: k50, k51, k52
-// left WKL: k50, XXX, k52
-
-// right winkey: k55, k56, k57
-// right WKL: k55, XXX, k57
-
 #define LAYOUT_all( \
   k00,  k01, k02, k03, k04,  k60, k61, k62, k63,  k05, k06, k07, k08,   k72,  k09, k0a, k0b, k0c, \
   k10, k11, k12, k13, k14, k64, k65, k66, k67, k15, k16, k17, k18, k70, k71,  k19, k1a, k1b, k1c, \
@@ -100,3 +89,22 @@ inline void kbd19x_nmlk_led_off(void)   { writePinLow(LED_NUM_LOCK_PIN); }
   {k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, k6b, k6c},\
   {XXX, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, k7b, XXX},\
 }
+
+#define LAYOUT_iso( \
+  k00,  k01, k02, k03, k04,  k60, k61, k62, k63,  k05, k06, k07, k08, k72,     k09, k0a, k0b, k0c, \
+  k10, k11, k12, k13, k14, k64, k65, k66, k67, k15, k16, k17, k18,    k71,     k19, k1a, k1b, k1c, \
+  k20,  k21, k22, k23, k24, k68, k69, k6a, k6b, k25, k26, k27, k28,            k29, k2a, k2b, k2c, \
+  k30,    k31, k32, k33, k34, k6c, k75, k76, k77, k35, k36, k37, k73, k38,     k39, k3a, k3b,      \
+  k40, k41, k42, k43, k44, k78, k79, k7a, k7b, k45, k46, k47,    k48,   k74,   k49, k4a, k4b, k4c, \
+  k50, k51, k52,                k59,            k55, k56, k57,     k58, k53, k54,   k5a, k5b       \
+)\
+{\
+  {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c},\
+  {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c},\
+  {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c},\
+  {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX},\
+  {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c},\
+  {k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, XXX},\
+  {k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, k6b, k6c},\
+  {XXX, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, k7b, XXX},\
+}
diff --git a/keyboards/kbdfans/kbd19x/keymaps/default_iso/keymap.c b/keyboards/kbdfans/kbd19x/keymaps/default_iso/keymap.c
new file mode 100644
index 0000000000..4382cafcb6
--- /dev/null
+++ b/keyboards/kbdfans/kbd19x/keymaps/default_iso/keymap.c
@@ -0,0 +1,36 @@
+/*
+Copyright 2018 Jeff Shufelt <jshuf@puppyfish.com> @jshuf
+
+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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_iso( /* Base */
+    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,  BL_STEP,          KC_PSCR, KC_SLCK, KC_PAUS, KC_PGDN,
+    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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    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_P7,   KC_P8,   KC_P9,   KC_PPLS,
+    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_P4,   KC_P5,   KC_P6,
+    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_P1,   KC_P2,   KC_P3,   KC_PENT,
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,      KC_P0,   KC_PDOT
+  ),
+  [1] = LAYOUT_iso( /* Func */
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  RGB_TOG,         _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  RESET,           _______, _______, _______, _______,
+    _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,                   _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______,
+    _______, _______, _______,                            _______,                   _______, _______, _______,     _______, _______, _______,      _______, _______
+  ),
+};
diff --git a/keyboards/kbdfans/kbd19x/readme.md b/keyboards/kbdfans/kbd19x/readme.md
index da37474adc..910b2f1b89 100644
--- a/keyboards/kbdfans/kbd19x/readme.md
+++ b/keyboards/kbdfans/kbd19x/readme.md
@@ -8,14 +8,23 @@
 
 The KBD19x is a compact-1800 keyboard kit produced by KBDfans, offering a number of layout options.
 
-**Reset Sequence:** Using this firmware sets `BOOTLOADER_ENABLE` to `lite`. While plugging in, hold the top left key, commonly programmed as `Esc` to put your board into bootloader mode. 
-
 * Keyboard Maintainer: [jshuf](https://github.com/jshuf), [MechMerlin](https://github.com/mechmerlin)
 * Hardware Supported: KBD19x PCB
-* Hardware Availability: [KBDfans](https://kbdfans.cn)
+* Hardware Availability: [~~KBDfans~~](https://kbdfans.com/collections/95-kbd19x/products/kbdfans-kbd19x-pcb), [~~AliExpress~~](https://www.aliexpress.com/item/32835566884.html) (no longer available)
 
 Make example for this keyboard (after setting up your build environment):
 
     make kbdfans/kbd19x:default
 
+Flashing example for this keyboard:
+
+    make kbdfans/kbd19x:default:flash
+
+## Bootloader
+
+To reset the board into bootloader mode, do one of the following:
+
+* **Bootmagic reset**: Hold the `Esc` key while connecting the USB cable (also erases persistent settings)
+* **Keycode in keymap**: Press the key mapped to `RESET` if it is available (`Fn`+`Backspace` by default)
+
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
index 85806aff51..306c22615f 100755
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
@@ -93,35 +93,63 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
     {0, CS39_SW7, CS38_SW7, CS37_SW7}
 
 };
+
+#define __ NO_LED
+#define CAPS_LOCK_LED_INDEX 30
+
 led_config_t g_led_config = { {
     // Key Matrix to LED Index
     {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14 },
     {  15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 },
-    {  30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, NO_LED, 42, 43 },
-    {  44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, NO_LED, 56, 57 },
-    {  58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, 62, NO_LED, 63, 64, NO_LED, 65, 66 }
+    {  30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, __, 42, 43 },
+    {  44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, __, 56, 57 },
+    {  58, 59, 60, __, __, 61, __, __, 62, __, 63, 64, __, 65, 66 }
 }, {
     // LED Index to Physical Position
-    {6,10},{20,10},{34,10},{48,10},{62,10},{76,10},{90,10},{104,10},{118,10},{132,10},{146,10},{160,10},{174,10}, {196,10},{217,10},
-	{9,23}, {27,23},{41,23},{55,23},{69,23},{83,23},{97,23},{111,23},{125,23},{139,23},{153,23},{167,23},{181,23}, {199,23},{217,23},
-	{11,36},{30,36},{44,36},{58,36},{72,36},{86,36},{101,36},{115,36},{129,36},{143,36},{157,36},{171,36}, {194,36},{217,36},
-	{15,49}, {38,49},{52,49},{66,49},{80,49},{94,49},{108,49},{122,49},{136,49},{150,49},{164,49}, {184,49},{203,49},{217,49},
-    {8,62},{25,62},{43,62}, {95,62}, {149,62},{166,62}, {189,62},{203,62},{217,62}
-
+    // based on: https://gist.github.com/vinorodrigues/07fd735683856b2a06c7c52b9b3878cb
+    {0, 0},  {15, 0},  {30, 0},  {45, 0},  {60, 0},  {75, 0},  {90, 0},   {105, 0},  {119, 0},  {134, 0},  {149, 0},  {164, 0},  {179, 0},  {202, 0},  {224, 0},
+    {4, 16}, {22, 16}, {37, 16}, {52, 16}, {67, 16}, {82, 16}, {97, 16},  {112, 16}, {127, 16}, {142, 16}, {157, 16}, {172, 16}, {187, 16}, {205, 16}, {224, 16},
+    {6, 32}, {26, 32}, {41, 32}, {56, 32}, {71, 32}, {86, 32}, {101, 32}, {116, 32}, {131, 32}, {146, 32}, {161, 32}, {175, 32},            {200, 32}, {224, 32},
+    {9, 48}, {34, 48}, {49, 48}, {63, 48}, {78, 48}, {93, 48}, {108, 48}, {123, 48}, {138, 48}, {153, 48}, {168, 48}, {189, 48},            {209, 48}, {224, 48},
+    {2, 64}, {21, 64}, {39, 64},                     {95, 64},                       {151, 64},            {170, 64}, {194, 64},            {209, 64}, {224, 64}
 }, {
     // LED Index to Flag
     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    1, 1, 1, 4, 1, 1, 1, 1, 1
+    9, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    4, 1,  // caps lock is also an indicator so mask is `0x01 | 0x08`
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    4, 1,
+    1, 1, 1,       4,       1,    1, 1,    1, 1
 } };
 
+#endif
+
+#if defined(RGB_MATRIX_ENABLE) && defined(CAPS_LOCK_LED_INDEX)
+
+#ifdef RGB_MATRIX_MAXIMUM_BRIGHTNESS
+    #define CAPS_LOCK_MAX_BRIGHTNESS RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#else
+    #define CAPS_LOCK_MAX_BRIGHTNESS 0xFF
+#endif
+
+#ifdef RGB_MATRIX_VAL_STEP
+    #define CAPS_LOCK_VAL_STEP RGB_MATRIX_VAL_STEP
+#else
+    #define CAPS_LOCK_VAL_STEP 8
+#endif
 
 __attribute__ ((weak))
 void rgb_matrix_indicators_user(void) {
-    if (host_keyboard_led_state().caps_lock)     {
-        rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
+    if (host_keyboard_led_state().caps_lock) {
+        uint8_t b = rgb_matrix_get_val();
+        if (b < CAPS_LOCK_VAL_STEP) {
+            b = CAPS_LOCK_VAL_STEP;
+        } else if (b < (CAPS_LOCK_MAX_BRIGHTNESS - CAPS_LOCK_VAL_STEP)) {
+            b += CAPS_LOCK_VAL_STEP;  // one step more than current brightness
+        } else {
+            b = CAPS_LOCK_MAX_BRIGHTNESS;
+        }
+        rgb_matrix_set_color(CAPS_LOCK_LED_INDEX, b, b, b);  // white, with the adjusted brightness
     }
 }
+
 #endif
diff --git a/keyboards/keebio/iris/keymaps/333fred/rules.mk b/keyboards/keebio/iris/keymaps/333fred/rules.mk
index 995272e2f2..5ad63b02b7 100644
--- a/keyboards/keebio/iris/keymaps/333fred/rules.mk
+++ b/keyboards/keebio/iris/keymaps/333fred/rules.mk
@@ -1,4 +1,3 @@
 KEY_LOCK_ENABLE = yes
 CONSOLE_ENABLE = no
-EXTRAFLAGS += -flto
-
+LTO_ENABLE = yes
diff --git a/keyboards/keebio/iris/rev6/config.h b/keyboards/keebio/iris/rev6/config.h
index e821012a7d..386416f113 100644
--- a/keyboards/keebio/iris/rev6/config.h
+++ b/keyboards/keebio/iris/rev6/config.h
@@ -81,11 +81,48 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
 // RGB Matrix
 #    ifdef RGB_MATRIX_ENABLE
+#        define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#        define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#        define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#        define ENABLE_RGB_MATRIX_BREATHING
+#        define ENABLE_RGB_MATRIX_BAND_SAT
+#        define ENABLE_RGB_MATRIX_BAND_VAL
+#        define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#        define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#        define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#        define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#        define ENABLE_RGB_MATRIX_CYCLE_ALL
+#        define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#        define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#        define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#        define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#        define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#        define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#        define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#        define ENABLE_RGB_MATRIX_DUAL_BEACON
+#        define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#        define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#        define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#        define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#        define ENABLE_RGB_MATRIX_SPLASH
+#        define ENABLE_RGB_MATRIX_MULTISPLASH
+#        define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#        define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #        define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160
 #        define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #        define DRIVER_LED_TOTAL RGBLED_NUM
 #        define RGB_MATRIX_SPLIT { 34, 34 }
 #        define RGB_DISABLE_WHEN_USB_SUSPENDED
-//#        define RGB_MATRIX_KEYPRESSES
+#        define RGB_MATRIX_KEYPRESSES
 #    endif
 #endif
diff --git a/keyboards/keebsforall/freebirdnp/lite/config.h b/keyboards/keebsforall/freebirdnp/lite/config.h
new file mode 100644
index 0000000000..317132eff3
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/lite/config.h
@@ -0,0 +1,55 @@
+/*
+Copyright 2021 ELliot Powell
+
+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"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x6B66
+#define PRODUCT_ID      0x1013
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    KeebsForAll
+#define PRODUCT         Freebird Numpad Lite
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 4
+
+/*
+ * 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 { B7, B6, B5, B4, B3 }
+#define MATRIX_COL_PINS { C7, B2, B1, B0 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* number of backlight levels */
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/keebsforall/freebirdnp/lite/info.json b/keyboards/keebsforall/freebirdnp/lite/info.json
new file mode 100644
index 0000000000..1553264e08
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/lite/info.json
@@ -0,0 +1,204 @@
+{
+    "keyboard_name": "FreebirdNP Lite",
+    "url": "https://keebsforall.com/products/fb-numpad-lite",
+    "maintainer": "e11i0t23",
+    "manufacturer": "KeebsForAll",
+    "layouts": {
+        "LAYOUT_numpad_5x4": {
+            "layout": [
+                {
+                    "label": "Num Lock",
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "label": "/",
+                    "x": 1,
+                    "y": 0
+                },
+                {
+                    "label": "*",
+                    "x": 2,
+                    "y": 0
+                },
+                {
+                    "label": "-",
+                    "x": 3,
+                    "y": 0
+                },
+                {
+                    "label": "7",
+                    "x": 0,
+                    "y": 1
+                },
+                {
+                    "label": "8",
+                    "x": 1,
+                    "y": 1
+                },
+                {
+                    "label": "9",
+                    "x": 2,
+                    "y": 1
+                },
+                {
+                    "label": "4",
+                    "x": 0,
+                    "y": 2
+                },
+                {
+                    "label": "5",
+                    "x": 1,
+                    "y": 2
+                },
+                {
+                    "label": "6",
+                    "x": 2,
+                    "y": 2
+                },
+                {
+                    "label": "+",
+                    "x": 3,
+                    "y": 1,
+                    "h": 2
+                },
+                {
+                    "label": "1",
+                    "x": 0,
+                    "y": 3
+                },
+                {
+                    "label": "2",
+                    "x": 1,
+                    "y": 3
+                },
+                {
+                    "label": "3",
+                    "x": 2,
+                    "y": 3
+                },
+                {
+                    "label": "0",
+                    "x": 0,
+                    "y": 4,
+                    "w": 2
+                },
+                {
+                    "label": ".",
+                    "x": 2,
+                    "y": 4
+                },
+                {
+                    "label": "Enter",
+                    "x": 3,
+                    "y": 3,
+                    "h": 2
+                }
+            ]
+        },
+        "LAYOUT_ortho_5x4": {
+            "layout": [
+                {
+                    "label": "Num Lock",
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "label": "/",
+                    "x": 1,
+                    "y": 0
+                },
+                {
+                    "label": "*",
+                    "x": 2,
+                    "y": 0
+                },
+                {
+                    "label": "-",
+                    "x": 3,
+                    "y": 0
+                },
+                {
+                    "label": "7",
+                    "x": 0,
+                    "y": 1
+                },
+                {
+                    "label": "8",
+                    "x": 1,
+                    "y": 1
+                },
+                {
+                    "label": "9",
+                    "x": 2,
+                    "y": 1
+                },
+                {
+                    "label": "+",
+                    "x": 3,
+                    "y": 1
+                },
+                {
+                    "label": "4",
+                    "x": 0,
+                    "y": 2
+                },
+                {
+                    "label": "5",
+                    "x": 1,
+                    "y": 2
+                },
+                {
+                    "label": "6",
+                    "x": 2,
+                    "y": 2
+                },
+                {
+                    "label": "+",
+                    "x": 3,
+                    "y": 2
+                },
+                {
+                    "label": "1",
+                    "x": 0,
+                    "y": 3
+                },
+                {
+                    "label": "2",
+                    "x": 1,
+                    "y": 3
+                },
+                {
+                    "label": "3",
+                    "x": 2,
+                    "y": 3
+                },
+                {
+                    "label": "Enter",
+                    "x": 3,
+                    "y": 3
+                },
+                {
+                    "label": "0",
+                    "x": 0,
+                    "y": 4
+                },
+                {
+                    "label": "00",
+                    "x": 1,
+                    "y": 4
+                },
+                {
+                    "label": ".",
+                    "x": 2,
+                    "y": 4
+                },
+                {
+                    "label": "Enter",
+                    "x": 3,
+                    "y": 4
+                }
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebsforall/freebirdnp/lite/keymaps/default/keymap.c b/keyboards/keebsforall/freebirdnp/lite/keymaps/default/keymap.c
new file mode 100644
index 0000000000..3d7f4026f8
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/lite/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+/* Copyright 2021 Elliot Powell
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_numpad_5x4(
+    TG(1),   KC_PSLS, KC_PAST, KC_PMNS,
+    KC_P7,   KC_P8,   KC_P9,
+    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+    KC_P1,   KC_P2,   KC_P3,
+    KC_P0,            KC_PDOT, KC_PENT ),
+
+[1] = LAYOUT_numpad_5x4(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_HOME, KC_UP,   KC_PGUP,
+    KC_LEFT, KC_NO,   KC_RGHT, KC_TRNS,
+    KC_END,  KC_DOWN, KC_PGDN,
+    KC_INS,           KC_DEL,  KC_TRNS),
+};
diff --git a/keyboards/keebsforall/freebirdnp/lite/keymaps/via/keymap.c b/keyboards/keebsforall/freebirdnp/lite/keymaps/via/keymap.c
new file mode 100644
index 0000000000..712b01dcfa
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/lite/keymaps/via/keymap.c
@@ -0,0 +1,46 @@
+/* Copyright 2021 Elliot Powell
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_ortho_5x4( /* Base */
+    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+    KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+    KC_P0,   KC_P0,   KC_PDOT, KC_PENT),
+
+[1] = LAYOUT_ortho_5x4( /* Empty for Dynamic keymap */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+[2] = LAYOUT_ortho_5x4( /* Empty for Dynamic keymap */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+[3] = LAYOUT_ortho_5x4( /* Empty for Dynamic keymap */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+};
diff --git a/keyboards/quark/keymaps/via/rules.mk b/keyboards/keebsforall/freebirdnp/lite/keymaps/via/rules.mk
old mode 100644
new mode 100755
similarity index 100%
rename from keyboards/quark/keymaps/via/rules.mk
rename to keyboards/keebsforall/freebirdnp/lite/keymaps/via/rules.mk
diff --git a/keyboards/keebsforall/freebirdnp/lite/lite.c b/keyboards/keebsforall/freebirdnp/lite/lite.c
new file mode 100644
index 0000000000..4d424c17da
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/lite/lite.c
@@ -0,0 +1,16 @@
+/* Copyright 2021 Elliot Powell
+ *
+ * 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 "lite.h"
diff --git a/keyboards/keebsforall/freebirdnp/lite/lite.h b/keyboards/keebsforall/freebirdnp/lite/lite.h
new file mode 100644
index 0000000000..7f8cbdeeb0
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/lite/lite.h
@@ -0,0 +1,48 @@
+/* Copyright 2021 Elliot Powell
+ *
+ * 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 XXX KC_NO
+
+#define LAYOUT_numpad_5x4( \
+    K00, K01, K02, K03,  \
+    K10, K11, K12,       \
+    K20, K21, K22, K13,  \
+    K30, K31, K32,       \
+    K40,      K42, K33   \
+) { \
+    { K00, K01, K02, K03 }, \
+    { K10, K11, K12, K13 }, \
+    { K20, K21, K22, XXX }, \
+    { K30, K31, K32, K33 }, \
+    { K40, XXX, K42, XXX }  \
+}
+
+#define LAYOUT_ortho_5x4( \
+    K00, K01, K02, K03, \
+    K10, K11, K12, K13, \
+    K20, K21, K22, K23, \
+    K30, K31, K32, K33, \
+    K40, K41, K42, K43  \
+) { \
+    { K00, K01, K02, K03 }, \
+    { K10, K11, K12, K13 }, \
+    { K20, K21, K22, K23 }, \
+    { K30, K31, K32, K33 }, \
+    { K40, K41, K42, K43 }  \
+}
diff --git a/keyboards/keebsforall/freebirdnp/lite/readme.md b/keyboards/keebsforall/freebirdnp/lite/readme.md
new file mode 100644
index 0000000000..e0d0dda059
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/lite/readme.md
@@ -0,0 +1,19 @@
+# Freebird Numpad Lite
+
+A basic numpad build to support the freebird range of products by keebsforall
+
+* Keyboard Maintainer: [e11i0t23](https://github.com/e11i0t23)
+* Hardware Supported:  FreebirdNP Lite
+* Hardware Availability: [KeebsForAll](https://keebsforall.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make keebsforall/freebirdnp/lite:default
+    
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the top left key and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB 
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/data/templates/avr/rules.mk b/keyboards/keebsforall/freebirdnp/lite/rules.mk
similarity index 92%
rename from data/templates/avr/rules.mk
rename to keyboards/keebsforall/freebirdnp/lite/rules.mk
index 1275531ef6..9f2621eeb3 100644
--- a/data/templates/avr/rules.mk
+++ b/keyboards/keebsforall/freebirdnp/lite/rules.mk
@@ -1,5 +1,5 @@
 # MCU name
-MCU = atmega32u4
+MCU = atmega32u2
 
 # Bootloader selection
 BOOTLOADER = atmel-dfu
@@ -16,3 +16,5 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = numpad_5x4 ortho_5x4
diff --git a/keyboards/keebsforall/freebirdnp/pro/config.h b/keyboards/keebsforall/freebirdnp/pro/config.h
new file mode 100644
index 0000000000..53ced8ac03
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/pro/config.h
@@ -0,0 +1,58 @@
+/*
+Copyright 2021 Elliot Powell
+
+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"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x6B66
+#define PRODUCT_ID      0x1014
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    KeebsForAll
+#define PRODUCT         Freebird Numpad
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 4
+
+#define ENCODERS_PAD_A { D4 }
+#define ENCODERS_PAD_B { D5 }
+
+/*
+ * 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, B7, B6, B5, B4, B3 }
+#define MATRIX_COL_PINS { C7, B2, B1, B0 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* number of backlight levels */
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/keebsforall/freebirdnp/pro/info.json b/keyboards/keebsforall/freebirdnp/pro/info.json
new file mode 100644
index 0000000000..ed2a6e0b41
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/pro/info.json
@@ -0,0 +1,71 @@
+{
+    "keyboard_name": "FreebirdNP Pro",
+    "url": "https://keebsforall.com/products/fb-numpad-pro",
+    "maintainer": "e11i0t23",
+    "manufacturer": "KeebsForAll",
+    "layouts": {
+        "LAYOUT_numpad_6x4": {
+            "layout": [
+                {"label":"F1", "x":0, "y":0},
+                {"label":"F2", "x":1, "y":0},
+                {"label":"F3", "x":2, "y":0},
+                {"label":"MUTE", "x":3, "y":0},
+
+                {"label":"Num Lock", "x":0, "y":1},
+                {"label":"/", "x":1, "y":1},
+                {"label":"*", "x":2, "y":1},
+                {"label":"-", "x":3, "y":1},
+
+                {"label":"7", "x":0, "y":2},
+                {"label":"8", "x":1, "y":2},
+                {"label":"9", "x":2, "y":2},
+
+                {"label":"4", "x":0, "y":3},
+                {"label":"5", "x":1, "y":3},
+                {"label":"6", "x":2, "y":3},
+                {"label":"+", "x":3, "y":2, "h":2},
+
+                {"label":"1", "x":0, "y":4},
+                {"label":"2", "x":1, "y":4},
+                {"label":"3", "x":2, "y":4},
+
+                {"label":"0", "x":0, "y":5, "w":2},
+                {"label":".", "x":2, "y":5},
+                {"label":"Enter", "x":3, "y":4, "h":2}
+            ]
+        },
+        "LAYOUT_ortho_6x4": {
+            "layout": [
+                {"label":"F1", "x":0, "y":0},
+                {"label":"F2", "x":1, "y":0},
+                {"label":"F3", "x":2, "y":0},
+                {"label":"MUTE", "x":3, "y":0},
+
+                {"label":"Num Lock", "x":0, "y":1},
+                {"label":"/", "x":1, "y":1},
+                {"label":"*", "x":2, "y":1},
+                {"label":"-", "x":3, "y":1},
+
+                {"label":"7", "x":0, "y":2},
+                {"label":"8", "x":1, "y":2},
+                {"label":"9", "x":2, "y":2},
+                {"label":"+", "x":3, "y":2},
+
+                {"label":"4", "x":0, "y":3},
+                {"label":"5", "x":1, "y":3},
+                {"label":"6", "x":2, "y":3},
+                {"label":"+", "x":3, "y":3},
+
+                {"label":"1", "x":0, "y":4},
+                {"label":"2", "x":1, "y":4},
+                {"label":"3", "x":2, "y":4},
+                {"label":"Enter", "x":3, "y":4},
+
+                {"label":"0", "x":0, "y":5},
+                {"label":"00", "x":1, "y":5},
+                {"label":".", "x":2, "y":5},
+                {"label":"Enter", "x":3, "y":5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebsforall/freebirdnp/pro/keymaps/default/keymap.c b/keyboards/keebsforall/freebirdnp/pro/keymaps/default/keymap.c
new file mode 100644
index 0000000000..db6b1faf53
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/pro/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+/* Copyright 2021 Elliot Powell
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_numpad_6x4(
+    KC_F1,   KC_F2,   KC_F3,   KC_MUTE,
+    TG(1),   KC_PSLS, KC_PAST, KC_PMNS,
+    KC_P7,   KC_P8,   KC_P9,
+    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+    KC_P1,   KC_P2,   KC_P3,
+    KC_P0,            KC_PDOT, KC_PENT ),
+
+[1] = LAYOUT_numpad_6x4(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_HOME, KC_UP,   KC_PGUP,
+    KC_LEFT, KC_NO,   KC_RGHT, KC_TRNS,
+    KC_END,  KC_DOWN, KC_PGDN,
+    KC_INS,           KC_DEL,  KC_TRNS),
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    return false;
+}
diff --git a/keyboards/keebsforall/freebirdnp/pro/keymaps/via/keymap.c b/keyboards/keebsforall/freebirdnp/pro/keymaps/via/keymap.c
new file mode 100644
index 0000000000..e08edb6182
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/pro/keymaps/via/keymap.c
@@ -0,0 +1,51 @@
+/* Copyright 2021 Elliot Powell
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_ortho_6x4( /* Base */
+    KC_F1,   KC_F2,   KC_F3,   KC_MUTE,
+    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+    KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+    KC_P0,   KC_P0,   KC_PDOT, KC_PENT),
+
+[1] = LAYOUT_ortho_6x4( /* Empty for Dynamic keymap */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+[2] = LAYOUT_ortho_6x4( /* Empty for Dynamic keymap */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+[3] = LAYOUT_ortho_6x4( /* Empty for Dynamic keymap */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+};
+
diff --git a/keyboards/keebsforall/freebirdnp/pro/keymaps/via/rules.mk b/keyboards/keebsforall/freebirdnp/pro/keymaps/via/rules.mk
new file mode 100755
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/pro/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keebsforall/freebirdnp/pro/pro.c b/keyboards/keebsforall/freebirdnp/pro/pro.c
new file mode 100644
index 0000000000..dcc72d39b4
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/pro/pro.c
@@ -0,0 +1,28 @@
+/* Copyright 2021 Elliot Powell
+ *
+ * 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 "pro.h"
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    return false;
+}
diff --git a/keyboards/keebsforall/freebirdnp/pro/pro.h b/keyboards/keebsforall/freebirdnp/pro/pro.h
new file mode 100644
index 0000000000..41b241bee1
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/pro/pro.h
@@ -0,0 +1,52 @@
+/* Copyright 2021 Elliot Powell
+ *
+ * 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 XXX KC_NO
+
+#define LAYOUT_numpad_6x4( \
+    KF0, KF1, KF2, KF3,  \
+    K00, K01, K02, K03,  \
+    K10, K11, K12,       \
+    K20, K21, K22, K13,  \
+    K30, K31, K32,       \
+    K40,      K42, K33   \
+) { \
+    { KF0, KF1, KF2, KF3 }, \
+    { K00, K01, K02, K03 }, \
+    { K10, K11, K12, K13 }, \
+    { K20, K21, K22, XXX }, \
+    { K30, K31, K32, K33 }, \
+    { K40, XXX, K42, XXX }  \
+}
+
+#define LAYOUT_ortho_6x4( \
+    KF0, KF1, KF2, KF3,  \
+    K00, K01, K02, K03, \
+    K10, K11, K12, K13, \
+    K20, K21, K22, K23, \
+    K30, K31, K32, K33, \
+    K40, K41, K42, K43  \
+) { \
+    { KF0, KF1, KF2, KF3 }, \
+    { K00, K01, K02, K03 }, \
+    { K10, K11, K12, K13 }, \
+    { K20, K21, K22, K23 }, \
+    { K30, K31, K32, K33 }, \
+    { K40, K41, K42, K43 }  \
+}
diff --git a/keyboards/keebsforall/freebirdnp/pro/readme.md b/keyboards/keebsforall/freebirdnp/pro/readme.md
new file mode 100644
index 0000000000..3b06a72d11
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/pro/readme.md
@@ -0,0 +1,21 @@
+# Freebird Numpad Pro
+
+A basic numpad build to support the freebird range of products by keebsforall
+
+Pro Model features an Frow and Encoder
+
+* Keyboard Maintainer: [e11i0t23](https://github.com/e11i0t23)
+* Hardware Supported:  FreebirdNP Pro
+* Hardware Availability: [KeebsForAll](https://keebsforall.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make keebsforall/freebirdnp/pro:default
+    
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the top left key and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB 
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/keyboards/keebsforall/freebirdnp/pro/rules.mk b/keyboards/keebsforall/freebirdnp/pro/rules.mk
new file mode 100644
index 0000000000..fae02c7844
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/pro/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u2
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+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            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
+
+LAYOUTS = numpad_6x4 ortho_6x4
diff --git a/keyboards/keychron/q2/config.h b/keyboards/keychron/q2/config.h
index 8252b83df8..d019bcee15 100644
--- a/keyboards/keychron/q2/config.h
+++ b/keyboards/keychron/q2/config.h
@@ -29,6 +29,8 @@
 #define MATRIX_ROW_PINS { B4, B3, A15, A14, A13 }
 #define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, A8, A9, H3 }
 
+#define MATRIX_UNSELECT_DRIVE_HIGH
+
 /* DIP switch */
 #define DIP_SWITCH_MATRIX_GRID  { {4, 4} }
 
diff --git a/keyboards/keychron/q2/matrix.c b/keyboards/keychron/q2/matrix.c
deleted file mode 100644
index 1e493d33e2..0000000000
--- a/keyboards/keychron/q2/matrix.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-#include "util.h"
-#include "matrix.h"
-#include "debounce.h"
-#include "quantum.h"
-
-#ifdef MATRIX_ROW_PINS
-static pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
-#endif  // MATRIX_ROW_PINS
-#ifdef MATRIX_COL_PINS
-static pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
-#endif  // MATRIX_COL_PINS
-
-#define ROWS_PER_HAND (MATRIX_ROWS)
-
-/* matrix state(1:on, 0:off) */
-extern matrix_row_t raw_matrix[MATRIX_ROWS];  // raw values
-extern matrix_row_t matrix[MATRIX_ROWS];      // debounced values
-
-static inline void setPinOutput_writeLow(pin_t pin) {
-    ATOMIC_BLOCK_FORCEON {
-        setPinOutput(pin);
-        writePinLow(pin);
-    }
-}
-
-static inline void setPinOutput_writeHigh(pin_t pin) {
-    ATOMIC_BLOCK_FORCEON {
-        setPinOutput(pin);
-        writePinHigh(pin);
-    }
-}
-
-static inline void setPinInputHigh_atomic(pin_t pin) {
-    ATOMIC_BLOCK_FORCEON { setPinInputHigh(pin); }
-}
-
-static inline uint8_t readMatrixPin(pin_t pin) {
-    if (pin != NO_PIN) {
-        return readPin(pin);
-    } else {
-        return 1;
-    }
-}
-
-static bool select_col(uint8_t col) {
-    pin_t pin = col_pins[col];
-    if (pin != NO_PIN) {
-        setPinOutput_writeLow(pin);
-        return true;
-    }
-    return false;
-}
-
-static void unselect_col(uint8_t col) {
-    pin_t pin = col_pins[col];
-    if (pin != NO_PIN) {
-        setPinOutput_writeHigh(pin);
-    }
-}
-
-static void unselect_cols(void) {
-    for (uint8_t x = 0; x < MATRIX_COLS; x++) {
-        unselect_col(x);
-    }
-}
-
-void matrix_init_pins(void) {
-    unselect_cols();
-    for (uint8_t x = 0; x < ROWS_PER_HAND; x++) {
-        if (row_pins[x] != NO_PIN) {
-            setPinInputHigh_atomic(row_pins[x]);
-        }
-    }
-}
-
-void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
-    bool key_pressed = false;
-
-    // Select col
-    if (!select_col(current_col)) {  // select col
-        return;                      // skip NO_PIN col
-    }
-    matrix_output_select_delay();
-
-    // For each row...
-    for (uint8_t row_index = 0; row_index < ROWS_PER_HAND; row_index++) {
-        // Check row pin state
-        if (readMatrixPin(row_pins[row_index]) == 0) {
-            // Pin LO, set col bit
-            current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col);
-            key_pressed = true;
-        } else {
-            // Pin HI, clear col bit
-            current_matrix[row_index] &= ~(MATRIX_ROW_SHIFTER << current_col);
-        }
-    }
-
-    // Unselect col
-    unselect_col(current_col);
-    matrix_output_unselect_delay(current_col, key_pressed);  // wait for all Row signals to go HIGH
-}
-
-void matrix_init_custom(void) {
-    // initialize key pins
-    matrix_init_pins();
-}
-
-bool matrix_scan_custom(matrix_row_t current_matrix[]) {
-    matrix_row_t curr_matrix[MATRIX_ROWS] = {0};
-
-    // Set col, read rows
-    for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
-        matrix_read_rows_on_col(curr_matrix, current_col);
-    }
-
-    bool changed = memcmp(current_matrix, curr_matrix, sizeof(curr_matrix)) != 0;
-    if (changed) memcpy(current_matrix, curr_matrix, sizeof(curr_matrix));
-
-    return (uint8_t)changed;
-}
diff --git a/keyboards/keychron/q2/rev_0110/rules.mk b/keyboards/keychron/q2/rev_0110/rules.mk
index 957680ab11..30394028b3 100644
--- a/keyboards/keychron/q2/rev_0110/rules.mk
+++ b/keyboards/keychron/q2/rev_0110/rules.mk
@@ -1,6 +1,9 @@
 # MCU name
 MCU = STM32L433
 
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/keychron/q2/rev_0111/rules.mk b/keyboards/keychron/q2/rev_0111/rules.mk
index 3b931ef9fe..a295f48e10 100644
--- a/keyboards/keychron/q2/rev_0111/rules.mk
+++ b/keyboards/keychron/q2/rev_0111/rules.mk
@@ -1,6 +1,9 @@
 # MCU name
 MCU = STM32L433
 
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/keychron/q2/rev_0112/rules.mk b/keyboards/keychron/q2/rev_0112/rules.mk
index 957680ab11..30394028b3 100644
--- a/keyboards/keychron/q2/rev_0112/rules.mk
+++ b/keyboards/keychron/q2/rev_0112/rules.mk
@@ -1,6 +1,9 @@
 # MCU name
 MCU = STM32L433
 
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/keychron/q2/rev_0113/rules.mk b/keyboards/keychron/q2/rev_0113/rules.mk
index 3b931ef9fe..a295f48e10 100644
--- a/keyboards/keychron/q2/rev_0113/rules.mk
+++ b/keyboards/keychron/q2/rev_0113/rules.mk
@@ -1,6 +1,9 @@
 # MCU name
 MCU = STM32L433
 
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/keyprez/unicorn/info.json b/keyboards/keyprez/unicorn/info.json
index 6fb2ea74eb..ff14396f2a 100644
--- a/keyboards/keyprez/unicorn/info.json
+++ b/keyboards/keyprez/unicorn/info.json
@@ -4,7 +4,88 @@
     "maintainer": "Keyprez",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"|", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":8, "y":0}, {"label":"*", "x":9, "y":0}, {"label":"(", "x":10, "y":0}, {"label":")", "x":11, "y":0}, {"label":"_", "x":12, "y":0}, {"label":"+", "x":13, "y":0}, {"label":"Backspace", "x":14, "y":0, "w":2}, {"label":"Home", "x":16, "y":0}, {"label":"Rotary", "x":17, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"q", "x":1.5, "y":1}, {"label":"w", "x":2.5, "y":1}, {"label":"e", "x":3.5, "y":1}, {"label":"r", "x":4.5, "y":1}, {"label":"t", "x":5.5, "y":1}, {"label":"y", "x":7.5, "y":1}, {"label":"u", "x":8.5, "y":1}, {"label":"i", "x":9.5, "y":1}, {"label":"o", "x":10.5, "y":1}, {"label":"p", "x":11.5, "y":1}, {"label":"\u00e5", "x":12.5, "y":1}, {"label":"^", "x":13.5, "y":1}, {"label":"Enter", "x":14.75, "y":1, "w":1.25, "h":2}, {"label":"End", "x":16, "y":1}, {"label":"Delete", "x":17, "y":1}, {"label":"Esc", "x":0, "y":2, "w":1.75}, {"label":"a", "x":1.75, "y":2}, {"label":"s", "x":2.75, "y":2}, {"label":"d", "x":3.75, "y":2}, {"label":"f", "x":4.75, "y":2}, {"label":"g", "x":5.75, "y":2}, {"label":"h", "x":7.75, "y":2}, {"label":"j", "x":8.75, "y":2}, {"label":"k", "x":9.75, "y":2}, {"label":"l", "x":10.75, "y":2}, {"label":"\u00f8", "x":11.75, "y":2}, {"label":"\u00e6", "x":12.75, "y":2}, {"label":"'", "x":13.75, "y":2}, {"label":"PgUp", "x":16, "y":2}, {"label":"Insert", "x":17, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"<", "x":1.25, "y":3}, {"label":"z", "x":2.25, "y":3}, {"label":"x", "x":3.25, "y":3}, {"label":"c", "x":4.25, "y":3}, {"label":"v", "x":5.25, "y":3}, {"label":"b", "x":6.25, "y":3}, {"label":"n", "x":8.25, "y":3}, {"label":"m", "x":9.25, "y":3}, {"label":",", "x":10.25, "y":3}, {"label":".", "x":11.25, "y":3}, {"label":"-", "x":12.25, "y":3}, {"label":"Shift", "x":13.25, "y":3, "w":1.75}, {"label":"\u2191", "x":15, "y":3}, {"label":"PgDn", "x":16, "y":3}, {"label":"Copy", "x":17, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"label":"space", "x":3.75, "y":4, "w":2.25}, {"label":"space", "x":6, "y":4, "w":1.25}, {"label":"space", "x":8.25, "y":4, "w":2.75}, {"label":"AltGr", "x":11, "y":4}, {"label":"Mod", "x":12, "y":4}, {"label":"Ctrl", "x":13, "y":4}, {"label":"\u2190", "x":14, "y":4}, {"label":"\u2193", "x":15, "y":4}, {"label":"\u2192", "x":16, "y":4}, {"label":"Paste", "x":17, "y":4}]
+            "layout": [
+                {"label":"|\u00a7", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2\"", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4\u00a4", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6&", "x":6, "y":0},
+                {"label":"7/", "x":8, "y":0},
+                {"label":"8(", "x":9, "y":0},
+                {"label":"9)", "x":10, "y":0},
+                {"label":"0=", "x":11, "y":0},
+                {"label":"+?", "x":12, "y":0},
+                {"label":"\\`", "x":13, "y":0},
+                {"label":"Backspace", "x":14, "y":0, "w":2},
+                {"label":"Home", "x":16, "y":0},
+                {"label":"Rotary", "x":17, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":7.5, "y":1},
+                {"label":"U", "x":8.5, "y":1},
+                {"label":"I", "x":9.5, "y":1},
+                {"label":"O", "x":10.5, "y":1},
+                {"label":"P", "x":11.5, "y":1},
+                {"label":"\u00c5", "x":12.5, "y":1},
+                {"label":"\u00a8\u005e", "x":13.5, "y":1},
+                {"label":"End", "x":16, "y":1},
+                {"label":"Delete", "x":17, "y":1},
+
+                {"label":"Esc", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":7.75, "y":2},
+                {"label":"J", "x":8.75, "y":2},
+                {"label":"K", "x":9.75, "y":2},
+                {"label":"L", "x":10.75, "y":2},
+                {"label":"\u00d8", "x":11.75, "y":2},
+                {"label":"\u00c6", "x":12.75, "y":2},
+                {"label":"'*", "x":13.75, "y":2},
+                {"label":"Enter", "x":14.75, "y":1, "w":1.25, "h":2},
+                {"label":"PgUp", "x":16, "y":2},
+                {"label":"Insert", "x":17, "y":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":1.25},
+                {"label":"<>", "x":1.25, "y":3},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":8.25, "y":3},
+                {"label":"M", "x":9.25, "y":3},
+                {"label":",;", "x":10.25, "y":3},
+                {"label":".:", "x":11.25, "y":3},
+                {"label":"-_", "x":12.25, "y":3},
+                {"label":"Shift", "x":13.25, "y":3, "w":1.75},
+                {"label":"\u2191", "x":15, "y":3},
+                {"label":"PgDn", "x":16, "y":3},
+                {"label":"Copy", "x":17, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":2.25},
+                {"label":"Space", "x":6, "y":4, "w":1.25},
+                {"label":"Space", "x":8.25, "y":4, "w":2.75},
+                {"label":"AltGr", "x":11, "y":4},
+                {"label":"Mod", "x":12, "y":4},
+                {"label":"Ctrl", "x":13, "y":4},
+                {"label":"\u2190", "x":14, "y":4},
+                {"label":"\u2193", "x":15, "y":4},
+                {"label":"\u2192", "x":16, "y":4},
+                {"label":"Paste", "x":17, "y":4}
+            ]
         }
     }
 }
diff --git a/keyboards/keyten/kt60_m/info.json b/keyboards/keyten/kt60_m/info.json
index 9f40a13b29..7aa30e6251 100644
--- a/keyboards/keyten/kt60_m/info.json
+++ b/keyboards/keyten/kt60_m/info.json
@@ -1,9 +1,12 @@
 {
     "keyboard_name": "kt60-M",
     "url": "",
-    "maintainer": "keyten",
+    "maintainer": "key10iq",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_60_tsangan_hhkb"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_60_tsangan_hhkb": {
             "layout": [
                 {"x": 0, "y": 0},
                 {"x": 1, "y": 0},
diff --git a/keyboards/keyten/kt60_m/keymaps/default/keymap.c b/keyboards/keyten/kt60_m/keymaps/default/keymap.c
index f4343b2410..594dceb624 100644
--- a/keyboards/keyten/kt60_m/keymaps/default/keymap.c
+++ b/keyboards/keyten/kt60_m/keymaps/default/keymap.c
@@ -23,14 +23,14 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	[_MAIN] = LAYOUT(
+	[_MAIN] = LAYOUT_60_tsangan_hhkb(
 		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV, 
 		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_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_BSPC, 
 		KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, MO(1), 
 		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT,          KC_RGUI, KC_RCTL),
 
-	[_FN] = LAYOUT(
+	[_FN] = LAYOUT_60_tsangan_hhkb(
 		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, 
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/keyten/kt60_m/keymaps/via/keymap.c b/keyboards/keyten/kt60_m/keymaps/via/keymap.c
index 4e483027b2..3a9335f1d0 100644
--- a/keyboards/keyten/kt60_m/keymaps/via/keymap.c
+++ b/keyboards/keyten/kt60_m/keymaps/via/keymap.c
@@ -18,28 +18,28 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	[0] = LAYOUT(
+	[0] = LAYOUT_60_tsangan_hhkb(
 		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV, 
 		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_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_BSPC, 
 		KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, MO(1), 
 		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT,          KC_RGUI, KC_RCTL),
 
-	[1] = LAYOUT(
+	[1] = LAYOUT_60_tsangan_hhkb(
 		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, 
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
 		_______, _______, _______,                            _______,                            _______,          _______, _______),
 		
-	[2] = LAYOUT(
+	[2] = LAYOUT_60_tsangan_hhkb(
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
 		_______, _______, _______,                            _______,                            _______,          _______, _______),
 		
-	[3] = LAYOUT(
+	[3] = LAYOUT_60_tsangan_hhkb(
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/keyten/kt60_m/kt60_m.h b/keyboards/keyten/kt60_m/kt60_m.h
index 7006099251..1298537543 100644
--- a/keyboards/keyten/kt60_m/kt60_m.h
+++ b/keyboards/keyten/kt60_m/kt60_m.h
@@ -20,7 +20,7 @@
 
 #define XXX KC_NO
 
-/* LAYOUT
+/* LAYOUT_60_tsangan_hhkb
  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
  * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │2d │
  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
@@ -33,7 +33,7 @@
  * │40   │41 │42   │46                         │4a   │4c │4d   │
  * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
  */
-#define LAYOUT( \
+#define LAYOUT_60_tsangan_hhkb( \
 	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
 	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
 	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
diff --git a/keyboards/keyten/kt60_m/rules.mk b/keyboards/keyten/kt60_m/rules.mk
index 6983d5c803..c9cf2aa9b0 100644
--- a/keyboards/keyten/kt60_m/rules.mk
+++ b/keyboards/keyten/kt60_m/rules.mk
@@ -17,3 +17,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes
+
+LAYOUTS = 60_tsangan_hhkb
diff --git a/keyboards/latin17rgb/config.h b/keyboards/latincompass/latin17rgb/config.h
similarity index 100%
rename from keyboards/latin17rgb/config.h
rename to keyboards/latincompass/latin17rgb/config.h
diff --git a/keyboards/latin17rgb/info.json b/keyboards/latincompass/latin17rgb/info.json
similarity index 100%
rename from keyboards/latin17rgb/info.json
rename to keyboards/latincompass/latin17rgb/info.json
diff --git a/keyboards/latin17rgb/keymaps/default/keymap.c b/keyboards/latincompass/latin17rgb/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/latin17rgb/keymaps/default/keymap.c
rename to keyboards/latincompass/latin17rgb/keymaps/default/keymap.c
diff --git a/keyboards/latin17rgb/keymaps/via/keymap.c b/keyboards/latincompass/latin17rgb/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/latin17rgb/keymaps/via/keymap.c
rename to keyboards/latincompass/latin17rgb/keymaps/via/keymap.c
diff --git a/keyboards/latin60rgb/keymaps/via/rules.mk b/keyboards/latincompass/latin17rgb/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/latin60rgb/keymaps/via/rules.mk
rename to keyboards/latincompass/latin17rgb/keymaps/via/rules.mk
diff --git a/keyboards/latin17rgb/latin17rgb.c b/keyboards/latincompass/latin17rgb/latin17rgb.c
similarity index 100%
rename from keyboards/latin17rgb/latin17rgb.c
rename to keyboards/latincompass/latin17rgb/latin17rgb.c
diff --git a/keyboards/latin17rgb/latin17rgb.h b/keyboards/latincompass/latin17rgb/latin17rgb.h
similarity index 100%
rename from keyboards/latin17rgb/latin17rgb.h
rename to keyboards/latincompass/latin17rgb/latin17rgb.h
diff --git a/keyboards/latin17rgb/readme.md b/keyboards/latincompass/latin17rgb/readme.md
similarity index 89%
rename from keyboards/latin17rgb/readme.md
rename to keyboards/latincompass/latin17rgb/readme.md
index 775055f27a..aa7095b5d6 100644
--- a/keyboards/latin17rgb/readme.md
+++ b/keyboards/latincompass/latin17rgb/readme.md
@@ -9,11 +9,11 @@
 
 Make example for this keyboard (after setting up your build environment):
 
-    make latin17rgb:default
+    make latincompass/latin17rgb:default
 
 Flashing example for this keyboard:
 
-    make latin17rgb:default:flash
+    make latincompass/latin17rgb:default:flash
 
 To reset the board into bootloader mode, hold the key at the top left of the keyboard while connecting the USB cable (also erases persistent settings).
 
diff --git a/keyboards/latin17rgb/rules.mk b/keyboards/latincompass/latin17rgb/rules.mk
similarity index 100%
rename from keyboards/latin17rgb/rules.mk
rename to keyboards/latincompass/latin17rgb/rules.mk
diff --git a/keyboards/latin47ble/config.h b/keyboards/latincompass/latin47ble/config.h
similarity index 100%
rename from keyboards/latin47ble/config.h
rename to keyboards/latincompass/latin47ble/config.h
diff --git a/keyboards/latin47ble/info.json b/keyboards/latincompass/latin47ble/info.json
similarity index 100%
rename from keyboards/latin47ble/info.json
rename to keyboards/latincompass/latin47ble/info.json
diff --git a/keyboards/latin47ble/keymaps/default/keymap.c b/keyboards/latincompass/latin47ble/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/latin47ble/keymaps/default/keymap.c
rename to keyboards/latincompass/latin47ble/keymaps/default/keymap.c
diff --git a/keyboards/latin47ble/keymaps/via/keymap.c b/keyboards/latincompass/latin47ble/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/latin47ble/keymaps/via/keymap.c
rename to keyboards/latincompass/latin47ble/keymaps/via/keymap.c
diff --git a/keyboards/latin64ble/keymaps/via/rules.mk b/keyboards/latincompass/latin47ble/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/latin64ble/keymaps/via/rules.mk
rename to keyboards/latincompass/latin47ble/keymaps/via/rules.mk
diff --git a/keyboards/latin47ble/latin47ble.c b/keyboards/latincompass/latin47ble/latin47ble.c
similarity index 100%
rename from keyboards/latin47ble/latin47ble.c
rename to keyboards/latincompass/latin47ble/latin47ble.c
diff --git a/keyboards/latin47ble/latin47ble.h b/keyboards/latincompass/latin47ble/latin47ble.h
similarity index 100%
rename from keyboards/latin47ble/latin47ble.h
rename to keyboards/latincompass/latin47ble/latin47ble.h
diff --git a/keyboards/latin47ble/readme.md b/keyboards/latincompass/latin47ble/readme.md
similarity index 93%
rename from keyboards/latin47ble/readme.md
rename to keyboards/latincompass/latin47ble/readme.md
index cc8e9e6a34..f03a15d826 100644
--- a/keyboards/latin47ble/readme.md
+++ b/keyboards/latincompass/latin47ble/readme.md
@@ -9,6 +9,6 @@ macro 47 ble 4.0 RGB keyboard
 
 Make example for this keyboard (after setting up your build environment):
 
-    make latin47ble:default
+    make latincompass/latin47ble:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/latin47ble/rules.mk b/keyboards/latincompass/latin47ble/rules.mk
similarity index 100%
rename from keyboards/latin47ble/rules.mk
rename to keyboards/latincompass/latin47ble/rules.mk
diff --git a/keyboards/latin60rgb/config.h b/keyboards/latincompass/latin60rgb/config.h
similarity index 100%
rename from keyboards/latin60rgb/config.h
rename to keyboards/latincompass/latin60rgb/config.h
diff --git a/keyboards/latin60rgb/info.json b/keyboards/latincompass/latin60rgb/info.json
similarity index 100%
rename from keyboards/latin60rgb/info.json
rename to keyboards/latincompass/latin60rgb/info.json
diff --git a/keyboards/latin60rgb/keymaps/default/keymap.c b/keyboards/latincompass/latin60rgb/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/latin60rgb/keymaps/default/keymap.c
rename to keyboards/latincompass/latin60rgb/keymaps/default/keymap.c
diff --git a/keyboards/latin60rgb/keymaps/via/keymap.c b/keyboards/latincompass/latin60rgb/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/latin60rgb/keymaps/via/keymap.c
rename to keyboards/latincompass/latin60rgb/keymaps/via/keymap.c
diff --git a/keyboards/latin6rgb/keymaps/via/rules.mk b/keyboards/latincompass/latin60rgb/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/latin6rgb/keymaps/via/rules.mk
rename to keyboards/latincompass/latin60rgb/keymaps/via/rules.mk
diff --git a/keyboards/latin60rgb/latin60rgb.c b/keyboards/latincompass/latin60rgb/latin60rgb.c
similarity index 100%
rename from keyboards/latin60rgb/latin60rgb.c
rename to keyboards/latincompass/latin60rgb/latin60rgb.c
diff --git a/keyboards/latin60rgb/latin60rgb.h b/keyboards/latincompass/latin60rgb/latin60rgb.h
similarity index 100%
rename from keyboards/latin60rgb/latin60rgb.h
rename to keyboards/latincompass/latin60rgb/latin60rgb.h
diff --git a/keyboards/latin60rgb/readme.md b/keyboards/latincompass/latin60rgb/readme.md
similarity index 94%
rename from keyboards/latin60rgb/readme.md
rename to keyboards/latincompass/latin60rgb/readme.md
index 3b5715c2da..ae855bc8c1 100644
--- a/keyboards/latin60rgb/readme.md
+++ b/keyboards/latincompass/latin60rgb/readme.md
@@ -9,6 +9,6 @@
 
 Make example for this keyboard (after setting up your build environment):
 
-    make latin60rgb:default
+    make latincompass/latin60rgb:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/latin60rgb/rules.mk b/keyboards/latincompass/latin60rgb/rules.mk
similarity index 100%
rename from keyboards/latin60rgb/rules.mk
rename to keyboards/latincompass/latin60rgb/rules.mk
diff --git a/keyboards/latin64ble/config.h b/keyboards/latincompass/latin64ble/config.h
similarity index 100%
rename from keyboards/latin64ble/config.h
rename to keyboards/latincompass/latin64ble/config.h
diff --git a/keyboards/latin64ble/info.json b/keyboards/latincompass/latin64ble/info.json
similarity index 100%
rename from keyboards/latin64ble/info.json
rename to keyboards/latincompass/latin64ble/info.json
diff --git a/keyboards/latin64ble/keymaps/default/keymap.c b/keyboards/latincompass/latin64ble/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/latin64ble/keymaps/default/keymap.c
rename to keyboards/latincompass/latin64ble/keymaps/default/keymap.c
diff --git a/keyboards/latin64ble/keymaps/via/keymap.c b/keyboards/latincompass/latin64ble/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/latin64ble/keymaps/via/keymap.c
rename to keyboards/latincompass/latin64ble/keymaps/via/keymap.c
diff --git a/keyboards/latinpad/keymaps/via/rules.mk b/keyboards/latincompass/latin64ble/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/latinpad/keymaps/via/rules.mk
rename to keyboards/latincompass/latin64ble/keymaps/via/rules.mk
diff --git a/keyboards/latin64ble/latin64ble.c b/keyboards/latincompass/latin64ble/latin64ble.c
similarity index 100%
rename from keyboards/latin64ble/latin64ble.c
rename to keyboards/latincompass/latin64ble/latin64ble.c
diff --git a/keyboards/latin64ble/latin64ble.h b/keyboards/latincompass/latin64ble/latin64ble.h
similarity index 100%
rename from keyboards/latin64ble/latin64ble.h
rename to keyboards/latincompass/latin64ble/latin64ble.h
diff --git a/keyboards/latin64ble/readme.md b/keyboards/latincompass/latin64ble/readme.md
similarity index 93%
rename from keyboards/latin64ble/readme.md
rename to keyboards/latincompass/latin64ble/readme.md
index 98f5e50a69..d8ee92d16d 100644
--- a/keyboards/latin64ble/readme.md
+++ b/keyboards/latincompass/latin64ble/readme.md
@@ -9,6 +9,6 @@ macro 64 ble 4.0 RGB keyboard
 
 Make example for this keyboard (after setting up your build environment):
 
-    make latin64ble:default
+    make latincompass/latin64ble:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/latin64ble/rules.mk b/keyboards/latincompass/latin64ble/rules.mk
similarity index 100%
rename from keyboards/latin64ble/rules.mk
rename to keyboards/latincompass/latin64ble/rules.mk
diff --git a/keyboards/latin6rgb/config.h b/keyboards/latincompass/latin6rgb/config.h
similarity index 100%
rename from keyboards/latin6rgb/config.h
rename to keyboards/latincompass/latin6rgb/config.h
diff --git a/keyboards/latin6rgb/info.json b/keyboards/latincompass/latin6rgb/info.json
similarity index 100%
rename from keyboards/latin6rgb/info.json
rename to keyboards/latincompass/latin6rgb/info.json
diff --git a/keyboards/latin6rgb/keymaps/default/keymap.c b/keyboards/latincompass/latin6rgb/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/latin6rgb/keymaps/default/keymap.c
rename to keyboards/latincompass/latin6rgb/keymaps/default/keymap.c
diff --git a/keyboards/latin6rgb/keymaps/via/keymap.c b/keyboards/latincompass/latin6rgb/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/latin6rgb/keymaps/via/keymap.c
rename to keyboards/latincompass/latin6rgb/keymaps/via/keymap.c
diff --git a/keyboards/latinpadble/keymaps/via/rules.mk b/keyboards/latincompass/latin6rgb/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/latinpadble/keymaps/via/rules.mk
rename to keyboards/latincompass/latin6rgb/keymaps/via/rules.mk
diff --git a/keyboards/latin6rgb/latin6rgb.c b/keyboards/latincompass/latin6rgb/latin6rgb.c
similarity index 100%
rename from keyboards/latin6rgb/latin6rgb.c
rename to keyboards/latincompass/latin6rgb/latin6rgb.c
diff --git a/keyboards/latin6rgb/latin6rgb.h b/keyboards/latincompass/latin6rgb/latin6rgb.h
similarity index 100%
rename from keyboards/latin6rgb/latin6rgb.h
rename to keyboards/latincompass/latin6rgb/latin6rgb.h
diff --git a/keyboards/latin6rgb/readme.md b/keyboards/latincompass/latin6rgb/readme.md
similarity index 93%
rename from keyboards/latin6rgb/readme.md
rename to keyboards/latincompass/latin6rgb/readme.md
index 5338f1625c..24d340a510 100644
--- a/keyboards/latin6rgb/readme.md
+++ b/keyboards/latincompass/latin6rgb/readme.md
@@ -9,6 +9,6 @@
 
 Make example for this keyboard (after setting up your build environment):
 
-    make latin6rgb:default
+    make latincompass/latin6rgb:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/latin6rgb/rules.mk b/keyboards/latincompass/latin6rgb/rules.mk
similarity index 100%
rename from keyboards/latin6rgb/rules.mk
rename to keyboards/latincompass/latin6rgb/rules.mk
diff --git a/keyboards/latinpad/config.h b/keyboards/latincompass/latinpad/config.h
similarity index 100%
rename from keyboards/latinpad/config.h
rename to keyboards/latincompass/latinpad/config.h
diff --git a/keyboards/latinpad/info.json b/keyboards/latincompass/latinpad/info.json
similarity index 100%
rename from keyboards/latinpad/info.json
rename to keyboards/latincompass/latinpad/info.json
diff --git a/keyboards/latinpad/keymaps/default/keymap.c b/keyboards/latincompass/latinpad/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/latinpad/keymaps/default/keymap.c
rename to keyboards/latincompass/latinpad/keymaps/default/keymap.c
diff --git a/keyboards/latinpad/keymaps/via/keymap.c b/keyboards/latincompass/latinpad/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/latinpad/keymaps/via/keymap.c
rename to keyboards/latincompass/latinpad/keymaps/via/keymap.c
diff --git a/keyboards/pistachio_pro/keymaps/via/rules.mk b/keyboards/latincompass/latinpad/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/pistachio_pro/keymaps/via/rules.mk
rename to keyboards/latincompass/latinpad/keymaps/via/rules.mk
diff --git a/keyboards/latinpad/latinpad.c b/keyboards/latincompass/latinpad/latinpad.c
similarity index 100%
rename from keyboards/latinpad/latinpad.c
rename to keyboards/latincompass/latinpad/latinpad.c
diff --git a/keyboards/latinpad/latinpad.h b/keyboards/latincompass/latinpad/latinpad.h
similarity index 100%
rename from keyboards/latinpad/latinpad.h
rename to keyboards/latincompass/latinpad/latinpad.h
diff --git a/keyboards/latinpad/lib/glcdfont.c b/keyboards/latincompass/latinpad/lib/glcdfont.c
similarity index 100%
rename from keyboards/latinpad/lib/glcdfont.c
rename to keyboards/latincompass/latinpad/lib/glcdfont.c
diff --git a/keyboards/latinpad/readme.md b/keyboards/latincompass/latinpad/readme.md
similarity index 94%
rename from keyboards/latinpad/readme.md
rename to keyboards/latincompass/latinpad/readme.md
index 620bf64301..6fcd0f3a01 100644
--- a/keyboards/latinpad/readme.md
+++ b/keyboards/latincompass/latinpad/readme.md
@@ -9,6 +9,6 @@ macro 2 rotary encoder pad
 
 Make example for this keyboard (after setting up your build environment):
 
-    make latinpad:default
+    make latincompass/latinpad:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/latinpad/rules.mk b/keyboards/latincompass/latinpad/rules.mk
similarity index 100%
rename from keyboards/latinpad/rules.mk
rename to keyboards/latincompass/latinpad/rules.mk
diff --git a/keyboards/latinpadble/config.h b/keyboards/latincompass/latinpadble/config.h
similarity index 100%
rename from keyboards/latinpadble/config.h
rename to keyboards/latincompass/latinpadble/config.h
diff --git a/keyboards/latinpadble/info.json b/keyboards/latincompass/latinpadble/info.json
similarity index 100%
rename from keyboards/latinpadble/info.json
rename to keyboards/latincompass/latinpadble/info.json
diff --git a/keyboards/latinpadble/keymaps/default/keymap.c b/keyboards/latincompass/latinpadble/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/latinpadble/keymaps/default/keymap.c
rename to keyboards/latincompass/latinpadble/keymaps/default/keymap.c
diff --git a/keyboards/latinpadble/keymaps/via/keymap.c b/keyboards/latincompass/latinpadble/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/latinpadble/keymaps/via/keymap.c
rename to keyboards/latincompass/latinpadble/keymaps/via/keymap.c
diff --git a/keyboards/latincompass/latinpadble/keymaps/via/rules.mk b/keyboards/latincompass/latinpadble/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/latincompass/latinpadble/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/latinpadble/latinpadble.c b/keyboards/latincompass/latinpadble/latinpadble.c
similarity index 100%
rename from keyboards/latinpadble/latinpadble.c
rename to keyboards/latincompass/latinpadble/latinpadble.c
diff --git a/keyboards/latinpadble/latinpadble.h b/keyboards/latincompass/latinpadble/latinpadble.h
similarity index 100%
rename from keyboards/latinpadble/latinpadble.h
rename to keyboards/latincompass/latinpadble/latinpadble.h
diff --git a/keyboards/latinpadble/lib/glcdfont.c b/keyboards/latincompass/latinpadble/lib/glcdfont.c
similarity index 100%
rename from keyboards/latinpadble/lib/glcdfont.c
rename to keyboards/latincompass/latinpadble/lib/glcdfont.c
diff --git a/keyboards/latinpadble/readme.md b/keyboards/latincompass/latinpadble/readme.md
similarity index 94%
rename from keyboards/latinpadble/readme.md
rename to keyboards/latincompass/latinpadble/readme.md
index 324a28febf..2e1e6dbb8c 100644
--- a/keyboards/latinpadble/readme.md
+++ b/keyboards/latincompass/latinpadble/readme.md
@@ -9,6 +9,6 @@ Panasonic rotary encoder BLE pad
 
 Make example for this keyboard (after setting up your build environment):
 
-    make latinpadble:default
+    make latincompass/latinpadble:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/latinpadble/rules.mk b/keyboards/latincompass/latinpadble/rules.mk
similarity index 100%
rename from keyboards/latinpadble/rules.mk
rename to keyboards/latincompass/latinpadble/rules.mk
diff --git a/keyboards/lfkeyboards/mini1800/config.h b/keyboards/lfkeyboards/mini1800/config.h
index 1504a95cb4..7c81c9f98c 100644
--- a/keyboards/lfkeyboards/mini1800/config.h
+++ b/keyboards/lfkeyboards/mini1800/config.h
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define PRODUCT_ID      0x6060
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    LFKeyboards
-#define PRODUCT         LFK87
+#define PRODUCT         Mini1800
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/lfkeyboards/mini1800/info.json b/keyboards/lfkeyboards/mini1800/info.json
index 5d2662b877..0625ee43d4 100644
--- a/keyboards/lfkeyboards/mini1800/info.json
+++ b/keyboards/lfkeyboards/mini1800/info.json
@@ -1,10 +1,97 @@
 {
     "keyboard_name": "Mini1800",
     "url": "",
-    "maintainer": "qmk",
+    "maintainer": "lfkeyboards",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Back Space", "x":13, "y":0, "w":2}, {"label":"Num Lock", "x":15.5, "y":0}, {"label":"/", "x":16.5, "y":0}, {"label":"*", "x":17.5, "y":0}, {"label":"-", "x":18.5, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"7", "x":15.5, "y":1}, {"label":"8", "x":16.5, "y":1}, {"label":"9", "x":17.5, "y":1}, {"label":"+", "x":18.5, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.25}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"4", "x":15.5, "y":2}, {"label":"5", "x":16.5, "y":2}, {"label":"6", "x":17.5, "y":2}, {"label":"+", "x":18.5, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"1", "x":15.5, "y":3}, {"label":"2", "x":16.5, "y":3}, {"label":"3", "x":17.5, "y":3}, {"label":"Enter", "x":18.5, "y":3, "h":2}, {"label":"\u2191", "x":14.25, "y":3.25}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Fn", "x":11, "y":4}, {"label":"Ctrl", "x":12, "y":4}, {"label":"0", "x":16.5, "y":4}, {"label":".", "x":17.5, "y":4}, {"label":"\u2190", "x":13.25, "y":4.25}, {"label":"\u2193", "x":14.25, "y":4.25}, {"label":"\u2192", "x":15.25, "y":4.25}]
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Back Space", "x":13, "y":0, "w":2},
+                {"label":"Num Lock", "x":15.5, "y":0},
+                {"label":"/", "x":16.5, "y":0},
+                {"label":"*", "x":17.5, "y":0},
+                {"label":"-", "x":18.5, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+                {"label":"7", "x":15.5, "y":1},
+                {"label":"8", "x":16.5, "y":1},
+                {"label":"9", "x":17.5, "y":1},
+                {"label":"+", "x":18.5, "y":1},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.25},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+                {"label":"4", "x":15.5, "y":2},
+                {"label":"5", "x":16.5, "y":2},
+                {"label":"6", "x":17.5, "y":2},
+                {"label":"+", "x":18.5, "y":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"\u2191", "x":14.25, "y":3.25},
+                {"label":"1", "x":15.5, "y":3},
+                {"label":"2", "x":16.5, "y":3},
+                {"label":"3", "x":17.5, "y":3},
+                {"label":"Enter", "x":18.5, "y":3, "h":2},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4},
+                {"label":"Fn", "x":11, "y":4},
+                {"label":"Ctrl", "x":12, "y":4},
+                {"label":"\u2190", "x":13.25, "y":4.25},
+                {"label":"\u2193", "x":14.25, "y":4.25},
+                {"label":"\u2192", "x":15.25, "y":4.25},
+                {"label":"0", "x":16.5, "y":4},
+                {"label":".", "x":17.5, "y":4}
+            ]
         }
     }
 }
diff --git a/keyboards/lfkeyboards/mini1800/keymaps/ca178858/rules.mk b/keyboards/lfkeyboards/mini1800/keymaps/ca178858/rules.mk
index 60cf911c00..e5ddcae8d9 100644
--- a/keyboards/lfkeyboards/mini1800/keymaps/ca178858/rules.mk
+++ b/keyboards/lfkeyboards/mini1800/keymaps/ca178858/rules.mk
@@ -1,45 +1 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no            # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes           # Audio control and System control(+450)
-CONSOLE_ENABLE = no             # Console for debug(+400)
-COMMAND_ENABLE = no             # Commands for debug and configuration
-NKRO_ENABLE = yes
-BACKLIGHT_ENABLE = yes           # Enable keyboard backlight functionality
-MIDI_ENABLE = no                # MIDI controls
-AUDIO_ENABLE = yes              # Audio output on port C6
-UNICODE_ENABLE = no             # Unicode
-BLUETOOTH_ENABLE = no           # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes           # Enable RGB underlight
-RGBLIGHT_CUSTOM_DRIVER = yes    # RGB code is implemented in lefkeyboards, not WS2812
-SLEEP_LED_ENABLE = yes
 TAP_DANCE_ENABLE = yes
-
-ISSI_ENABLE = yes			# If the I2C pullup resistors aren't install this must be disabled
-WATCHDOG_ENABLE = yes		# Resets keyboard if matrix_scan isn't run every 250ms
-
-
-
-ifeq ($(strip $(ISSI_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DISSI_ENABLE
-endif
-
-ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
-endif
-
-
-# # Set the LFK78 hardware version. This is defined in rules.mk, but can be overidden here if desired
-# #
-# # RevB - first public release, uses atmega32u4, has audio, ISSI matrix split between RGB and backlight
-# # RevC/D - at90usb1286, no audio, ISSI device 0 is backlight, 4 is RGB
-# #
-# # Set to B, C or D
-# LFK_REV = D
-
-# ifeq ($(LFK_REV), B)
-# 	MCU = atmega32u4
-# else
-# 	MCU = at90usb1286
-# endif
-# OPT_DEFS += -DLFK_REV_$(LFK_REV)
-# OPT_DEFS += -DUSB_PRODUCT=\"LFK_Rev$(LFK_REV)\"
diff --git a/keyboards/lfkeyboards/mini1800/keymaps/default/rules.mk b/keyboards/lfkeyboards/mini1800/keymaps/default/rules.mk
deleted file mode 100644
index 4b9182a0a2..0000000000
--- a/keyboards/lfkeyboards/mini1800/keymaps/default/rules.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no            # Mouse keys
-EXTRAKEY_ENABLE = yes           # Audio control and System control
-CONSOLE_ENABLE = no             # Console for debug
-COMMAND_ENABLE = no             # Commands for debug and configuration
-NKRO_ENABLE = yes
-BACKLIGHT_ENABLE = yes           # Enable keyboard backlight functionality
-AUDIO_ENABLE = yes              # Audio output
-RGBLIGHT_ENABLE = yes           # Enable RGB underlight
-RGBLIGHT_CUSTOM_DRIVER = yes    # RGB code is implemented in lefkeyboards, not WS2812
-SLEEP_LED_ENABLE = yes
-
-ISSI_ENABLE = yes			# If the I2C pullup resistors aren't install this must be disabled
-WATCHDOG_ENABLE = yes		# Resets keyboard if matrix_scan isn't run every 250ms
-
-
-ifeq ($(strip $(ISSI_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DISSI_ENABLE
-endif
-
-ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
-endif
-
-
-# # Set the LFK78 hardware version. This is defined in rules.mk, but can be overidden here if desired
-# #
-# # RevB - first public release, uses atmega32u4, has audio, ISSI matrix split between RGB and backlight
-# # RevC/D - at90usb1286, no audio, ISSI device 0 is backlight, 4 is RGB
-# #
-# # Set to B, C or D
-# LFK_REV = D
-
-# ifeq ($(LFK_REV), B)
-# 	MCU = atmega32u4
-# else
-# 	MCU = at90usb1286
-# endif
-# OPT_DEFS += -DLFK_REV_$(LFK_REV)
-# OPT_DEFS += -DUSB_PRODUCT=\"LFK_Rev$(LFK_REV)\"
diff --git a/keyboards/lfkeyboards/mini1800/post_rules.mk b/keyboards/lfkeyboards/mini1800/post_rules.mk
deleted file mode 100644
index f04e10e4a3..0000000000
--- a/keyboards/lfkeyboards/mini1800/post_rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-ifeq ($(LFK_REV), A)
-    MCU = at90usb1286
-else
-    MCU = at90usb646
-endif
-
-ifeq ($(strip $(ISSI_ENABLE)), yes)
-    # TMK_COMMON_DEFS += -DISSI_ENABLE
-endif
diff --git a/keyboards/lfkeyboards/mini1800/readme.md b/keyboards/lfkeyboards/mini1800/readme.md
index e2839275cc..4e35ac537e 100644
--- a/keyboards/lfkeyboards/mini1800/readme.md
+++ b/keyboards/lfkeyboards/mini1800/readme.md
@@ -1,12 +1,26 @@
-Mini1800
-===
+# Mini1800
 
-Keyboard Maintainer: [LFKeyboards](https://github.com/lfkeyboards)  
-Hardware Supported: Mini1800  
-Hardware Availability: [LFKeyboards.com](https://www.lfkeyboards.com/)
+* Keyboard Maintainer: [LFKeyboards](https://github.com/lfkeyboards)
+* Hardware Supported:
+  * [Mini1800 RevA](reva/) - Green PCB with AT90USB1286
+  * [Mini1800 RevC](revc/) - Black PCB with AT90USB646; first public release
+* Hardware Availability: [LFKeyboards.com](https://www.lfkeyboards.com/)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make lfkeyboards/mini1800:default
+    make lfkeyboards/mini1800/reva:default
+    make lfkeyboards/mini1800/revc:default
 
-See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. 
+Flashing example for this keyboard:
+
+    make lfkeyboards/mini1800/reva:default:flash
+    make lfkeyboards/mini1800/revc:default:flash
+
+## Bootloader
+
+To reset the board into bootloader mode, do one of the following:
+
+* **Physical reset button**: Briefly press the button on the bottom of the PCB (between Q and W keys)
+* **Keycode in keymap**: Press the key mapped to `RESET` if it is available (`Fn`+`Right Shift`, then tap `Enter` by default)
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/lfkeyboards/mini1800/reva/post_rules.mk b/keyboards/lfkeyboards/mini1800/reva/post_rules.mk
new file mode 100644
index 0000000000..ad997587b2
--- /dev/null
+++ b/keyboards/lfkeyboards/mini1800/reva/post_rules.mk
@@ -0,0 +1,7 @@
+ifeq ($(strip $(ISSI_ENABLE)), yes)
+    TMK_COMMON_DEFS += -DISSI_ENABLE
+endif
+
+ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
+    TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
+endif
diff --git a/keyboards/lfkeyboards/mini1800/reva/readme.md b/keyboards/lfkeyboards/mini1800/reva/readme.md
new file mode 100644
index 0000000000..8460bb5326
--- /dev/null
+++ b/keyboards/lfkeyboards/mini1800/reva/readme.md
@@ -0,0 +1,22 @@
+# Mini1800 RevA
+
+* Keyboard Maintainer: [LFKeyboards](https://github.com/lfkeyboards)
+* Hardware Supported: Mini1800 RevA (Green PCB with AT90USB1286)
+* Hardware Availability: [LFKeyboards.com](https://www.lfkeyboards.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make lfkeyboards/mini1800/reva:default
+
+Flashing example for this keyboard:
+
+    make lfkeyboards/mini1800/reva:default:flash
+
+## Bootloader
+
+To reset the board into bootloader mode, do one of the following:
+
+* **Physical reset button**: Briefly press the button on the bottom of the PCB (between Q and W keys)
+* **Keycode in keymap**: Press the key mapped to `RESET` if it is available (`Fn`+`Right Shift`, then tap `Enter` by default)
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/lfkeyboards/mini1800/reva/rules.mk b/keyboards/lfkeyboards/mini1800/reva/rules.mk
new file mode 100644
index 0000000000..1f67c5f199
--- /dev/null
+++ b/keyboards/lfkeyboards/mini1800/reva/rules.mk
@@ -0,0 +1,29 @@
+# MCU name
+MCU = at90usb1286
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = yes          # Audio output
+
+# RGB code is implemented in lfkeyboards, not WS2812
+RGBLIGHT_CUSTOM_DRIVER = yes
+BACKLIGHT_DRIVER = custom
+SLEEP_LED_ENABLE = yes
+
+ISSI_ENABLE = yes           # If the I2C pullup resistors aren't install this must be disabled
+WATCHDOG_ENABLE = yes       # Resets keyboard if matrix_scan isn't run every 250ms
+
+# Extra source files for IS3731 lighting
+SRC = TWIlib.c issi.c lighting.c
diff --git a/keyboards/lfkeyboards/mini1800/revc/post_rules.mk b/keyboards/lfkeyboards/mini1800/revc/post_rules.mk
new file mode 100644
index 0000000000..ad997587b2
--- /dev/null
+++ b/keyboards/lfkeyboards/mini1800/revc/post_rules.mk
@@ -0,0 +1,7 @@
+ifeq ($(strip $(ISSI_ENABLE)), yes)
+    TMK_COMMON_DEFS += -DISSI_ENABLE
+endif
+
+ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
+    TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
+endif
diff --git a/keyboards/lfkeyboards/mini1800/revc/readme.md b/keyboards/lfkeyboards/mini1800/revc/readme.md
new file mode 100644
index 0000000000..5d442cb6d9
--- /dev/null
+++ b/keyboards/lfkeyboards/mini1800/revc/readme.md
@@ -0,0 +1,24 @@
+# Mini1800 RevC
+
+The first public release of the Mini1800.
+
+* Keyboard Maintainer: [LFKeyboards](https://github.com/lfkeyboards)
+* Hardware Supported: Mini1800 RevC (Black PCB with AT90USB646)
+* Hardware Availability: [LFKeyboards.com](https://www.lfkeyboards.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make lfkeyboards/mini1800/revc:default
+
+Flashing example for this keyboard:
+
+    make lfkeyboards/mini1800/revc:default:flash
+
+## Bootloader
+
+To reset the board into bootloader mode, do one of the following:
+
+* **Physical reset button**: Briefly press the button on the bottom of the PCB (between Q and W keys)
+* **Keycode in keymap**: Press the key mapped to `RESET` if it is available (`Fn`+`Right Shift`, then tap `Enter` by default)
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/lfkeyboards/mini1800/revc/rules.mk b/keyboards/lfkeyboards/mini1800/revc/rules.mk
new file mode 100644
index 0000000000..0ea69b6d6f
--- /dev/null
+++ b/keyboards/lfkeyboards/mini1800/revc/rules.mk
@@ -0,0 +1,29 @@
+# MCU name
+MCU = at90usb646
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = yes          # Audio output
+
+# RGB code is implemented in lfkeyboards, not WS2812
+RGBLIGHT_CUSTOM_DRIVER = yes
+BACKLIGHT_DRIVER = custom
+SLEEP_LED_ENABLE = yes
+
+ISSI_ENABLE = yes           # If the I2C pullup resistors aren't install this must be disabled
+WATCHDOG_ENABLE = yes       # Resets keyboard if matrix_scan isn't run every 250ms
+
+# Extra source files for IS3731 lighting
+SRC = TWIlib.c issi.c lighting.c
diff --git a/keyboards/lfkeyboards/mini1800/rules.mk b/keyboards/lfkeyboards/mini1800/rules.mk
deleted file mode 100644
index c9a9b01054..0000000000
--- a/keyboards/lfkeyboards/mini1800/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Set the LFK87 hardware version.
-#
-# RevA - Green PCB. at90usb1286 Only 3 exist
-# RevB - We don't talk about RevB
-# RevC - Black PCB. at90usb646 First public release
-#
-# Set to A or C
-LFK_REV = C
-
-BOOTLOADER = atmel-dfu
-OPT_DEFS += -DLFK_TKL_REV_$(LFK_REV)
-
-# Extra source files for IS3731 lighting
-SRC = TWIlib.c issi.c lighting.c
-
-# Build Options
-#   change yes to no to disable
-#
-BACKLIGHT_DRIVER = custom
diff --git a/keyboards/lily58/keymaps/druotoni/rules.mk b/keyboards/lily58/keymaps/druotoni/rules.mk
index c07761108e..b3182cb46a 100644
--- a/keyboards/lily58/keymaps/druotoni/rules.mk
+++ b/keyboards/lily58/keymaps/druotoni/rules.mk
@@ -9,7 +9,6 @@ BOOTLOADER = atmel-dfu
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-# EXTRAFLAGS += -flto
 LTO_ENABLE = yes
 SPACE_CADET_ENABLE = no
 GRAVE_ESC_ENABLE = no
diff --git a/keyboards/marksard/rhymestone/keymaps/default/config.h b/keyboards/marksard/rhymestone/keymaps/default/config.h
index 95f2d039b2..224ec53519 100644
--- a/keyboards/marksard/rhymestone/keymaps/default/config.h
+++ b/keyboards/marksard/rhymestone/keymaps/default/config.h
@@ -24,4 +24,4 @@
 // If you plug in the USB on the right side, please enable MASTER_RIGHT
 // #define MASTER_RIGHT
 
-#define OLED_FONT_H "keyboards/rhymestone/common/glcdfont.c"
+#define OLED_FONT_H "keyboards/marksard/rhymestone/common/glcdfont.c"
diff --git a/keyboards/matrix/abelx/abelx.c b/keyboards/matrix/abelx/abelx.c
index 77e749ee40..9585948e0c 100644
--- a/keyboards/matrix/abelx/abelx.c
+++ b/keyboards/matrix/abelx/abelx.c
@@ -97,3 +97,8 @@ void shutdown_user(void)
     // set the magic number for resetting to the bootloader
     *(uint32_t *)(&(RTCD1.rtc->BKP0R)) = REBOOT_MAGIC;
 }
+
+void bootloader_jump(void) {
+    shutdown_user();
+    NVIC_SystemReset();
+}
diff --git a/keyboards/matrix/abelx/rules.mk b/keyboards/matrix/abelx/rules.mk
index d4a065662b..7a5d01e5cb 100644
--- a/keyboards/matrix/abelx/rules.mk
+++ b/keyboards/matrix/abelx/rules.mk
@@ -25,6 +25,9 @@ ARMV = 7
 
 USE_FPU = yes
 
+# Bootloader selection
+BOOTLOADER = custom
+
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/matrix/m12og/rev1/rev1.c b/keyboards/matrix/m12og/rev1/rev1.c
index e3277bee27..53183c7d2d 100644
--- a/keyboards/matrix/m12og/rev1/rev1.c
+++ b/keyboards/matrix/m12og/rev1/rev1.c
@@ -20,6 +20,11 @@ void board_init(void) {
     writePinLow(A8);
 }
 
+void bootloader_jump(void) {
+    // This board doesn't use the standard DFU bootloader, and no information is available regarding how to enter bootloader mode. All we can do here is reset.
+    NVIC_SystemReset();
+}
+
 void keyboard_post_init_kb(void) {
     rgblight_enable_noeeprom();
     rgblight_sethsv_noeeprom(5, 255, 255);
diff --git a/keyboards/matrix/m12og/rev1/rules.mk b/keyboards/matrix/m12og/rev1/rules.mk
index 0e0584b8c9..d9733e8c5e 100644
--- a/keyboards/matrix/m12og/rev1/rules.mk
+++ b/keyboards/matrix/m12og/rev1/rules.mk
@@ -5,6 +5,9 @@ MCU_LDSCRIPT = m12og_v1
 
 BOARD = m12og_v1
 
+# Bootloader selection
+BOOTLOADER = custom
+
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/matrix/m20add/m20add.c b/keyboards/matrix/m20add/m20add.c
index 4d328d6c54..cdcafb9779 100644
--- a/keyboards/matrix/m20add/m20add.c
+++ b/keyboards/matrix/m20add/m20add.c
@@ -59,3 +59,8 @@ void shutdown_user(void)
     // set the magic number for resetting to the bootloader
     *(uint32_t *)(&(RTCD1.rtc->BKP0R)) = REBOOT_MAGIC;
 }
+
+void bootloader_jump(void) {
+    shutdown_user();
+    NVIC_SystemReset();
+}
diff --git a/keyboards/matrix/m20add/rules.mk b/keyboards/matrix/m20add/rules.mk
index 1ecbd9d308..86bd6b9371 100644
--- a/keyboards/matrix/m20add/rules.mk
+++ b/keyboards/matrix/m20add/rules.mk
@@ -10,6 +10,9 @@ MCU_LDSCRIPT = m20add_boot
 #  or <this_dir>/boards
 BOARD = ST_NUCLEO64_F411RE
 
+# Bootloader selection
+BOOTLOADER = custom
+
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/matrix/noah/noah.c b/keyboards/matrix/noah/noah.c
index 2143dee3be..89c25707af 100644
--- a/keyboards/matrix/noah/noah.c
+++ b/keyboards/matrix/noah/noah.c
@@ -4,6 +4,11 @@
 
 #include "noah.h"
 
+void bootloader_jump(void) {
+    // This board doesn't use the standard DFU bootloader, and no information is available regarding how to enter bootloader mode. All we can do here is reset.
+    NVIC_SystemReset();
+}
+
 #ifdef RGBLIGHT_ENABLE
 #include <string.h>
 #include "rgblight.h"
diff --git a/keyboards/matrix/noah/rules.mk b/keyboards/matrix/noah/rules.mk
index b9f642e8cd..7971d628d6 100644
--- a/keyboards/matrix/noah/rules.mk
+++ b/keyboards/matrix/noah/rules.mk
@@ -10,6 +10,9 @@ MCU_LDSCRIPT = noah_boot
 #  or <this_dir>/boards
 BOARD = ST_NUCLEO64_F411RE
 
+# Bootloader selection
+BOOTLOADER = custom
+
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/maxr1998/phoebe/config.h b/keyboards/maxr1998/phoebe/config.h
index b52221dc03..cce72108c5 100644
--- a/keyboards/maxr1998/phoebe/config.h
+++ b/keyboards/maxr1998/phoebe/config.h
@@ -23,57 +23,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define VENDOR_ID       0xFEED
 #define PRODUCT_ID      0x6060
 #define DEVICE_VER      0x0001
-#define MANUFACTURER    Maxr1998
 #define PRODUCT         Phoebe
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 12
-
-/* Planck PCB default pin-out */
-#define MATRIX_ROW_PINS { B7, B3, B2, B1, D6 }
-#define MATRIX_COL_PINS { D7, B4, B5, B6, C6, C7, B0, F1, F4, F5, F6, F7 }
-#define UNUSED_PINS
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* RGB LED Setup */
-#define RGB_DI_PIN          F0 // pin the DI on the WS2812B is hooked-up to
-#define RGBLED_NUM          8  // number of LEDs
-
 /* Selectively enable animation effects */
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
 #define RGBLIGHT_EFFECT_SNAKE
 #define RGBLIGHT_EFFECT_CHRISTMAS
 #define RGBLIGHT_EFFECT_CHRISTMAS_STEP 1
-
-/* Leader key setup */
-#define LEADER_PER_KEY_TIMING
-#define LEADER_TIMEOUT 250
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/maxr1998/phoebe/info.json b/keyboards/maxr1998/phoebe/info.json
index 5892684245..1b22277d8a 100644
--- a/keyboards/maxr1998/phoebe/info.json
+++ b/keyboards/maxr1998/phoebe/info.json
@@ -1,69 +1,351 @@
 {
-  "keyboard_name": "Phoebe",
-  "url": "https://github.com/Maxr1998/Phoebe_Keyboard",
-  "maintainer": "Maxr1998",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [ 
-        { "w": 1, "x": 0, "y": 0 }, 
-        { "w": 1, "x": 1, "y": 0 }, 
-        { "w": 1, "x": 2, "y": 0 }, 
-        { "w": 1, "x": 3, "y": 0 }, 
-        { "w": 1, "x": 4, "y": 0 }, 
-        { "w": 1, "x": 5, "y": 0 }, 
-        { "w": 1, "x": 6, "y": 0 }, 
-        { "w": 1, "x": 7, "y": 0 }, 
-        { "w": 1, "x": 8, "y": 0 }, 
-        { "w": 1, "x": 9, "y": 0 }, 
-        { "w": 1, "x": 10, "y": 0 }, 
-        { "w": 1, "x": 11, "y": 0 }, 
-        { "w": 1, "x": 0, "y": 1 }, 
-        { "w": 1, "x": 1, "y": 1 }, 
-        { "w": 1, "x": 2, "y": 1 }, 
-        { "w": 1, "x": 3, "y": 1 }, 
-        { "w": 1, "x": 4, "y": 1 }, 
-        { "w": 1, "x": 5, "y": 1 }, 
-        { "w": 1, "x": 6, "y": 1 }, 
-        { "w": 1, "x": 7, "y": 1 }, 
-        { "w": 1, "x": 8, "y": 1 }, 
-        { "w": 1, "x": 9, "y": 1 }, 
-        { "w": 1, "x": 10, "y": 1 }, 
-        { "w": 1, "x": 11, "y": 1 }, 
-        { "w": 1, "x": 0, "y": 2 }, 
-        { "w": 1, "x": 1, "y": 2 }, 
-        { "w": 1, "x": 2, "y": 2 }, 
-        { "w": 1, "x": 3, "y": 2 }, 
-        { "w": 1, "x": 4, "y": 2 }, 
-        { "w": 1, "x": 5, "y": 2 }, 
-        { "w": 1, "x": 6, "y": 2 }, 
-        { "w": 1, "x": 7, "y": 2 }, 
-        { "w": 1, "x": 8, "y": 2 }, 
-        { "w": 1, "x": 9, "y": 2 }, 
-        { "w": 1, "x": 10, "y": 2 }, 
-        { "w": 1, "x": 11, "y": 2 }, 
-        { "w": 1, "x": 0, "y": 3 }, 
-        { "w": 1, "x": 1, "y": 3 }, 
-        { "w": 1, "x": 2, "y": 3 }, 
-        { "w": 1, "x": 3, "y": 3 }, 
-        { "w": 1, "x": 4, "y": 3 }, 
-        { "w": 1, "x": 5, "y": 3 }, 
-        { "w": 1, "x": 6, "y": 3 }, 
-        { "w": 1, "x": 7, "y": 3 }, 
-        { "w": 1, "x": 8, "y": 3 }, 
-        { "w": 1, "x": 9, "y": 3 }, 
-        { "w": 1, "x": 10, "y": 3 }, 
-        { "w": 1, "x": 11, "y": 3 }, 
-        { "w": 1, "x": 0, "y": 4 }, 
-        { "w": 1, "x": 1, "y": 4 }, 
-        { "w": 1, "x": 2, "y": 4 }, 
-        { "w": 1, "x": 3, "y": 4 }, 
-        { "w": 1, "x": 4, "y": 4 }, 
-        { "w": 2, "x": 5, "y": 4 }, 
-        { "w": 1, "x": 7, "y": 4 }, 
-        { "w": 1, "x": 8, "y": 4 }, 
-        { "w": 1, "x": 9, "y": 4 }, 
-        { "w": 1, "x": 10, "y": 4 }, 
-        { "w": 1, "x": 11, "y": 4 } ]
+    "keyboard_name": "Phoebe",
+    "maintainer": "Maxr1998",
+    "manufacturer": "Maxr1998",
+    "url": "https://github.com/Maxr1998/Phoebe_Keyboard",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "bootloader_instructions": "Tap reset button on the back.",
+    "diode_direction": "COL2ROW",
+    "debounce": 5,
+    "features": {
+        "bootmagic": true,
+        "nkro": true,
+        "backlight": false,
+        "rgblight": true,
+        "key_lock": true,
+        "leader": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {
+                    "w": 1,
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "w": 1,
+                    "x": 1,
+                    "y": 0
+                },
+                {
+                    "w": 1,
+                    "x": 2,
+                    "y": 0
+                },
+                {
+                    "w": 1,
+                    "x": 3,
+                    "y": 0
+                },
+                {
+                    "w": 1,
+                    "x": 4,
+                    "y": 0
+                },
+                {
+                    "w": 1,
+                    "x": 5,
+                    "y": 0
+                },
+                {
+                    "w": 1,
+                    "x": 6,
+                    "y": 0
+                },
+                {
+                    "w": 1,
+                    "x": 7,
+                    "y": 0
+                },
+                {
+                    "w": 1,
+                    "x": 8,
+                    "y": 0
+                },
+                {
+                    "w": 1,
+                    "x": 9,
+                    "y": 0
+                },
+                {
+                    "w": 1,
+                    "x": 10,
+                    "y": 0
+                },
+                {
+                    "w": 1,
+                    "x": 11,
+                    "y": 0
+                },
+                {
+                    "w": 1,
+                    "x": 0,
+                    "y": 1
+                },
+                {
+                    "w": 1,
+                    "x": 1,
+                    "y": 1
+                },
+                {
+                    "w": 1,
+                    "x": 2,
+                    "y": 1
+                },
+                {
+                    "w": 1,
+                    "x": 3,
+                    "y": 1
+                },
+                {
+                    "w": 1,
+                    "x": 4,
+                    "y": 1
+                },
+                {
+                    "w": 1,
+                    "x": 5,
+                    "y": 1
+                },
+                {
+                    "w": 1,
+                    "x": 6,
+                    "y": 1
+                },
+                {
+                    "w": 1,
+                    "x": 7,
+                    "y": 1
+                },
+                {
+                    "w": 1,
+                    "x": 8,
+                    "y": 1
+                },
+                {
+                    "w": 1,
+                    "x": 9,
+                    "y": 1
+                },
+                {
+                    "w": 1,
+                    "x": 10,
+                    "y": 1
+                },
+                {
+                    "w": 1,
+                    "x": 11,
+                    "y": 1
+                },
+                {
+                    "w": 1,
+                    "x": 0,
+                    "y": 2
+                },
+                {
+                    "w": 1,
+                    "x": 1,
+                    "y": 2
+                },
+                {
+                    "w": 1,
+                    "x": 2,
+                    "y": 2
+                },
+                {
+                    "w": 1,
+                    "x": 3,
+                    "y": 2
+                },
+                {
+                    "w": 1,
+                    "x": 4,
+                    "y": 2
+                },
+                {
+                    "w": 1,
+                    "x": 5,
+                    "y": 2
+                },
+                {
+                    "w": 1,
+                    "x": 6,
+                    "y": 2
+                },
+                {
+                    "w": 1,
+                    "x": 7,
+                    "y": 2
+                },
+                {
+                    "w": 1,
+                    "x": 8,
+                    "y": 2
+                },
+                {
+                    "w": 1,
+                    "x": 9,
+                    "y": 2
+                },
+                {
+                    "w": 1,
+                    "x": 10,
+                    "y": 2
+                },
+                {
+                    "w": 1,
+                    "x": 11,
+                    "y": 2
+                },
+                {
+                    "w": 1,
+                    "x": 0,
+                    "y": 3
+                },
+                {
+                    "w": 1,
+                    "x": 1,
+                    "y": 3
+                },
+                {
+                    "w": 1,
+                    "x": 2,
+                    "y": 3
+                },
+                {
+                    "w": 1,
+                    "x": 3,
+                    "y": 3
+                },
+                {
+                    "w": 1,
+                    "x": 4,
+                    "y": 3
+                },
+                {
+                    "w": 1,
+                    "x": 5,
+                    "y": 3
+                },
+                {
+                    "w": 1,
+                    "x": 6,
+                    "y": 3
+                },
+                {
+                    "w": 1,
+                    "x": 7,
+                    "y": 3
+                },
+                {
+                    "w": 1,
+                    "x": 8,
+                    "y": 3
+                },
+                {
+                    "w": 1,
+                    "x": 9,
+                    "y": 3
+                },
+                {
+                    "w": 1,
+                    "x": 10,
+                    "y": 3
+                },
+                {
+                    "w": 1,
+                    "x": 11,
+                    "y": 3
+                },
+                {
+                    "w": 1,
+                    "x": 0,
+                    "y": 4
+                },
+                {
+                    "w": 1,
+                    "x": 1,
+                    "y": 4
+                },
+                {
+                    "w": 1,
+                    "x": 2,
+                    "y": 4
+                },
+                {
+                    "w": 1,
+                    "x": 3,
+                    "y": 4
+                },
+                {
+                    "w": 1,
+                    "x": 4,
+                    "y": 4
+                },
+                {
+                    "w": 2,
+                    "x": 5,
+                    "y": 4
+                },
+                {
+                    "w": 1,
+                    "x": 7,
+                    "y": 4
+                },
+                {
+                    "w": 1,
+                    "x": 8,
+                    "y": 4
+                },
+                {
+                    "w": 1,
+                    "x": 9,
+                    "y": 4
+                },
+                {
+                    "w": 1,
+                    "x": 10,
+                    "y": 4
+                },
+                {
+                    "w": 1,
+                    "x": 11,
+                    "y": 4
+                }
+            ]
+        }
+    },
+    "leader_key": {
+        "timing": true,
+        "timeout": 250
+    },
+    "matrix_pins": {
+        "cols": [
+            "D7",
+            "B4",
+            "B5",
+            "B6",
+            "C6",
+            "C7",
+            "B0",
+            "F1",
+            "F4",
+            "F5",
+            "F6",
+            "F7"
+        ],
+        "rows": [
+            "B7",
+            "B3",
+            "B2",
+            "B1",
+            "D6"
+        ]
+    },
+    "rgblight": {
+        "led_count": 8,
+        "pin": "F0"
     }
-  }
 }
diff --git a/keyboards/maxr1998/phoebe/rules.mk b/keyboards/maxr1998/phoebe/rules.mk
index 75dbae8434..e69de29bb2 100644
--- a/keyboards/maxr1998/phoebe/rules.mk
+++ b/keyboards/maxr1998/phoebe/rules.mk
@@ -1,20 +0,0 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = yes       # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no          # Audio output
-RGBLIGHT_ENABLE = yes      # Enable WS2812 RGB underlight.
-KEY_LOCK_ENABLE = yes
-LEADER_ENABLE = yes        # Enable leader key
diff --git a/keyboards/maxr1998/pulse4k/keymaps/default/keymap.c b/keyboards/maxr1998/pulse4k/keymaps/default/keymap.c
index 1ed4b5f1af..243a96ba74 100644
--- a/keyboards/maxr1998/pulse4k/keymaps/default/keymap.c
+++ b/keyboards/maxr1998/pulse4k/keymaps/default/keymap.c
@@ -21,6 +21,10 @@ enum layers {
     DEFAULT
 };
 
+enum combo_events {
+    LED_ADJUST
+};
+
 const uint16_t PROGMEM led_adjust_combo[] = {KC_LEFT, KC_RGHT, COMBO_END};
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -29,3 +33,39 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LEFT, KC_DOWN, KC_RGHT
     )
 };
+
+combo_t key_combos[COMBO_COUNT] = {
+    [LED_ADJUST] = COMBO_ACTION(led_adjust_combo)
+};
+
+bool led_adjust_active = false;
+
+void process_combo_event(uint16_t combo_index, bool pressed) {
+    if (combo_index == LED_ADJUST) {
+        led_adjust_active = pressed;
+    }
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        if (led_adjust_active) {
+            if (clockwise) {
+                rgblight_increase_val();
+            } else {
+                rgblight_decrease_val();
+            }
+            return false;
+        }
+    } else if (index == 1) {
+        if (led_adjust_active) {
+            if (clockwise) {
+                rgblight_increase_hue();
+            } else {
+                rgblight_decrease_hue();
+            }
+            return false;
+        }
+    }
+
+    return true;
+}
diff --git a/keyboards/idobao/id80/ansi/keymaps/msf/rules.mk b/keyboards/maxr1998/pulse4k/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/idobao/id80/ansi/keymaps/msf/rules.mk
rename to keyboards/maxr1998/pulse4k/keymaps/default/rules.mk
diff --git a/keyboards/maxr1998/pulse4k/keymaps/maxr1998/keymap.c b/keyboards/maxr1998/pulse4k/keymaps/maxr1998/keymap.c
index 9eec3f0ae7..2aad1fa346 100644
--- a/keyboards/maxr1998/pulse4k/keymaps/maxr1998/keymap.c
+++ b/keyboards/maxr1998/pulse4k/keymaps/maxr1998/keymap.c
@@ -21,6 +21,10 @@ enum layers {
     DEFAULT
 };
 
+enum combo_events {
+    LED_ADJUST
+};
+
 const uint16_t PROGMEM led_adjust_combo[] = {KC_F22, KC_F24, COMBO_END};
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -30,6 +34,42 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     )
 };
 
+combo_t key_combos[COMBO_COUNT] = {
+    [LED_ADJUST] = COMBO_ACTION(led_adjust_combo)
+};
+
+bool led_adjust_active = false;
+
+void process_combo_event(uint16_t combo_index, bool pressed) {
+    if (combo_index == LED_ADJUST) {
+        led_adjust_active = pressed;
+    }
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        if (led_adjust_active) {
+            if (clockwise) {
+                rgblight_increase_val();
+            } else {
+                rgblight_decrease_val();
+            }
+            return false;
+        }
+    } else if (index == 1) {
+        if (led_adjust_active) {
+            if (clockwise) {
+                rgblight_increase_hue();
+            } else {
+                rgblight_decrease_hue();
+            }
+            return false;
+        }
+    }
+
+    return true;
+}
+
 void encoder_one_update(bool clockwise) {
     tap_code(!clockwise ? KC_F18 : KC_F19);
 }
diff --git a/keyboards/space_space/rev2/keymaps/default/rules.mk b/keyboards/maxr1998/pulse4k/keymaps/maxr1998/rules.mk
similarity index 100%
rename from keyboards/space_space/rev2/keymaps/default/rules.mk
rename to keyboards/maxr1998/pulse4k/keymaps/maxr1998/rules.mk
diff --git a/keyboards/maxr1998/pulse4k/pulse4k.c b/keyboards/maxr1998/pulse4k/pulse4k.c
index 21bbe5d68e..f31eb6db37 100644
--- a/keyboards/maxr1998/pulse4k/pulse4k.c
+++ b/keyboards/maxr1998/pulse4k/pulse4k.c
@@ -16,44 +16,14 @@
  */
 
 #include "pulse4k.h"
-#include "rgblight.h"
-
-enum combo_events {
-    LED_ADJUST
-};
-
-extern const uint16_t PROGMEM led_adjust_combo[3];
-
-combo_t key_combos[COMBO_COUNT] = {
-    [LED_ADJUST] = COMBO_ACTION(led_adjust_combo)
-};
-
-bool led_adjust_active = false;
-
-void process_combo_event(uint16_t combo_index, bool pressed) {
-    if (combo_index == LED_ADJUST) {
-        led_adjust_active = pressed;
-    }
-}
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) return false;
+
     if (index == 0) {
-        if (led_adjust_active) {
-            if (clockwise) {
-                rgblight_increase_val();
-            } else {
-                rgblight_decrease_val();
-            }
-        } else encoder_one_update(clockwise);
+        encoder_one_update(clockwise);
     } else if (index == 1) {
-        if (led_adjust_active) {
-            if (clockwise) {
-                rgblight_increase_hue();
-            } else {
-                rgblight_decrease_hue();
-            }
-        } else encoder_two_update(clockwise);
+        encoder_two_update(clockwise);
     }
     return true;
 }
diff --git a/keyboards/maxr1998/pulse4k/rules.mk b/keyboards/maxr1998/pulse4k/rules.mk
index 3cfa6867a8..5533ac6f35 100644
--- a/keyboards/maxr1998/pulse4k/rules.mk
+++ b/keyboards/maxr1998/pulse4k/rules.mk
@@ -13,7 +13,6 @@ ENCODER_ENABLE = yes       # Rotary encoders
 EXTRAKEY_ENABLE = yes      # Audio control and System control
 CONSOLE_ENABLE = yes       # Console for debug
 COMMAND_ENABLE = no        # Commands for debug and configuration
-COMBO_ENABLE = yes         # Key combo feature
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no          # Audio output
diff --git a/keyboards/mechanickeys/miniashen40/info.json b/keyboards/mechanickeys/miniashen40/info.json
index 6a6b1e951a..bf46a8bdcd 100644
--- a/keyboards/mechanickeys/miniashen40/info.json
+++ b/keyboards/mechanickeys/miniashen40/info.json
@@ -1,15 +1,62 @@
 {
-  "keyboard_name": "Mini Ashen 40",
-  "url": "",
-  "maintainer": "qmk",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"label": "Tab", "x": 0, "y": 0}, {"label": "Q", "x": 1, "y": 0}, {"label": "W", "x": 2, "y": 0}, {"label": "E", "x": 3, "y": 0}, {"label": "R", "x": 4, "y": 0}, {"label": "T", "x": 5, "y": 0}, {"label": "Y", "x": 6, "y": 0}, {"label": "U", "x": 7, "y": 0}, {"label": "I", "x": 8, "y": 0}, {"label": "O", "x": 9, "y": 0}, {"label": "P", "x": 10, "y": 0}, {"label": "Del", "x": 11, "y": 0}, {"label": "M1", "x": 12.25, "y": 0}, {"label": "M2", "x": 13.25, "y": 0},
-        {"label": "Ctrl", "x": 0, "y": 1, "w":1.25}, {"label": "A", "x": 1.25, "y": 1}, {"label": "S", "x": 2.25, "y": 1}, {"label": "D", "x": 3.25, "y": 1}, {"label": "F", "x": 4.25, "y": 1}, {"label": "G", "x": 5.25, "y": 1}, {"label": "H", "x": 6.25, "y": 1}, {"label": "J", "x": 7.25, "y": 1}, {"label": "K", "x": 8.25, "y": 1}, {"label": "L", "x": 9.25, "y": 1}, {"label": "Enter", "x": 10.25, "y": 1, "w":1.75}, {"label": "M3", "x": 12.25, "y": 1}, {"label": "M4", "x": 13.25, "y": 1},
-        {"label": "Shift", "x": 0, "y": 2, "w":1.75}, {"label": "Z", "x": 1.75, "y": 2}, {"label": "X", "x": 2.75, "y": 2}, {"label": "C", "x": 3.75, "y": 2}, {"label": "V", "x": 4.75, "y": 2}, {"label": "B", "x": 5.75, "y": 2}, {"label": "N", "x": 6.75, "y": 2}, {"label": "M", "x": 7.75, "y": 2}, {"label": ",", "x": 8.75, "y": 2}, {"label": ".", "x": 9.75, "y": 2}, {"label": "Fn", "x": 10.75, "y": 2, "w":1.25}, {"label": "Up", "x": 12.25, "y": 2.25},
-        {"label": "Alt", "x": 1, "y": 3}, {"label": "OS", "x": 2, "y": 3, "w": 1.5}, {"label": "", "x": 3.5, "y": 3, "w": 2.75}, {"label": "", "x": 6.25, "y": 3, "w": 2.25}, {"label": "Os", "x": 8.5, "y": 3, "w": 1.5}, {"label": "Alt", "x": 10, "y": 3}, {"label": "Left", "x": 11.25, "y": 3.25}, {"label": "Down", "x": 12.25, "y": 3.25}, {"label": "Right", "x": 13.25, "y": 3.25}
-      ]
+    "keyboard_name": "Mini Ashen 40",
+    "url": "",
+    "maintainer": "jfescobar18",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"Tab", "x":0, "y":0},
+                {"label":"Q", "x":1, "y":0},
+                {"label":"W", "x":2, "y":0},
+                {"label":"E", "x":3, "y":0},
+                {"label":"R", "x":4, "y":0},
+                {"label":"T", "x":5, "y":0},
+                {"label":"Y", "x":6, "y":0},
+                {"label":"U", "x":7, "y":0},
+                {"label":"I", "x":8, "y":0},
+                {"label":"O", "x":9, "y":0},
+                {"label":"P", "x":10, "y":0},
+                {"label":"Del", "x":11, "y":0},
+                {"label":"M1", "x":12.25, "y":0},
+                {"label":"M2", "x":13.25, "y":0},
+
+                {"label":"Ctrl", "x":0, "y":1, "w":1.25},
+                {"label":"A", "x":1.25, "y":1},
+                {"label":"S", "x":2.25, "y":1},
+                {"label":"D", "x":3.25, "y":1},
+                {"label":"F", "x":4.25, "y":1},
+                {"label":"G", "x":5.25, "y":1},
+                {"label":"H", "x":6.25, "y":1},
+                {"label":"J", "x":7.25, "y":1},
+                {"label":"K", "x":8.25, "y":1},
+                {"label":"L", "x":9.25, "y":1},
+                {"label":"Enter", "x":10.25, "y":1, "w":1.75},
+                {"label":"M3", "x":12.25, "y":1},
+                {"label":"M4", "x":13.25, "y":1},
+
+                {"label":"Shift", "x":0, "y":2, "w":1.75},
+                {"label":"Z", "x":1.75, "y":2},
+                {"label":"X", "x":2.75, "y":2},
+                {"label":"C", "x":3.75, "y":2},
+                {"label":"V", "x":4.75, "y":2},
+                {"label":"B", "x":5.75, "y":2},
+                {"label":"N", "x":6.75, "y":2},
+                {"label":"M", "x":7.75, "y":2},
+                {"label":",", "x":8.75, "y":2},
+                {"label":".", "x":9.75, "y":2},
+                {"label":"Fn", "x":10.75, "y":2, "w":1.25},
+                {"label":"Up", "x":12.25, "y":2.25},
+
+                {"label":"Alt", "x":1, "y":3},
+                {"label":"OS", "x":2, "y":3, "w":1.5},
+                {"label":"", "x":3.5, "y":3, "w":2.75},
+                {"label":"", "x":6.25, "y":3, "w":2.25},
+                {"label":"Os", "x":8.5, "y":3, "w":1.5},
+                {"label":"Alt", "x":10, "y":3},
+                {"label":"Left", "x":11.25, "y":3.25},
+                {"label":"Down", "x":12.25, "y":3.25},
+                {"label":"Right", "x":13.25, "y":3.25}
+            ]
+        }
     }
-  }
-}
\ No newline at end of file
+}
diff --git a/keyboards/mechanickeys/miniashen40/keymaps/default/keymap.c b/keyboards/mechanickeys/miniashen40/keymaps/default/keymap.c
index b49b5882fa..4f4b79e45e 100644
--- a/keyboards/mechanickeys/miniashen40/keymaps/default/keymap.c
+++ b/keyboards/mechanickeys/miniashen40/keymaps/default/keymap.c
@@ -1,47 +1,47 @@
 /* Copyright 2021 jfescobar18
-  * 
-  * 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 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
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT( /* 0: qwerty */ 
-    KC_GESC,       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,             KC_MPRV,  KC_MNXT,
+  [0] = LAYOUT( /* 0: qwerty */
+    KC_GESC,       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, KC_MPRV,  KC_MNXT,
     CTL_T(KC_TAB), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,           KC_MUTE,  KC_MPLY,
-    KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  MO(1),            KC_UP,   KC_BSPC,
+    KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  MO(1),            KC_UP,
                    KC_LALT, KC_LGUI,          KC_SPC,                             KC_SPC,  KC_RGUI, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
   ),
 
-  [1] = LAYOUT( /* 1: Symbols */ 
-    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,          KC_TRNS, KC_TRNS,
+  [1] = LAYOUT( /* 1: Symbols */
+    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_TRNS, KC_TRNS,
     MO(2),   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, KC_BSLS,          KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLSH, KC_TRNS,          KC_TRNS, KC_EQL,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLSH, KC_TRNS,          KC_TRNS,
              KC_TRNS, KC_TRNS,          KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
   ),
 
-  [2] = LAYOUT( /* 2: Fn */ 
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,           KC_TRNS, KC_TRNS,
+  [2] = LAYOUT( /* 2: Fn */
+    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_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_F12,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
              KC_TRNS, KC_TRNS,          KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
   ),
 
-  [3] = LAYOUT( /*3: Empty */ 
-    RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+  [3] = LAYOUT( /*3: Empty */
+    RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
              KC_TRNS, KC_TRNS,          KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
   ),
 };
diff --git a/keyboards/mechanickeys/miniashen40/keymaps/via/keymap.c b/keyboards/mechanickeys/miniashen40/keymaps/via/keymap.c
index 0aa9476b4e..bb7721561d 100644
--- a/keyboards/mechanickeys/miniashen40/keymaps/via/keymap.c
+++ b/keyboards/mechanickeys/miniashen40/keymaps/via/keymap.c
@@ -17,31 +17,31 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT( /* 0: qwerty */ 
-    KC_GESC,       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,             KC_MPRV,  KC_MNXT,
+  [0] = LAYOUT( /* 0: qwerty */
+    KC_GESC,       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, KC_MPRV,  KC_MNXT,
     CTL_T(KC_TAB), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,           KC_MUTE,  KC_MPLY,
-    KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  MO(1),            KC_UP,   KC_BSPC,
+    KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  MO(1),            KC_UP,
                    KC_LALT, KC_LGUI,          KC_SPC,                             KC_SPC,  KC_RGUI, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
   ),
 
-  [1] = LAYOUT( /* 1: Symbols */ 
-    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,          KC_TRNS, KC_TRNS,
+  [1] = LAYOUT( /* 1: Symbols */
+    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_TRNS, KC_TRNS,
     MO(2),   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, KC_BSLS,          KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLSH, KC_TRNS,          KC_TRNS, KC_EQL,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLSH, KC_TRNS,          KC_TRNS,
              KC_TRNS, KC_TRNS,          KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
   ),
 
-  [2] = LAYOUT( /* 2: Fn */ 
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,           KC_TRNS, KC_TRNS,
+  [2] = LAYOUT( /* 2: Fn */
+    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_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_F12,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
              KC_TRNS, KC_TRNS,          KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
   ),
 
-  [3] = LAYOUT( /*3: Empty */ 
-    RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+  [3] = LAYOUT( /*3: Empty */
+    RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
              KC_TRNS, KC_TRNS,          KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
   ),
 };
diff --git a/keyboards/mechanickeys/miniashen40/miniashen40.h b/keyboards/mechanickeys/miniashen40/miniashen40.h
index 4430396b41..5d6e639b20 100644
--- a/keyboards/mechanickeys/miniashen40/miniashen40.h
+++ b/keyboards/mechanickeys/miniashen40/miniashen40.h
@@ -1,17 +1,17 @@
 /* Copyright 2021 jfescobar18
-  * 
-  * 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 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
@@ -20,19 +20,24 @@
 
 #define XXX KC_NO
 
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │2C ││0B │0C │
+ * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤├───┼───┤
+ * │10  │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A    ││1B │1C │
+ * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤└───┴───┘
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A  │┌───┐
+ * └───┬──┴┬──┴──┬┴───┴───┴─┬─┴───┴──┬┴───┴┬──┴┬───┘│2B │
+ *     │30 │31   │33        │36      │38   │39 │┌───┼───┼───┐
+ *     └───┴─────┴──────────┴────────┴─────┴───┘│3A │3B │3C │
+ *                                              └───┴───┴───┘
  */
+
 #define LAYOUT( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
-  K30, K31,      K33,           K36,      K38, K39, K3A, K3B, K3C  \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K2C,   K0B, K0C, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A,        K1B, K1C, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A,        K2B,      \
+  K30, K31,      K33,           K36,      K38, K39,        K3A, K3B, K3C  \
 ) \
 { \
   { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
diff --git a/keyboards/acr60/acr60.c b/keyboards/mechkeys/acr60/acr60.c
similarity index 100%
rename from keyboards/acr60/acr60.c
rename to keyboards/mechkeys/acr60/acr60.c
diff --git a/keyboards/acr60/acr60.h b/keyboards/mechkeys/acr60/acr60.h
similarity index 100%
rename from keyboards/acr60/acr60.h
rename to keyboards/mechkeys/acr60/acr60.h
diff --git a/keyboards/acr60/config.h b/keyboards/mechkeys/acr60/config.h
similarity index 100%
rename from keyboards/acr60/config.h
rename to keyboards/mechkeys/acr60/config.h
diff --git a/keyboards/acr60/info.json b/keyboards/mechkeys/acr60/info.json
similarity index 100%
rename from keyboards/acr60/info.json
rename to keyboards/mechkeys/acr60/info.json
diff --git a/keyboards/acr60/keymaps/default/keymap.c b/keyboards/mechkeys/acr60/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/acr60/keymaps/default/keymap.c
rename to keyboards/mechkeys/acr60/keymaps/default/keymap.c
diff --git a/keyboards/acr60/keymaps/mitch/keymap.c b/keyboards/mechkeys/acr60/keymaps/mitch/keymap.c
similarity index 100%
rename from keyboards/acr60/keymaps/mitch/keymap.c
rename to keyboards/mechkeys/acr60/keymaps/mitch/keymap.c
diff --git a/keyboards/acr60/readme.md b/keyboards/mechkeys/acr60/readme.md
similarity index 93%
rename from keyboards/acr60/readme.md
rename to keyboards/mechkeys/acr60/readme.md
index 70b617dfda..4d8bffa364 100644
--- a/keyboards/acr60/readme.md
+++ b/keyboards/mechkeys/acr60/readme.md
@@ -10,11 +10,11 @@ A customizable 60% keyboard made and sold by mechkeys.ca [More info on MECHKEYS]
 
 Make example for this keyboard (after setting up your build environment):
 
-    make acr60:default
+    make mechkeys/acr60:default
 
 Flashing example for this keyboard:
 
-    make acr60:default:flash
+    make mechkeys/acr60:default:flash
 
 To reset the board into bootloader mode, do one of the following:
 
diff --git a/keyboards/acr60/rules.mk b/keyboards/mechkeys/acr60/rules.mk
similarity index 100%
rename from keyboards/acr60/rules.mk
rename to keyboards/mechkeys/acr60/rules.mk
diff --git a/keyboards/alu84/alu84.c b/keyboards/mechkeys/alu84/alu84.c
similarity index 100%
rename from keyboards/alu84/alu84.c
rename to keyboards/mechkeys/alu84/alu84.c
diff --git a/keyboards/alu84/alu84.h b/keyboards/mechkeys/alu84/alu84.h
similarity index 100%
rename from keyboards/alu84/alu84.h
rename to keyboards/mechkeys/alu84/alu84.h
diff --git a/keyboards/alu84/config.h b/keyboards/mechkeys/alu84/config.h
similarity index 100%
rename from keyboards/alu84/config.h
rename to keyboards/mechkeys/alu84/config.h
diff --git a/keyboards/alu84/info.json b/keyboards/mechkeys/alu84/info.json
similarity index 100%
rename from keyboards/alu84/info.json
rename to keyboards/mechkeys/alu84/info.json
diff --git a/keyboards/alu84/keymaps/default/keymap.c b/keyboards/mechkeys/alu84/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/alu84/keymaps/default/keymap.c
rename to keyboards/mechkeys/alu84/keymaps/default/keymap.c
diff --git a/keyboards/alu84/keymaps/turbomech/config.h b/keyboards/mechkeys/alu84/keymaps/turbomech/config.h
similarity index 100%
rename from keyboards/alu84/keymaps/turbomech/config.h
rename to keyboards/mechkeys/alu84/keymaps/turbomech/config.h
diff --git a/keyboards/alu84/keymaps/turbomech/keymap.c b/keyboards/mechkeys/alu84/keymaps/turbomech/keymap.c
similarity index 100%
rename from keyboards/alu84/keymaps/turbomech/keymap.c
rename to keyboards/mechkeys/alu84/keymaps/turbomech/keymap.c
diff --git a/keyboards/alu84/keymaps/turbomech/readme.md b/keyboards/mechkeys/alu84/keymaps/turbomech/readme.md
similarity index 100%
rename from keyboards/alu84/keymaps/turbomech/readme.md
rename to keyboards/mechkeys/alu84/keymaps/turbomech/readme.md
diff --git a/keyboards/alu84/keymaps/turbomech/rules.mk b/keyboards/mechkeys/alu84/keymaps/turbomech/rules.mk
similarity index 100%
rename from keyboards/alu84/keymaps/turbomech/rules.mk
rename to keyboards/mechkeys/alu84/keymaps/turbomech/rules.mk
diff --git a/keyboards/alu84/readme.md b/keyboards/mechkeys/alu84/readme.md
similarity index 91%
rename from keyboards/alu84/readme.md
rename to keyboards/mechkeys/alu84/readme.md
index 12da1d8a8f..ca2afbe970 100644
--- a/keyboards/alu84/readme.md
+++ b/keyboards/mechkeys/alu84/readme.md
@@ -10,11 +10,11 @@ A 75% keyboard made and sold by MECHKEYS.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make alu84:default
+    make mechkeys/alu84:default
 
 Flashing example for this keyboard:
 
-    make alu84:default:flash
+    make mechkeys/alu84:default:flash
 
 To reset the board into bootloader mode, hold Space+B while plugging the cable in.
 
diff --git a/keyboards/alu84/rules.mk b/keyboards/mechkeys/alu84/rules.mk
similarity index 100%
rename from keyboards/alu84/rules.mk
rename to keyboards/mechkeys/alu84/rules.mk
diff --git a/keyboards/espectro/config.h b/keyboards/mechkeys/espectro/config.h
similarity index 100%
rename from keyboards/espectro/config.h
rename to keyboards/mechkeys/espectro/config.h
diff --git a/keyboards/espectro/espectro.c b/keyboards/mechkeys/espectro/espectro.c
similarity index 100%
rename from keyboards/espectro/espectro.c
rename to keyboards/mechkeys/espectro/espectro.c
diff --git a/keyboards/espectro/espectro.h b/keyboards/mechkeys/espectro/espectro.h
similarity index 100%
rename from keyboards/espectro/espectro.h
rename to keyboards/mechkeys/espectro/espectro.h
diff --git a/keyboards/espectro/info.json b/keyboards/mechkeys/espectro/info.json
similarity index 100%
rename from keyboards/espectro/info.json
rename to keyboards/mechkeys/espectro/info.json
diff --git a/keyboards/espectro/keymaps/default/keymap.c b/keyboards/mechkeys/espectro/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/espectro/keymaps/default/keymap.c
rename to keyboards/mechkeys/espectro/keymaps/default/keymap.c
diff --git a/keyboards/espectro/keymaps/iso/keymap.c b/keyboards/mechkeys/espectro/keymaps/iso/keymap.c
similarity index 100%
rename from keyboards/espectro/keymaps/iso/keymap.c
rename to keyboards/mechkeys/espectro/keymaps/iso/keymap.c
diff --git a/keyboards/espectro/keymaps/mac/config.h b/keyboards/mechkeys/espectro/keymaps/mac/config.h
similarity index 100%
rename from keyboards/espectro/keymaps/mac/config.h
rename to keyboards/mechkeys/espectro/keymaps/mac/config.h
diff --git a/keyboards/espectro/keymaps/mac/keymap.c b/keyboards/mechkeys/espectro/keymaps/mac/keymap.c
similarity index 100%
rename from keyboards/espectro/keymaps/mac/keymap.c
rename to keyboards/mechkeys/espectro/keymaps/mac/keymap.c
diff --git a/keyboards/espectro/keymaps/mac/readme.md b/keyboards/mechkeys/espectro/keymaps/mac/readme.md
similarity index 100%
rename from keyboards/espectro/keymaps/mac/readme.md
rename to keyboards/mechkeys/espectro/keymaps/mac/readme.md
diff --git a/keyboards/espectro/keymaps/mapdev/keymap.c b/keyboards/mechkeys/espectro/keymaps/mapdev/keymap.c
similarity index 100%
rename from keyboards/espectro/keymaps/mapdev/keymap.c
rename to keyboards/mechkeys/espectro/keymaps/mapdev/keymap.c
diff --git a/keyboards/espectro/keymaps/mikethetiger/keymap.c b/keyboards/mechkeys/espectro/keymaps/mikethetiger/keymap.c
similarity index 100%
rename from keyboards/espectro/keymaps/mikethetiger/keymap.c
rename to keyboards/mechkeys/espectro/keymaps/mikethetiger/keymap.c
diff --git a/keyboards/espectro/readme.md b/keyboards/mechkeys/espectro/readme.md
similarity index 95%
rename from keyboards/espectro/readme.md
rename to keyboards/mechkeys/espectro/readme.md
index c4c0edc7f7..fca7ad7308 100644
--- a/keyboards/espectro/readme.md
+++ b/keyboards/mechkeys/espectro/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: [MECHKEYS](https://mechkeys.ca)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make espectro:default
+    make mechkeys/espectro:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/espectro/rules.mk b/keyboards/mechkeys/espectro/rules.mk
similarity index 100%
rename from keyboards/espectro/rules.mk
rename to keyboards/mechkeys/espectro/rules.mk
diff --git a/keyboards/mechmini/mechmini.c b/keyboards/mechkeys/mechmini/mechmini.c
similarity index 100%
rename from keyboards/mechmini/mechmini.c
rename to keyboards/mechkeys/mechmini/mechmini.c
diff --git a/keyboards/mechmini/mechmini.h b/keyboards/mechkeys/mechmini/mechmini.h
similarity index 90%
rename from keyboards/mechmini/mechmini.h
rename to keyboards/mechkeys/mechmini/mechmini.h
index cbd405285f..9420b3e161 100644
--- a/keyboards/mechmini/mechmini.h
+++ b/keyboards/mechkeys/mechmini/mechmini.h
@@ -18,8 +18,8 @@
 
 #include "quantum.h"
 
-#if defined(KEYBOARD_mechmini_v1)
+#if defined(KEYBOARD_mechkeys_mechmini_v1)
 #    include "v1.h"
-#elif defined(KEYBOARD_mechmini_v2)
+#elif defined(KEYBOARD_mechkeys_mechmini_v2)
 #    include "v2.h"
 #endif
diff --git a/keyboards/mechmini/readme.md b/keyboards/mechkeys/mechmini/readme.md
similarity index 97%
rename from keyboards/mechmini/readme.md
rename to keyboards/mechkeys/mechmini/readme.md
index fc43eb1248..f9c0264273 100644
--- a/keyboards/mechmini/readme.md
+++ b/keyboards/mechkeys/mechmini/readme.md
@@ -17,7 +17,7 @@ Hardware Availability: [MECHKEYS](https://mechkeys.ca/collections/keyboards/prod
 
 Make example for this keyboard (after setting up your build environment), this will make the Mechmini 2.0 default keymap (split space) - please see v1 readme for v1 make instructions:
 
-    make mechmini:default
+    make mechkeys/mechmini:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
diff --git a/keyboards/mechkeys/mechmini/rules.mk b/keyboards/mechkeys/mechmini/rules.mk
new file mode 100644
index 0000000000..9d63d875eb
--- /dev/null
+++ b/keyboards/mechkeys/mechmini/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = mechkeys/mechmini/v2
diff --git a/keyboards/mechmini/v1/.noci b/keyboards/mechkeys/mechmini/v1/.noci
similarity index 100%
rename from keyboards/mechmini/v1/.noci
rename to keyboards/mechkeys/mechmini/v1/.noci
diff --git a/keyboards/mechmini/v1/config.h b/keyboards/mechkeys/mechmini/v1/config.h
similarity index 100%
rename from keyboards/mechmini/v1/config.h
rename to keyboards/mechkeys/mechmini/v1/config.h
diff --git a/keyboards/mechmini/v1/info.json b/keyboards/mechkeys/mechmini/v1/info.json
similarity index 100%
rename from keyboards/mechmini/v1/info.json
rename to keyboards/mechkeys/mechmini/v1/info.json
diff --git a/keyboards/mechmini/v1/keymaps/default/keymap.c b/keyboards/mechkeys/mechmini/v1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/mechmini/v1/keymaps/default/keymap.c
rename to keyboards/mechkeys/mechmini/v1/keymaps/default/keymap.c
diff --git a/keyboards/mechmini/v1/keymaps/pitty/keymap.c b/keyboards/mechkeys/mechmini/v1/keymaps/pitty/keymap.c
similarity index 100%
rename from keyboards/mechmini/v1/keymaps/pitty/keymap.c
rename to keyboards/mechkeys/mechmini/v1/keymaps/pitty/keymap.c
diff --git a/keyboards/mechmini/v1/readme.md b/keyboards/mechkeys/mechmini/v1/readme.md
similarity index 92%
rename from keyboards/mechmini/v1/readme.md
rename to keyboards/mechkeys/mechmini/v1/readme.md
index 902948c24d..d6b88d9c04 100644
--- a/keyboards/mechmini/v1/readme.md
+++ b/keyboards/mechkeys/mechmini/v1/readme.md
@@ -8,11 +8,11 @@ A 40% ortholinear/staggered keyboard, that was originally bootmapper and can be
 
 Make example for this keyboard (after setting up your build environment):
 
-    make mechmini/v1:default
+    make mechkeys/mechmini/v1:default
 
 Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
 
-    make mechmini/v1:default:flash
+    make mechkeys/mechmini/v1:default:flash
 
 **Reset Key**: Hold down the key commonly programmed as *L_Ctrl* while plugging in the keyboard.
 
diff --git a/keyboards/mechmini/v1/rules.mk b/keyboards/mechkeys/mechmini/v1/rules.mk
similarity index 100%
rename from keyboards/mechmini/v1/rules.mk
rename to keyboards/mechkeys/mechmini/v1/rules.mk
diff --git a/keyboards/mechmini/v1/v1.c b/keyboards/mechkeys/mechmini/v1/v1.c
similarity index 100%
rename from keyboards/mechmini/v1/v1.c
rename to keyboards/mechkeys/mechmini/v1/v1.c
diff --git a/keyboards/mechmini/v1/v1.h b/keyboards/mechkeys/mechmini/v1/v1.h
similarity index 98%
rename from keyboards/mechmini/v1/v1.h
rename to keyboards/mechkeys/mechmini/v1/v1.h
index 526f12e410..07d1e683f7 100644
--- a/keyboards/mechmini/v1/v1.h
+++ b/keyboards/mechkeys/mechmini/v1/v1.h
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "mechmini.h"
+#include "../mechmini.h"
 
 #define ___ KC_NO
 
diff --git a/keyboards/mechmini/v2/config.h b/keyboards/mechkeys/mechmini/v2/config.h
similarity index 100%
rename from keyboards/mechmini/v2/config.h
rename to keyboards/mechkeys/mechmini/v2/config.h
diff --git a/keyboards/mechmini/v2/info.json b/keyboards/mechkeys/mechmini/v2/info.json
similarity index 100%
rename from keyboards/mechmini/v2/info.json
rename to keyboards/mechkeys/mechmini/v2/info.json
diff --git a/keyboards/mechmini/v2/keymaps/2u_space_ortho/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/2u_space_ortho/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/2u_space_ortho/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/2u_space_ortho/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/625_space/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/625_space/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/625_space/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/625_space/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/arkag/config.h b/keyboards/mechkeys/mechmini/v2/keymaps/arkag/config.h
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/arkag/config.h
rename to keyboards/mechkeys/mechmini/v2/keymaps/arkag/config.h
diff --git a/keyboards/mechmini/v2/keymaps/arkag/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/arkag/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/arkag/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/arkag/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/arkag/rules.mk b/keyboards/mechkeys/mechmini/v2/keymaps/arkag/rules.mk
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/arkag/rules.mk
rename to keyboards/mechkeys/mechmini/v2/keymaps/arkag/rules.mk
diff --git a/keyboards/mechmini/v2/keymaps/default/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/default/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/default/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/default/readme.md b/keyboards/mechkeys/mechmini/v2/keymaps/default/readme.md
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/default/readme.md
rename to keyboards/mechkeys/mechmini/v2/keymaps/default/readme.md
diff --git a/keyboards/mechmini/v2/keymaps/lbibass_625_space/config.h b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/config.h
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/lbibass_625_space/config.h
rename to keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/config.h
diff --git a/keyboards/mechmini/v2/keymaps/lbibass_625_space/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/lbibass_625_space/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/lbibass_625_space/readme.md b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/readme.md
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/lbibass_625_space/readme.md
rename to keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/readme.md
diff --git a/keyboards/mechmini/v2/keymaps/lbibass_625_space/rules.mk b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/rules.mk
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/lbibass_625_space/rules.mk
rename to keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/rules.mk
diff --git a/keyboards/mechmini/v2/keymaps/lbibass_split_space/config.h b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/config.h
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/lbibass_split_space/config.h
rename to keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/config.h
diff --git a/keyboards/mechmini/v2/keymaps/lbibass_split_space/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/lbibass_split_space/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/lbibass_split_space/readme.md b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/readme.md
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/lbibass_split_space/readme.md
rename to keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/readme.md
diff --git a/keyboards/mechmini/v2/keymaps/lbibass_split_space/rules.mk b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/rules.mk
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/lbibass_split_space/rules.mk
rename to keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/rules.mk
diff --git a/keyboards/mechmini/v2/keymaps/ortho/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/ortho/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/ortho/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/ortho/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/spacebarracecar/config.h b/keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/config.h
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/spacebarracecar/config.h
rename to keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/config.h
diff --git a/keyboards/mechmini/v2/keymaps/spacebarracecar/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/spacebarracecar/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/spacebarracecar/readme.md b/keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/readme.md
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/spacebarracecar/readme.md
rename to keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/readme.md
diff --git a/keyboards/mechmini/v2/keymaps/spacebarracecar/rules.mk b/keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/rules.mk
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/spacebarracecar/rules.mk
rename to keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/rules.mk
diff --git a/keyboards/mechmini/v2/keymaps/split_space/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/split_space/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/split_space/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/split_space/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/split_space/readme.md b/keyboards/mechkeys/mechmini/v2/keymaps/split_space/readme.md
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/split_space/readme.md
rename to keyboards/mechkeys/mechmini/v2/keymaps/split_space/readme.md
diff --git a/keyboards/mechmini/v2/keymaps/via/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/via/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/via/keymap.c
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/via/rules.mk b/keyboards/mechkeys/mechmini/v2/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/mechkeys/mechmini/v2/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/mechmini/v2/keymaps/wsturgiss/config.h b/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/config.h
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/wsturgiss/config.h
rename to keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/config.h
diff --git a/keyboards/mechmini/v2/keymaps/wsturgiss/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/wsturgiss/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/wsturgiss/rules.mk b/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/rules.mk
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/wsturgiss/rules.mk
rename to keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/rules.mk
diff --git a/keyboards/mechmini/v2/readme.md b/keyboards/mechkeys/mechmini/v2/readme.md
similarity index 95%
rename from keyboards/mechmini/v2/readme.md
rename to keyboards/mechkeys/mechmini/v2/readme.md
index fdc9fef9bf..8724f16a0f 100644
--- a/keyboards/mechmini/v2/readme.md
+++ b/keyboards/mechkeys/mechmini/v2/readme.md
@@ -13,7 +13,7 @@ Hardware Availability: [MECHKEYS Mechmini 2.0](https://mechkeys.ca/collections/k
 
 Make example for this keyboard (after setting up your build environment), this will make the Mechmini 2.0 default keymap (split space):
 
-    make mechmini/v2:default
+    make mechkeys/mechmini/v2:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
diff --git a/keyboards/mechmini/v2/rules.mk b/keyboards/mechkeys/mechmini/v2/rules.mk
similarity index 100%
rename from keyboards/mechmini/v2/rules.mk
rename to keyboards/mechkeys/mechmini/v2/rules.mk
diff --git a/keyboards/mechmini/v2/v2.c b/keyboards/mechkeys/mechmini/v2/v2.c
similarity index 100%
rename from keyboards/mechmini/v2/v2.c
rename to keyboards/mechkeys/mechmini/v2/v2.c
diff --git a/keyboards/mechmini/v2/v2.h b/keyboards/mechkeys/mechmini/v2/v2.h
similarity index 100%
rename from keyboards/mechmini/v2/v2.h
rename to keyboards/mechkeys/mechmini/v2/v2.h
diff --git a/keyboards/mechlovin/kay60/info.json b/keyboards/mechlovin/kay60/info.json
index 513dcef12f..adcbc594d4 100644
--- a/keyboards/mechlovin/kay60/info.json
+++ b/keyboards/mechlovin/kay60/info.json
@@ -74,7 +74,7 @@
                 {"x": 13.75, "y": 4, "w": 1.25}
             ]
         },
-        "LAYOUT_ansi": {
+        "LAYOUT_60_ansi": {
             "layout": [
                 {"x": 0, "y": 0},
                 {"x": 1, "y": 0},
diff --git a/keyboards/mechmini/rules.mk b/keyboards/mechmini/rules.mk
deleted file mode 100644
index 71dae51277..0000000000
--- a/keyboards/mechmini/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechmini/v2
diff --git a/keyboards/melgeek/mach80/rev2/config.h b/keyboards/melgeek/mach80/rev2/config.h
new file mode 100755
index 0000000000..3ac1b87ab5
--- /dev/null
+++ b/keyboards/melgeek/mach80/rev2/config.h
@@ -0,0 +1,42 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/*
+ * 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 { F0, F1, F4, F5, F6, E6 }
+#define MATRIX_COL_PINS { B0, B1, B2, B3, D2, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, D3 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION ROW2COL
+
+#define DRIVER_LED_TOTAL 94
+#define DRIVER_INDICATOR_LED_TOTAL 3
+
+
+#define RGB_MATRIX_CENTER { 108, 30 }
+
diff --git a/keyboards/melgeek/mach80/rev2/rev2.c b/keyboards/melgeek/mach80/rev2/rev2.c
new file mode 100755
index 0000000000..09250b1565
--- /dev/null
+++ b/keyboards/melgeek/mach80/rev2/rev2.c
@@ -0,0 +1,191 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "mach80.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+
+const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+    {0, CS9_SW1,  CS8_SW1,  CS7_SW1},  /* RGB1 */
+    {0, CS9_SW2,  CS8_SW2,  CS7_SW2},  /* RGB2 */
+    {0, CS9_SW3,  CS8_SW3,  CS7_SW3},  /* RGB3 */
+    {0, CS9_SW4,  CS8_SW4,  CS7_SW4},  /* RGB4 */
+    {0, CS9_SW5,  CS8_SW5,  CS7_SW5},  /* RGB5 */
+    {0, CS9_SW6,  CS8_SW6,  CS7_SW6},  /* RGB6 */
+    {0, CS9_SW7,  CS8_SW7,  CS7_SW7},  /* RGB7 */
+    {0, CS9_SW8,  CS8_SW8,  CS7_SW8},  /* RGB8 */
+    {0, CS9_SW9,  CS8_SW9,  CS7_SW9},  /* RGB9 */
+    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB65 */
+    {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */
+    {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */
+    {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */
+    {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */
+    {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB67 */
+    {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB68 */
+    {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
+	{0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
+    {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */
+	{0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */
+	{0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */
+    {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */
+    {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */
+    {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */
+    {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */
+    {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB69 */
+    {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB70 */
+    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
+    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB55 */
+    {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB71 */
+    {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB72 */
+    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB66 */
+    {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB60 */
+    {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB61 */
+    {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB73 */
+    {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */
+    {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */
+    {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */
+    {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */
+    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */
+    {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */
+    {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */
+    {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */
+    {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
+    {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB74 */
+	{0, CS33_SW1, CS32_SW1, CS31_SW1}, /* RGB75 */
+    {0, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB76 */
+    {0, CS33_SW3, CS32_SW3, CS31_SW3}, /* RGB77 */
+    {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB78 */
+    {0, CS33_SW5, CS32_SW5, CS31_SW5}, /* RGB79 */
+    {0, CS33_SW6, CS32_SW6, CS31_SW6}, /* RGB80 */
+    {0, CS33_SW7, CS32_SW7, CS31_SW7}, /* RGB83 */
+    {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
+    {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
+	{0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
+    {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
+    {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */
+    {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */
+    {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */
+    {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */
+    {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
+    {0, CS33_SW8, CS32_SW8, CS31_SW8}, /* RGB81 */
+    {0, CS33_SW9, CS32_SW9, CS31_SW9}, /* RGB82 */
+    {0, CS36_SW1, CS35_SW1, CS34_SW1}, /* RGB89 */
+    {0, CS36_SW2, CS35_SW2, CS34_SW2}, /* RGB90 */
+    {0, CS36_SW3, CS35_SW3, CS34_SW3}, /* RGB91 */
+    {0, CS36_SW4, CS35_SW4, CS34_SW4}, /* RGB92 */
+    {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
+    {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */
+    {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */
+    {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */
+    {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
+    {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */
+    {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */
+    {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */
+    {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB45 */
+    {0, CS36_SW5, CS35_SW5, CS34_SW5}, /* RGB84 */
+    {0, CS36_SW6, CS35_SW6, CS34_SW6}, /* RGB85 */
+    {0, CS36_SW7, CS35_SW7, CS34_SW7}, /* RGB88 */
+    {0, CS36_SW8, CS35_SW8, CS34_SW8}, /* RGB86 */
+    {0, CS36_SW9, CS35_SW9, CS34_SW9}, /* RGB87 */
+    {0, CS39_SW1, CS38_SW1, CS37_SW1}, /* RGB98 */
+    {0, CS39_SW2, CS38_SW2, CS37_SW2}, /* RGB99 */
+    {0, CS39_SW3, CS38_SW3, CS37_SW3}, /* RGB100 */
+    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */
+    {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */
+    {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */
+    {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */
+    {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */
+    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */
+    {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */
+    {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */
+    {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
+    {0, CS39_SW4, CS38_SW4, CS37_SW4}, /* RGB101 */
+};
+led_config_t g_led_config = {
+	{
+		/* C0       C1       C2       C3       C4       C5       C6       C7       C8       C9       C10       C11       C12       C13       C14       C15 */
+		{  0,  NO_LED,       1,       2,       3,       4,       5,       6,       7,       8,        9,       10,       11,       12,       13,       14 }, /* R0 */
+		{ 16,      17,      18,      19,      20,      21,      22,      23,      24,      25,       26,       27,       28,       30,       32,       33 }, /* R1 */
+		{ 35,      36,      37,      38,      39,      40,      41,      42,      43,      44,       45,       46,       47,       48,       49,       50 }, /* R2 */
+		{ 52,      53,      54,      55,      56,      57,      58,      59,      60,      61,       62,       63,       65,       15,       34,       51 }, /* R3 */
+		{ 68,      70,      71,      72,      73,      74,      75,      76,      77,      78,       79,       81,   NO_LED,   NO_LED,       83,   NO_LED }, /* R4 */
+		{ 84,  NO_LED,      85,  NO_LED,  NO_LED,      87,  NO_LED,  NO_LED,  NO_LED,      89,   NO_LED,   NO_LED,       90,       91,       92,       93 }  /* R5 */
+    }, {
+        {0, 0},   {12, 0},   {24, 0},  {36, 0},  {48, 0},  {60, 0},  {72, 0},  {84, 0},  {96, 0},  {108, 0},  {120, 0},  {132, 0},  {144, 0},  {156, 0},  {168, 0},  {180, 0},                                   //16
+		{0, 12},  {12, 12},  {24, 12}, {36, 12}, {48, 12}, {60, 12}, {72, 12}, {84, 12}, {96, 12}, {108, 12}, {120, 12}, {132, 12}, {144, 12}, {156, 12}, {168, 12}, {180, 12}, {192, 12}, {204, 12}, {216, 12}, //19
+		{0, 24},  {12, 24},  {24, 24}, {36, 24}, {48, 24}, {60, 24}, {72, 24}, {84, 24}, {96, 24}, {108, 24}, {120, 24}, {132, 24}, {144, 24}, {156, 24}, {168, 24}, {180, 24}, {192, 24},                       //17
+		{0, 36},  {12, 36},  {24, 36}, {36, 36}, {48, 36}, {60, 36}, {72, 36}, {84, 36}, {96, 36}, {108, 36}, {120, 36}, {132, 36}, {144, 36}, {156, 36}, {168, 36},                                             //15
+		{0, 48},  {12, 48},  {24, 48}, {36, 48}, {48, 48}, {60, 48}, {72, 48}, {84, 48}, {96, 48}, {108, 48}, {120, 48}, {132, 48}, {144, 48}, {156, 48}, {168, 48}, {180, 48}, {192, 48},                       //17
+		{0, 60},  {12, 60},  {24, 60}, {36, 60}, {48, 60}, {60, 60}, {72, 60}, {84, 60}, {96, 60}, {108, 60}
+		//10
+	}, {          
+	       4,         4,         4,        4,        4,        4,        4,         4,         4,         4,         4,         4,         4,         4,         4,         4,       
+		   4,         4,         4,        4,        4,        4,        4,         4,         4,         4,         4,         4,         4,         4,         4,         4,         4,         4,         4,
+		   4,         4,         4,        4,        4,        4,        4,         4,         4,         4,         4,         4,         4,         4,         4,         4,         4,
+		   4,         4,         4,        4,        4,        4,        4,         4,         4,         4,         4,         4,         4,         4,         4,         
+		   4,         4,         4,        4,        4,        4,        4,         4,         4,         4,         4,         4,         4,         4,         4,         4,         4,
+		   4,         4,         4,        4,        4,        4,        4,         4,         4,         4,         
+	}
+};
+
+const is31_led g_is31_indicator_leds[3] = {
+    {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB107 */
+    {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB108 */
+    {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* RGB109 */
+};
+
+bool led_update_kb(led_t led_state) {
+    if (led_update_user(led_state)) {
+        if (led_state.caps_lock) {
+            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0xff);
+        } else {
+            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0x00);
+        }
+
+        if (led_state.num_lock) {
+            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0xff, 0x00, 0x00);
+        } else {
+            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0x00, 0x00);
+        }
+
+        if (led_state.scroll_lock) {
+            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0xff, 0x00);
+        } else {
+            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0x00);
+        }
+    }
+    return true;
+}
+
+void matrix_init_kb(void) {
+    for (int i = 0; i < DRIVER_INDICATOR_LED_TOTAL; ++i) {
+        is31_led led = g_is31_indicator_leds[i];
+        IS31FL3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF);
+    }
+
+    IS31FL3741_update_led_control_registers(DRIVER_ADDR_1, 0);
+
+    matrix_init_user();
+}
+
+
+void keyboard_pre_init_kb(void) {
+    setPinOutput(B7);
+    writePinHigh(B7);
+    keyboard_pre_init_user();
+}
+#endif
diff --git a/keyboards/melgeek/mach80/rev2/rules.mk b/keyboards/melgeek/mach80/rev2/rules.mk
new file mode 100755
index 0000000000..56ba67e632
--- /dev/null
+++ b/keyboards/melgeek/mach80/rev2/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes          # Mouse keys
+EXTRAKEY_ENABLE = yes          # Audio control and System control
+CONSOLE_ENABLE = no            # Console for debug
+COMMAND_ENABLE = no            # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
+RGB_MATRIX_ENABLE = yes        # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3741
+
+LTO_ENABLE = yes
+
+LAYOUTS = tkl_ansi
diff --git a/keyboards/meow65/info.json b/keyboards/meow65/info.json
index 90153257a6..7221a518bd 100644
--- a/keyboards/meow65/info.json
+++ b/keyboards/meow65/info.json
@@ -2,76 +2,83 @@
     "keyboard_name": "meow65",
     "url": "https://github.com/mrninhvn/meow65-pcb",
     "maintainer": "mrninhvn",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_65_ansi_blocker"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_65_ansi_blocker": {
             "layout": [
-                { "label": "K00 (C6,F5)", "x": 0, "y": 0 },
-                { "label": "K01 (C6,F6)", "x": 1, "y": 0 },
-                { "label": "K02 (C6,B0)", "x": 2, "y": 0 },
-                { "label": "K03 (C6,F4)", "x": 3, "y": 0 },
-                { "label": "K04 (C6,F1)", "x": 4, "y": 0 },
-                { "label": "K05 (C6,D0)", "x": 5, "y": 0 },
-                { "label": "K06 (C6,D1)", "x": 6, "y": 0 },
-                { "label": "K07 (C6,D2)", "x": 7, "y": 0 },
-                { "label": "K08 (C6,D3)", "x": 8, "y": 0 },
-                { "label": "K09 (C6,D5)", "x": 9, "y": 0 },
-                { "label": "K0A (C6,D4)", "x": 10, "y": 0 },
-                { "label": "K0B (C6,D6)", "x": 11, "y": 0 },
-                { "label": "K0C (C6,D7)", "x": 12, "y": 0 },
-                { "label": "K0D (C6,B4)", "x": 13, "y": 0, "w": 2 },
-                { "label": "K0E (C6,C7)", "x": 15, "y": 0 },
-                { "label": "K10 (B6,F5)", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "K11 (B6,F6)", "x": 1.5, "y": 1 },
-                { "label": "K12 (B6,B0)", "x": 2.5, "y": 1 },
-                { "label": "K13 (B6,F4)", "x": 3.5, "y": 1 },
-                { "label": "K14 (B6,F1)", "x": 4.5, "y": 1 },
-                { "label": "K15 (B6,D0)", "x": 5.5, "y": 1 },
-                { "label": "K16 (B6,D1)", "x": 6.5, "y": 1 },
-                { "label": "K17 (B6,D2)", "x": 7.5, "y": 1 },
-                { "label": "K18 (B6,D3)", "x": 8.5, "y": 1 },
-                { "label": "K19 (B6,D5)", "x": 9.5, "y": 1 },
-                { "label": "K1A (B6,D4)", "x": 10.5, "y": 1 },
-                { "label": "K1B (B6,D6)", "x": 11.5, "y": 1 },
-                { "label": "K1C (B6,D7)", "x": 12.5, "y": 1 },
-                { "label": "K1D (B6,B4)", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "K1E (B6,C7)", "x": 15, "y": 1 },
-                { "label": "K20 (B5,F5)", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "K21 (B5,F6)", "x": 1.75, "y": 2 },
-                { "label": "K22 (B5,B0)", "x": 2.75, "y": 2 },
-                { "label": "K23 (B5,F4)", "x": 3.75, "y": 2 },
-                { "label": "K24 (B5,F1)", "x": 4.75, "y": 2 },
-                { "label": "K25 (B5,D0)", "x": 5.75, "y": 2 },
-                { "label": "K26 (B5,D1)", "x": 6.75, "y": 2 },
-                { "label": "K27 (B5,D2)", "x": 7.75, "y": 2 },
-                { "label": "K28 (B5,D3)", "x": 8.75, "y": 2 },
-                { "label": "K29 (B5,D5)", "x": 9.75, "y": 2 },
-                { "label": "K2A (B5,D4)", "x": 10.75, "y": 2 },
-                { "label": "K2B (B5,D6)", "x": 11.75, "y": 2 },
-                { "label": "K2D (B5,B4)", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "K2E (B5,C7)", "x": 15, "y": 2 },
-                { "label": "K30 (B7,F5)", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "K31 (B7,F6)", "x": 2.25, "y": 3 },
-                { "label": "K32 (B7,B0)", "x": 3.25, "y": 3 },
-                { "label": "K33 (B7,F4)", "x": 4.25, "y": 3 },
-                { "label": "K34 (B7,F1)", "x": 5.25, "y": 3 },
-                { "label": "K35 (B7,D0)", "x": 6.25, "y": 3 },
-                { "label": "K36 (B7,D1)", "x": 7.25, "y": 3 },
-                { "label": "K37 (B7,D2)", "x": 8.25, "y": 3 },
-                { "label": "K38 (B7,D3)", "x": 9.25, "y": 3 },
-                { "label": "K39 (B7,D5)", "x": 10.25, "y": 3 },
-                { "label": "K3A (B7,D4)", "x": 11.25, "y": 3 },
-                { "label": "K3C (B7,D7)", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "K3D (B7,B4)", "x": 14, "y": 3 },
-                { "label": "K3E (B7,C7)", "x": 15, "y": 3 },
-                { "label": "K40 (F7,F5)", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "K41 (F7,F6)", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "K42 (F7,B0)", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "K45 (F7,D0)", "x": 3.75, "y": 4, "w": 6.25 },
-                { "label": "K49 (F7,D5)", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "K4A (F7,D4)", "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "K4C (F7,D7)", "x": 13, "y": 4 },
-                { "label": "K4D (F7,B4)", "x": 14, "y": 4 },
-                { "label": "K4E (F7,C7)", "x": 15, "y": 4 }
+                { "label": "Esc", "x": 0, "y": 0 },
+                { "label": "1!", "x": 1, "y": 0 },
+                { "label": "2@", "x": 2, "y": 0 },
+                { "label": "3#", "x": 3, "y": 0 },
+                { "label": "4$", "x": 4, "y": 0 },
+                { "label": "5%", "x": 5, "y": 0 },
+                { "label": "6^", "x": 6, "y": 0 },
+                { "label": "7&", "x": 7, "y": 0 },
+                { "label": "8*", "x": 8, "y": 0 },
+                { "label": "9(", "x": 9, "y": 0 },
+                { "label": "0)", "x": 10, "y": 0 },
+                { "label": "-_", "x": 11, "y": 0 },
+                { "label": "=+", "x": 12, "y": 0 },
+                { "label": "Backspace", "x": 13, "y": 0, "w": 2 },
+                { "label": "Home", "x": 15, "y": 0 },
+
+                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
+                { "label": "Q", "x": 1.5, "y": 1 },
+                { "label": "W", "x": 2.5, "y": 1 },
+                { "label": "E", "x": 3.5, "y": 1 },
+                { "label": "R", "x": 4.5, "y": 1 },
+                { "label": "T", "x": 5.5, "y": 1 },
+                { "label": "Y", "x": 6.5, "y": 1 },
+                { "label": "U", "x": 7.5, "y": 1 },
+                { "label": "I", "x": 8.5, "y": 1 },
+                { "label": "O", "x": 9.5, "y": 1 },
+                { "label": "P", "x": 10.5, "y": 1 },
+                { "label": "[{", "x": 11.5, "y": 1 },
+                { "label": "]}", "x": 12.5, "y": 1 },
+                { "label": "\\|", "x": 13.5, "y": 1, "w": 1.5 },
+                { "label": "PageUp", "x": 15, "y": 1 },
+
+                { "label": "Caps", "x": 0, "y": 2, "w": 1.75 },
+                { "label": "A", "x": 1.75, "y": 2 },
+                { "label": "S", "x": 2.75, "y": 2 },
+                { "label": "D", "x": 3.75, "y": 2 },
+                { "label": "F", "x": 4.75, "y": 2 },
+                { "label": "G", "x": 5.75, "y": 2 },
+                { "label": "H", "x": 6.75, "y": 2 },
+                { "label": "J", "x": 7.75, "y": 2 },
+                { "label": "K", "x": 8.75, "y": 2 },
+                { "label": "L", "x": 9.75, "y": 2 },
+                { "label": ";:", "x": 10.75, "y": 2 },
+                { "label": "'\"", "x": 11.75, "y": 2 },
+                { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
+                { "label": "Page Down", "x": 15, "y": 2 },
+
+                { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
+                { "label": "Z", "x": 2.25, "y": 3 },
+                { "label": "X", "x": 3.25, "y": 3 },
+                { "label": "C", "x": 4.25, "y": 3 },
+                { "label": "V", "x": 5.25, "y": 3 },
+                { "label": "B", "x": 6.25, "y": 3 },
+                { "label": "N", "x": 7.25, "y": 3 },
+                { "label": "M", "x": 8.25, "y": 3 },
+                { "label": ",<", "x": 9.25, "y": 3 },
+                { "label": ".>", "x": 10.25, "y": 3 },
+                { "label": "/?", "x": 11.25, "y": 3 },
+                { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
+                { "label": "\u2191", "x": 14, "y": 3 },
+                { "label": "End", "x": 15, "y": 3 },
+
+                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
+                { "label": "GUI", "x": 1.25, "y": 4, "w": 1.25 },
+                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
+                { "label": "Space", "x": 3.75, "y": 4, "w": 6.25 },
+                { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
+                { "label": "Ctrl", "x": 11.25, "y": 4, "w": 1.25 },
+                { "label": "\u2190", "x": 13, "y": 4 },
+                { "label": "\u2193", "x": 14, "y": 4 },
+                { "label": "\u2192", "x": 15, "y": 4 }
             ]
         }
     }
diff --git a/keyboards/meow65/keymaps/default/keymap.c b/keyboards/meow65/keymaps/default/keymap.c
index b93abee723..3a5c4b76a8 100644
--- a/keyboards/meow65/keymaps/default/keymap.c
+++ b/keyboards/meow65/keymaps/default/keymap.c
@@ -23,14 +23,14 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    [_BASE] = LAYOUT(
+    [_BASE] = LAYOUT_65_ansi_blocker(
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME, 
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_PGDN, 
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,  
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  MO(_FN),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [_FN] = LAYOUT(
+    [_FN] = LAYOUT_65_ansi_blocker(
         RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
diff --git a/keyboards/meow65/keymaps/via/keymap.c b/keyboards/meow65/keymaps/via/keymap.c
index b765673ca1..ef7dd62071 100644
--- a/keyboards/meow65/keymaps/via/keymap.c
+++ b/keyboards/meow65/keymaps/via/keymap.c
@@ -23,28 +23,28 @@ enum layer_names {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_L0] = LAYOUT(
+    [_L0] = LAYOUT_65_ansi_blocker(
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME, 
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_PGDN, 
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,  
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  MO(_L1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [_L1] = LAYOUT(
+    [_L1] = LAYOUT_65_ansi_blocker(
         RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
-    [_L2] = LAYOUT(
+    [_L2] = LAYOUT_65_ansi_blocker(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
-    [_L3] = LAYOUT(
+    [_L3] = LAYOUT_65_ansi_blocker(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
diff --git a/keyboards/meow65/meow65.h b/keyboards/meow65/meow65.h
index 2e25bd9758..2643158342 100644
--- a/keyboards/meow65/meow65.h
+++ b/keyboards/meow65/meow65.h
@@ -26,7 +26,7 @@
  * The second converts the arguments into a two-dimensional array which
  * represents the switch matrix.
  */
-#define LAYOUT( \
+#define LAYOUT_65_ansi_blocker( \
     k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, \
     k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, \
     k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,       k213, k214, \
diff --git a/keyboards/meow65/rules.mk b/keyboards/meow65/rules.mk
index 476cf49f27..22b16cb763 100644
--- a/keyboards/meow65/rules.mk
+++ b/keyboards/meow65/rules.mk
@@ -16,3 +16,5 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = 65_ansi_blocker
diff --git a/keyboards/mlego/m60_split/config.h b/keyboards/mlego/m60_split/config.h
new file mode 100644
index 0000000000..6750d4d40b
--- /dev/null
+++ b/keyboards/mlego/m60_split/config.h
@@ -0,0 +1,37 @@
+/* Copyright 2021-2022 alin m elena <alinm.elena@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0xBABA
+#define MANUFACTURER alin elena
+#define PRODUCT m60_split
+
+#define MATRIX_ROWS 10  // Rows are doubled-up
+#define MATRIX_COLS 6
+
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/keyboards/mlego/m60_split/info.json b/keyboards/mlego/m60_split/info.json
new file mode 100644
index 0000000000..ad1f8f4bc9
--- /dev/null
+++ b/keyboards/mlego/m60_split/info.json
@@ -0,0 +1,11 @@
+{
+    "keyboard_name": "mlego/m60_split",
+    "keyboard_folder": "mlego/m60_split",
+    "url": "https://gitlab.com/m-lego/m65",
+    "maintainer": "alin elena",
+    "layouts": {
+        "LAYOUT_ortho_5x12": {
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}]
+        }
+    }
+}
diff --git a/keyboards/mlego/m60_split/keymaps/default/config.h b/keyboards/mlego/m60_split/keymaps/default/config.h
new file mode 100644
index 0000000000..b1aed18a18
--- /dev/null
+++ b/keyboards/mlego/m60_split/keymaps/default/config.h
@@ -0,0 +1,21 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define TAPPING_TOGGLE 2
+#define UNICODE_SELECTED_MODES UC_LNX, UC_MAC, UC_WINC
diff --git a/keyboards/mlego/m60_split/keymaps/default/keymap.c b/keyboards/mlego/m60_split/keymaps/default/keymap.c
new file mode 100644
index 0000000000..5e3912b0bd
--- /dev/null
+++ b/keyboards/mlego/m60_split/keymaps/default/keymap.c
@@ -0,0 +1,193 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _QW = 0,
+    _LWR,
+    _RSE,
+    _ADJ
+};
+
+#define LOWER TT(_LWR)
+#define RAISE TT(_RSE)
+
+#ifdef RGBLIGHT_ENABLE
+
+const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_PURPLE});
+const rgblight_segment_t PROGMEM my_lwr_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_CYAN});
+const rgblight_segment_t PROGMEM my_rse_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_RED});
+const rgblight_segment_t PROGMEM my_adj_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_GREEN});
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_qwerty_layer, my_lwr_layer, my_rse_layer, my_adj_layer);
+#endif
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_QW] = LAYOUT_ortho_5x12(
+
+    KC_GRV , KC_1   , KC_2   , KC_3  , KC_4 , KC_5  , KC_6  , KC_7 , KC_8   , KC_9   , KC_0   , KC_BSPC,
+    KC_ESC , KC_Q   , KC_W   , KC_E  , KC_R , KC_T  , KC_Y  , KC_U , KC_I   , KC_O   , KC_P   , KC_DEL ,
+    KC_TAB , KC_A   , KC_S   , KC_D  , KC_F , KC_G  , KC_H  , KC_J , KC_K   , KC_L   , KC_SCLN, KC_QUOT,
+    KC_LSFT, KC_Z   , KC_X   , KC_C  , KC_V , KC_B  , KC_N  , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_ENT ,
+    KC_LCTL, KC_LGUI, KC_LALT, KC_APP, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT
+
+    ),
+
+[_LWR] = LAYOUT_ortho_5x12(
+
+    KC_TILD, KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC, KC_CIRC, KC_AMPR   , KC_ASTR   , KC_LPRN, KC_RPRN, KC_DEL ,
+    KC_DEL , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_UNDS   , KC_PLUS   , KC_LCBR, KC_RCBR, KC_PIPE,
+    _______, KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , S(KC_NUHS), S(KC_NUBS), _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______   , KC_MNXT   , KC_VOLD, KC_VOLU, KC_MPLY,
+    _______, _______, _______, _______, _______, _______, _______, _______   , _______   , _______, _______, _______
+
+ ),
+
+[_RSE] = LAYOUT_ortho_5x12(
+
+    KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_DEL ,
+    KC_DEL , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_MINS, KC_EQL , KC_LBRC, KC_RBRC, KC_BSLS,
+    _______, KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_NUHS, KC_NUBS, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+
+    ),
+
+[_ADJ] =  LAYOUT_ortho_5x12(
+
+    _______, RESET  , _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_M_G, RESET  , _______,
+    _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI , _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD , _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______ , _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______ , _______, _______, _______
+
+    )
+
+};
+// clang-format on
+
+// let us assume we start with both layers off
+bool toggle_lwr = false;
+bool toggle_rse = false;
+
+bool led_update_user(led_t led_state) {
+    // Disable the default LED update code, so that lock LEDs could be reused to show layer status.
+    return false;
+}
+
+void matrix_scan_user(void) {
+    led_lwr(toggle_lwr);
+    led_rse(toggle_rse);
+    led_t led_state = host_keyboard_led_state();
+    led_caps(led_state.caps_lock);
+    if (layer_state_is(_ADJ)) {
+        led_lwr(true);
+        led_rse(true);
+    }
+}
+
+void matrix_slave_scan_user(void) {
+    matrix_scan_user();
+    if (IS_LAYER_ON(_LWR)) {
+        led_lwr(layer_state_is(_LWR));
+    }
+    if (IS_LAYER_ON(_RSE)) {
+        led_rse(layer_state_is(_RSE));
+    }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t* record) {
+    switch (keycode) {
+        case (TT(_LWR)):
+            if (!record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
+                // This runs before the TT() handler toggles the layer state, so the current layer state is the opposite of the final one after toggle.
+                toggle_lwr = !layer_state_is(_LWR);
+            }
+            return true;
+            break;
+        case (TT(_RSE)):
+            if (record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
+                toggle_rse = !layer_state_is(_RSE);
+            }
+            return true;
+            break;
+        default:
+            return true;
+    }
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+#ifdef RGBLIGHT_ENABLE
+
+    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+    rgblight_set_layer_state(1, layer_state_cmp(state, _LWR));
+    rgblight_set_layer_state(2, layer_state_cmp(state, _RSE));
+    rgblight_set_layer_state(3, layer_state_cmp(state, _ADJ));
+
+#endif
+    return update_tri_layer_state(state, _LWR, _RSE, _ADJ);
+}
+
+#ifdef RGBLIGHT_ENABLE
+
+layer_state_t default_layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+    return state;
+}
+
+void keyboard_post_init_user(void) {
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+}
+#endif
+
+#ifdef ENCODER_ENABLE
+
+#    define MEDIA_KEY_DELAY 10
+
+static inline void my_encoders(const uint8_t index, const bool clockwise) {
+    if (index == 0 || (index == 1)) { /* First encoder on each side*/
+        if (IS_LAYER_ON(_LWR)) {
+            if (clockwise) {
+                rgblight_decrease_val_noeeprom();
+            } else {
+                rgblight_increase_val_noeeprom();
+            }
+        } else if (IS_LAYER_ON(_RSE)) {
+            if (clockwise) {
+                rgblight_decrease_hue_noeeprom();
+            } else {
+                rgblight_increase_hue_noeeprom();
+            }
+
+        } else {
+            if (clockwise) {
+                tap_code_delay(KC_VOLD, MEDIA_KEY_DELAY);
+            } else {
+                tap_code_delay(KC_VOLU, MEDIA_KEY_DELAY);
+            }
+        }
+    }
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    my_encoders(index, clockwise);
+    return true;
+}
+#endif
diff --git a/keyboards/mlego/m60_split/keymaps/via/config.h b/keyboards/mlego/m60_split/keymaps/via/config.h
new file mode 100644
index 0000000000..637c0a8faf
--- /dev/null
+++ b/keyboards/mlego/m60_split/keymaps/via/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/mlego/m60_split/keymaps/via/keymap.c b/keyboards/mlego/m60_split/keymaps/via/keymap.c
new file mode 100644
index 0000000000..ccb0104748
--- /dev/null
+++ b/keyboards/mlego/m60_split/keymaps/via/keymap.c
@@ -0,0 +1,185 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _QW = 0,
+    _LWR,
+    _RSE,
+    _ADJ
+};
+
+#define LOWER TT(_LWR)
+#define RAISE TT(_RSE)
+
+#ifdef RGBLIGHT_ENABLE
+
+const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_PURPLE});
+const rgblight_segment_t PROGMEM my_lwr_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_CYAN});
+const rgblight_segment_t PROGMEM my_rse_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_RED});
+const rgblight_segment_t PROGMEM my_adj_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_GREEN});
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_qwerty_layer, my_lwr_layer, my_rse_layer, my_adj_layer);
+#endif
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_QW] = LAYOUT_ortho_5x12(
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+    KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
+    KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
+    KC_LCTL, KC_LGUI, KC_LALT, KC_APP,  LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+),
+
+[_LWR] = LAYOUT_ortho_5x12(
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+),
+
+[_RSE] = LAYOUT_ortho_5x12(
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+),
+
+[_ADJ] =  LAYOUT_ortho_5x12(
+    _______, RESET,   _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_G, RESET,   _______,
+    _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+)
+
+};
+// clang-format on
+
+// let us assume we start with both layers off
+bool toggle_lwr = false;
+bool toggle_rse = false;
+
+bool led_update_user(led_t led_state) {
+    // Disable the default LED update code, so that lock LEDs could be reused to show layer status.
+    return false;
+}
+
+void matrix_scan_user(void) {
+    led_lwr(toggle_lwr);
+    led_rse(toggle_rse);
+    led_t led_state = host_keyboard_led_state();
+    led_caps(led_state.caps_lock);
+    if (layer_state_is(_ADJ)) {
+        led_lwr(true);
+        led_rse(true);
+    }
+}
+
+void matrix_slave_scan_user(void) {
+    matrix_scan_user();
+    if (IS_LAYER_ON(_LWR)) {
+        led_lwr(layer_state_is(_LWR));
+    }
+    if (IS_LAYER_ON(_RSE)) {
+        led_rse(layer_state_is(_RSE));
+    }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t* record) {
+    switch (keycode) {
+        case (TT(_LWR)):
+            if (!record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
+                // This runs before the TT() handler toggles the layer state, so the current layer state is the opposite of the final one after toggle.
+                toggle_lwr = !layer_state_is(_LWR);
+            }
+            return true;
+            break;
+        case (TT(_RSE)):
+            if (record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
+                toggle_rse = !layer_state_is(_RSE);
+            }
+            return true;
+            break;
+        default:
+            return true;
+    }
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+#ifdef RGBLIGHT_ENABLE
+
+    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+    rgblight_set_layer_state(1, layer_state_cmp(state, _LWR));
+    rgblight_set_layer_state(2, layer_state_cmp(state, _RSE));
+    rgblight_set_layer_state(3, layer_state_cmp(state, _ADJ));
+
+#endif
+    return update_tri_layer_state(state, _LWR, _RSE, _ADJ);
+}
+
+#ifdef RGBLIGHT_ENABLE
+
+layer_state_t default_layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+    return state;
+}
+
+void keyboard_post_init_user(void) {
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+}
+#endif
+
+#ifdef ENCODER_ENABLE
+
+#    define MEDIA_KEY_DELAY 10
+
+static inline void my_encoders(const uint8_t index, const bool clockwise) {
+    if (index == 0 || (index == 1)) { /* First encoder on each side*/
+        if (IS_LAYER_ON(_LWR)) {
+            if (clockwise) {
+                rgblight_decrease_val_noeeprom();
+            } else {
+                rgblight_increase_val_noeeprom();
+            }
+        } else if (IS_LAYER_ON(_RSE)) {
+            if (clockwise) {
+                rgblight_decrease_hue_noeeprom();
+            } else {
+                rgblight_increase_hue_noeeprom();
+            }
+
+        } else {
+            if (clockwise) {
+                tap_code_delay(KC_VOLD, MEDIA_KEY_DELAY);
+            } else {
+                tap_code_delay(KC_VOLU, MEDIA_KEY_DELAY);
+            }
+        }
+    }
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    my_encoders(index, clockwise);
+    return true;
+}
+#endif
diff --git a/keyboards/mlego/m60_split/keymaps/via/rules.mk b/keyboards/mlego/m60_split/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/mlego/m60_split/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/mlego/m60_split/m60_split.c b/keyboards/mlego/m60_split/m60_split.c
new file mode 100644
index 0000000000..49fa10457a
--- /dev/null
+++ b/keyboards/mlego/m60_split/m60_split.c
@@ -0,0 +1,17 @@
+/* Copyright 2021-2022 alin elena <alin@elena.space>
+ *
+ * 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 "m60_split.h"
+
diff --git a/keyboards/mlego/m60_split/m60_split.h b/keyboards/mlego/m60_split/m60_split.h
new file mode 100644
index 0000000000..11cbd5be60
--- /dev/null
+++ b/keyboards/mlego/m60_split/m60_split.h
@@ -0,0 +1,57 @@
+/* Copyright 2021-2022 alin elena <alin@elena.space>
+ *
+ * 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 LAYOUT_ortho_5x12( \
+    L00, L01, L02, L03, L04, L05,   R00, R01, R02, R03, R04, R05, \
+    L10, L11, L12, L13, L14, L15,   R10, R11, R12, R13, R14, R15, \
+    L20, L21, L22, L23, L24, L25,   R20, R21, R22, R23, R24, R25, \
+    L30, L31, L32, L33, L34, L35,   R30, R31, R32, R33, R34, R35, \
+    L40, L41, L42, L43, L44, L45,   R40, R41, R42, R43, R44, R45  \
+) { \
+    { L00, L01, L02, L03, L04, L05 }, \
+    { L10, L11, L12, L13, L14, L15 }, \
+    { L20, L21, L22, L23, L24, L25 }, \
+    { L30, L31, L32, L33, L34, L35 }, \
+    { L40, L41, L42, L43, L44, L45 }, \
+    { R05, R04, R03, R02, R01, R00 }, \
+    { R15, R14, R13, R12, R11, R10 }, \
+    { R25, R24, R23, R22, R21, R20 }, \
+    { R35, R34, R33, R32, R31, R30 }, \
+    { R45, R44, R43, R42, R41, R40 }  \
+}
+
+
+static inline void led_lwr(const bool on) {
+#ifdef LED_NUM_LOCK_PIN
+    writePin(LED_NUM_LOCK_PIN, on);
+#endif
+}
+
+static inline void led_rse(const bool on) {
+#ifdef LED_SCROLL_LOCK_PIN
+    writePin(LED_SCROLL_LOCK_PIN, on);
+#endif
+}
+
+static inline void led_caps(const bool on) {
+#ifdef LED_CAPS_LOCK_PIN
+    writePin(LED_CAPS_LOCK_PIN, !on);
+#endif
+}
+
diff --git a/keyboards/mlego/m60_split/readme.md b/keyboards/mlego/m60_split/readme.md
new file mode 100644
index 0000000000..cb0214876f
--- /dev/null
+++ b/keyboards/mlego/m60_split/readme.md
@@ -0,0 +1,67 @@
+# M60 split
+
+![M60](https://i.imgur.com/3QfVLFRh.jpg)
+
+A  (12x5) ortholinear split keyboard that can be hand wired or using a pcb.
+
+* Keyboard Maintainer: [Alin Elena](https://github.com/alinelena) ([@drFaustroll on GitLab](https://gitlab.com/drFaustroll))
+* Hardware Supported: custom pcb [see](https://gitlab.com/m-lego/m60_split) STM32F401 from we act (rev1)
+* Hardware Availability: [custom how to](https://gitlab.com/m-lego/m60_split)
+
+
+Make example for this keyboard (after setting up your uild environment):
+
+    make mlego/m60_split/rev1:default
+
+Flashing example for this keyboard:
+
+    make mlego/m60_split/rev1:default
+
+To enter flashing mode, press Lower+Raise+1 or Lower+Raise+0 also on microcontroller keep pressed BOOT0 and then NRST, release NRST and then after 0.5s or so  release BOOT0.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## pins and leds rev1 and rev2
+
+### left
+
+| Rows  | C0    | C1    | C2    | C3    | C4    | C5    | Pins  |
+| :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
+| R0    |  `    | 1     | 2     | 3     | 4     | 5     |   B0  |
+| R1    | Tab   | q     | w     | e     | r     | t     |   A6  |
+| R2    | Esc   | a     | s     | d     | f     | g     |   A7  |
+| R3    | Shift | z     | x     | c     | v     | b     |   B1  |
+| R4    | Ctrl  | Menu  | Alt   | Fn    | Lower | Space |   A5  |
+| Pins  | B14   | A10   | A15   | B3    | B4    | B5    |       |
+
+### right
+
+| Rows  | C6    | C7    | C8    | C9    | C10   | C11   | Pins  |
+| :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
+| R0    | 6     | 7     | 8     | 9     | 0     | BSpace|   B1  |
+| R1    | y     | u     | i     | o     | p     | Del   |   A4  |
+| R2    | h     | j     | k     | l     | ;     | '     |   A5  |
+| R3    | n     | m     | ,     | .     | /     | Enter |   A6  |
+| R4    | Space | Raise | Left  | Down  | Up    | Right |   A7  |
+| Pins  | B5    | A7    | A1    | A2    | A3    |  B0   |       |
+
+### Encoders:
+
+  - Pad_A: A0
+  - Pad_B: B8
+
+### Leds
+
+| Leds        | Pin |
+| ----------- | --- |
+| NUM_LOCK    | B12 |
+| CAPS_LOCK   | C13 |
+| SCROLL_LOCK | B13 |
+| RBG_DI      | B15 |
+
+### split pins
+
+|                     | Pin  |
+| ------------------- | ---- |
+| SPLIT_HAND_PIN      |  B9  |
+| SERIAL_USART_TX_PIN |  B6  |
diff --git a/keyboards/mlego/m60_split/rev1/config.h b/keyboards/mlego/m60_split/rev1/config.h
new file mode 100644
index 0000000000..6b7923ac12
--- /dev/null
+++ b/keyboards/mlego/m60_split/rev1/config.h
@@ -0,0 +1,86 @@
+/* Copyright 2021-2022 alin m elena <alinm.elena@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define PRODUCT_ID 0x0001
+#define DEVICE_VER 0x0001
+
+#define MATRIX_ROW_PINS \
+    { B0, A6, A7, B1, A5 }
+#define MATRIX_COL_PINS \
+    { B14, A10, A15, B3, B4, B5 }
+
+#define MATRIX_ROW_PINS_RIGHT \
+    { B1, A4, A5, A6, A7 }
+
+#define MATRIX_COL_PINS_RIGHT \
+    { B0, A3, A2, A1, B7, B5 }  // cols are from right to left to match the layout
+
+#define ENCODERS_PAD_A \
+    { A0 }
+#define ENCODERS_PAD_B \
+    { B8 }
+#define ENCODER_RESOLUTIONS \
+    { 4 }
+
+#define LED_NUM_LOCK_PIN B12
+#define LED_SCROLL_LOCK_PIN B13
+#define LED_CAPS_LOCK_PIN C13
+
+#define SPLIT_LAYER_STATE_ENABLE
+#define SPLIT_LED_STATE_ENABLE
+
+#define RGB_DI_PIN B15
+
+#define SPLIT_HAND_PIN B9
+#define SERIAL_USART_TX_PIN B6
+#define RGBLIGHT_SPLIT
+#define RGBLIGHT_LAYERS
+
+#define UNUSED_PINS
+#define SERIAL_USART_SPEED 921600
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+#define MATRIX_IO_DELAY 5
+
+#define RGBLIGHT_LIMIT_VAL 128
+#define RGBLIGHT_DEFAULT_HUE 213
+
+#define RGBLED_NUM 16
+#define RGBLED_SPLIT \
+    { 8, 8 }
+
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+#define BOOTMAGIC_LITE_ROW_RIGHT 5
+#define BOOTMAGIC_LITE_COLUMN_RIGHT 0
diff --git a/keyboards/mlego/m60_split/rev1/halconf.h b/keyboards/mlego/m60_split/rev1/halconf.h
new file mode 100644
index 0000000000..89815e23b7
--- /dev/null
+++ b/keyboards/mlego/m60_split/rev1/halconf.h
@@ -0,0 +1,30 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f401/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#define HAL_USE_SERIAL TRUE
+
+#define SERIAL_USB_BUFFERS_SIZE 256
+
+#include_next <halconf.h>
diff --git a/keyboards/mlego/m60_split/rev1/mcuconf.h b/keyboards/mlego/m60_split/rev1/mcuconf.h
new file mode 100644
index 0000000000..4d90ec07ea
--- /dev/null
+++ b/keyboards/mlego/m60_split/rev1/mcuconf.h
@@ -0,0 +1,30 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f401/mcuconf.h -r platforms/chibios/BLACKPILL_STM32_F401/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 TRUE
diff --git a/keyboards/mlego/m60_split/rev1/rules.mk b/keyboards/mlego/m60_split/rev1/rules.mk
new file mode 100644
index 0000000000..9e2c8d6570
--- /dev/null
+++ b/keyboards/mlego/m60_split/rev1/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = STM32F401
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+SPLIT_KEYBOARD = yes
+SERIAL_DRIVER = usart
+ENCODER_ENABLE = yes        # Enable encoder
+
+LAYOUTS = ortho_5x12
+
diff --git a/keyboards/mlego/m60_split/rev2/config.h b/keyboards/mlego/m60_split/rev2/config.h
new file mode 100644
index 0000000000..1e45e86d06
--- /dev/null
+++ b/keyboards/mlego/m60_split/rev2/config.h
@@ -0,0 +1,82 @@
+/* Copyright 2021-2022 alin m elena <alinm.elena@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define PRODUCT_ID 0x0001
+#define DEVICE_VER 0x0001
+
+#define MATRIX_ROW_PINS \
+    { B0, A6, A7, B1, A5 }
+#define MATRIX_COL_PINS \
+    { B14, A10, A15, B3, B4, B5 }
+
+#define MATRIX_ROW_PINS_RIGHT \
+    { B1, A4, A5, A6, A7 }
+
+#define MATRIX_COL_PINS_RIGHT \
+    { B0, A3, A2, A1, B7, B5 }  // cols are from right to left to match the layout
+
+#define ENCODERS_PAD_A \
+    { A0 }
+#define ENCODERS_PAD_B \
+    { B8 }
+#define ENCODER_RESOLUTIONS \
+    { 4 }
+
+#define LED_NUM_LOCK_PIN B12
+#define LED_SCROLL_LOCK_PIN B13
+#define LED_CAPS_LOCK_PIN C13
+#define SPLIT_LAYER_STATE_ENABLE
+#define SPLIT_LED_STATE_ENABLE
+
+#define RGB_DI_PIN B15
+
+#define SPLIT_HAND_PIN B9
+#define SERIAL_USART_TX_PIN B6
+#define RGBLIGHT_SPLIT
+
+#define UNUSED_PINS
+#define SERIAL_USART_SPEED 921600
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+#define MATRIX_IO_DELAY 5
+
+#define RGBLIGHT_LAYERS
+
+#define RGBLED_NUM 16
+#define RGBLED_SPLIT \
+    { 8, 8 }
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+#define BOOTMAGIC_LITE_ROW_RIGHT 5
+#define BOOTMAGIC_LITE_COLUMN_RIGHT 0
diff --git a/keyboards/mlego/m60_split/rev2/halconf.h b/keyboards/mlego/m60_split/rev2/halconf.h
new file mode 100644
index 0000000000..89815e23b7
--- /dev/null
+++ b/keyboards/mlego/m60_split/rev2/halconf.h
@@ -0,0 +1,30 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f401/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#define HAL_USE_SERIAL TRUE
+
+#define SERIAL_USB_BUFFERS_SIZE 256
+
+#include_next <halconf.h>
diff --git a/keyboards/mlego/m60_split/rev2/mcuconf.h b/keyboards/mlego/m60_split/rev2/mcuconf.h
new file mode 100644
index 0000000000..4d90ec07ea
--- /dev/null
+++ b/keyboards/mlego/m60_split/rev2/mcuconf.h
@@ -0,0 +1,30 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f401/mcuconf.h -r platforms/chibios/BLACKPILL_STM32_F401/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 TRUE
diff --git a/keyboards/mlego/m60_split/rev2/rules.mk b/keyboards/mlego/m60_split/rev2/rules.mk
new file mode 100644
index 0000000000..cb8f4bd951
--- /dev/null
+++ b/keyboards/mlego/m60_split/rev2/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = STM32F411
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+SPLIT_KEYBOARD = yes
+SERIAL_DRIVER = usart
+ENCODER_ENABLE = yes        # Enable encoder
+
+LAYOUTS = ortho_5x12
diff --git a/keyboards/mnk75/config.h b/keyboards/mnk75/config.h
new file mode 100755
index 0000000000..a0aec085d3
--- /dev/null
+++ b/keyboards/mnk75/config.h
@@ -0,0 +1,76 @@
+/*
+Copyright 2021 Yiancar-Designs
+
+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"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x8968
+#define PRODUCT_ID      0x4D37
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Yiancar-Designs
+#define PRODUCT         MNK75
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 15
+
+#define MATRIX_ROW_PINS { A2, A14, A15, B3, B4, B5 }
+#define MATRIX_COL_PINS { A1, B9, A3, A4, A5, A6, A7, B0, B1, B2, B10, B11, B12, B13, B14 }
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Ensure we jump to bootloader if the RESET keycode was pressed */
+#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/mnk75/info.json b/keyboards/mnk75/info.json
new file mode 100755
index 0000000000..65b2100da5
--- /dev/null
+++ b/keyboards/mnk75/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "MNK75",
+    "url": "https://yiancar-designs.com",
+    "maintainer": "Yiancar-Designs",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [{"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "y":0}, {"x":14, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5}, {"x":14, "y":1.5}, {"x":15, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5, "w":2.25}, {"x":15, "y":3.5}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"x":15, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5, "w":1.25}, {"x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":2.75}, {"x":6.5, "y":5.5, "w":1.25}, {"x":7.75, "y":5.5, "w":2.25}, {"x":10, "y":5.5, "w":1.25}, {"x":11.25, "y":5.5, "w":1.25}, {"x":13, "y":5.5}, {"x":14, "y":5.5}, {"x":15, "y":5.5}]
+            }
+        }
+}
diff --git a/keyboards/mnk75/keymaps/default/keymap.c b/keyboards/mnk75/keymaps/default/keymap.c
new file mode 100644
index 0000000000..acabed3ae8
--- /dev/null
+++ b/keyboards/mnk75/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2021 Yiancar-Designs
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_all( /* Base */
+    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_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
+    KC_LSFT, KC_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_END,
+    KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, KC_APP,           KC_LEFT, KC_DOWN, KC_RGHT)
+};
diff --git a/keyboards/mnk75/keymaps/default/readme.md b/keyboards/mnk75/keymaps/default/readme.md
new file mode 100755
index 0000000000..934ada1fef
--- /dev/null
+++ b/keyboards/mnk75/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for MNK75.
diff --git a/keyboards/mnk75/keymaps/via/keymap.c b/keyboards/mnk75/keymaps/via/keymap.c
new file mode 100644
index 0000000000..5ef3086971
--- /dev/null
+++ b/keyboards/mnk75/keymaps/via/keymap.c
@@ -0,0 +1,54 @@
+/* Copyright 2021 Yiancar-Designs
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_all( /* Base */
+    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_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
+    KC_LSFT, KC_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_END,
+    KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, KC_APP,           KC_LEFT, KC_DOWN, KC_RGHT),
+
+[1] = LAYOUT_all(  /* Empty for dynamic keymaps */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
+
+[2] = LAYOUT_all( /* Empty for dynamic keymaps */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
+
+[3] = LAYOUT_all( /* Empty for dynamic keymaps */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/mnk75/keymaps/via/readme.md b/keyboards/mnk75/keymaps/via/readme.md
new file mode 100755
index 0000000000..3cac4633fe
--- /dev/null
+++ b/keyboards/mnk75/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The default keymap for MNK75. VIA support enabled.
diff --git a/keyboards/mnk75/keymaps/via/rules.mk b/keyboards/mnk75/keymaps/via/rules.mk
new file mode 100755
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/mnk75/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/mnk75/mnk75.c b/keyboards/mnk75/mnk75.c
new file mode 100755
index 0000000000..357bb07823
--- /dev/null
+++ b/keyboards/mnk75/mnk75.c
@@ -0,0 +1,16 @@
+/* Copyright 2021 Yiancar-Designs
+ *
+ * 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 "mnk75.h"
diff --git a/keyboards/mnk75/mnk75.h b/keyboards/mnk75/mnk75.h
new file mode 100644
index 0000000000..ad1c1119ae
--- /dev/null
+++ b/keyboards/mnk75/mnk75.h
@@ -0,0 +1,36 @@
+/* Copyright 2021 Yiancar-Designs
+ *
+ * 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 XXX KC_NO
+
+#include "quantum.h"
+
+#define LAYOUT_all( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,           \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3C,      K2E, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,      K3E, \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4D, K4E, \
+    K50, K51, K52,      K54,      K56,      K58,      K5A, K5B,      K5C, K5D, K5E  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
+    { K50, K51, K52, XXX, K54, XXX, K56, XXX, K58, XXX, K5A, K5B, K5C, K5D, K5E }  \
+}
diff --git a/keyboards/mnk75/readme.md b/keyboards/mnk75/readme.md
new file mode 100755
index 0000000000..631ca246e7
--- /dev/null
+++ b/keyboards/mnk75/readme.md
@@ -0,0 +1,32 @@
+# MNK75
+
+This is a 75% layout PCB. It supports VIA.
+
+* Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
+* Hardware Supported: A 75% keyboard with STM32F072CB
+* Hardware Availability: https://monokei.co/ 
+
+## Instructions
+
+### Build
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mnk75:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+### Reset
+
+- Unplug
+- Hold Escape
+- Plug In
+- Unplug
+- Release Escape
+
+### Flash
+
+- Unplug
+- Hold Escape
+- Plug In
+- Flash using QMK Toolbox or CLI (`make mnk75:<keymap>:flash`)
diff --git a/keyboards/mnk75/rules.mk b/keyboards/mnk75/rules.mk
new file mode 100755
index 0000000000..16600f5b66
--- /dev/null
+++ b/keyboards/mnk75/rules.mk
@@ -0,0 +1,26 @@
+# MCU name
+MCU = STM32F072
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
+
+# Do not put the microcontroller into power saving mode
+# when we get USB suspend event. We want it to keep updating
+# backlight effects.
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/mode/m75h/info.json b/keyboards/mode/m75h/info.json
new file mode 100644
index 0000000000..91584e8863
--- /dev/null
+++ b/keyboards/mode/m75h/info.json
@@ -0,0 +1,97 @@
+{
+    "keyboard_name": "Mode 75H",
+    "url": "",
+    "maintainer": "Gondolindrim",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.5, "y":0},
+                {"label":"F2", "x":2.5, "y":0},
+                {"label":"F3", "x":3.5, "y":0},
+                {"label":"F4", "x":4.5, "y":0},
+                {"label":"F5", "x":6, "y":0},
+                {"label":"F6", "x":7, "y":0},
+                {"label":"F7", "x":8, "y":0},
+                {"label":"F8", "x":9, "y":0},
+                {"label":"F9", "x":10.5, "y":0},
+                {"label":"F10", "x":11.5, "y":0},
+                {"label":"F11", "x":12.5, "y":0},
+                {"label":"F12", "x":13.5, "y":0},
+                {"label":"Delete", "x":15, "y":0},
+
+                {"label":"`~", "x":0, "y":1.5},
+                {"label":"1!", "x":1, "y":1.5},
+                {"label":"2@", "x":2, "y":1.5},
+                {"label":"3#", "x":3, "y":1.5},
+                {"label":"4$", "x":4, "y":1.5},
+                {"label":"5%", "x":5, "y":1.5},
+                {"label":"6^", "x":6, "y":1.5},
+                {"label":"7&", "x":7, "y":1.5},
+                {"label":"8*", "x":8, "y":1.5},
+                {"label":"9(", "x":9, "y":1.5},
+                {"label":"0)", "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":"Home", "x":15, "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":"Page Up", "x":15, "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":"Page Down", "x":15, "y":3.5},
+
+                {"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":1.75},
+                {"label":"\u2191", "x":14, "y":4.5},
+                {"label":"End", "x":15, "y":4.5},
+
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
+                {"label":"Space", "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":"\u2190", "x":13, "y":5.5},
+                {"label":"\u2193", "x":14, "y":5.5},
+                {"label":"\u2192", "x":15, "y":5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mode/m75h/keymaps/default/keymap.c b/keyboards/mode/m75h/keymaps/default/keymap.c
index 1c90f89fb7..1ad0eaba9d 100755
--- a/keyboards/mode/m75h/keymaps/default/keymap.c
+++ b/keyboards/mode/m75h/keymaps/default/keymap.c
@@ -19,35 +19,35 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT_all(
-        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_DEL , 
+        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_DEL ,
         KC_TILD , 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_HOME,
         KC_TAB  , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y,   KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
         KC_CAPS , KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H,   KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_ENT ,                   KC_PGDN,
         KC_LSFT ,          KC_Z   , KC_X   , KC_C   , KC_V   , KC_B,   KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          KC_UP  , KC_END ,
-        KC_LCTL , KC_LGUI, KC_LALT,                            KC_SPC,                            KC_RALT, MO(1)  ,          KC_LEFT, KC_DOWN, KC_RGHT 
-	),
+        KC_LCTL , KC_LGUI, KC_LALT,                            KC_SPC,                            KC_RALT, MO(1)  ,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
     [1] = LAYOUT_all(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_MUTE,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          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_VOLD, 
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_MPLY, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_VOLD,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_MPLY,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
-        ),
+    ),
     [2] = LAYOUT_all(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, 
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
-        ),
+    ),
     [3] = LAYOUT_all(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, 
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
-        )
+    )
 };
diff --git a/keyboards/mode/m75h/keymaps/via/keymap.c b/keyboards/mode/m75h/keymaps/via/keymap.c
index 1c90f89fb7..1ad0eaba9d 100755
--- a/keyboards/mode/m75h/keymaps/via/keymap.c
+++ b/keyboards/mode/m75h/keymaps/via/keymap.c
@@ -19,35 +19,35 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT_all(
-        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_DEL , 
+        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_DEL ,
         KC_TILD , 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_HOME,
         KC_TAB  , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y,   KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
         KC_CAPS , KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H,   KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_ENT ,                   KC_PGDN,
         KC_LSFT ,          KC_Z   , KC_X   , KC_C   , KC_V   , KC_B,   KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          KC_UP  , KC_END ,
-        KC_LCTL , KC_LGUI, KC_LALT,                            KC_SPC,                            KC_RALT, MO(1)  ,          KC_LEFT, KC_DOWN, KC_RGHT 
-	),
+        KC_LCTL , KC_LGUI, KC_LALT,                            KC_SPC,                            KC_RALT, MO(1)  ,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
     [1] = LAYOUT_all(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_MUTE,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          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_VOLD, 
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_MPLY, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_VOLD,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_MPLY,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
-        ),
+    ),
     [2] = LAYOUT_all(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, 
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
-        ),
+    ),
     [3] = LAYOUT_all(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, 
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
-        )
+    )
 };
diff --git a/keyboards/mode/m75h/m75h.h b/keyboards/mode/m75h/m75h.h
index a7c48853d8..da01f25818 100644
--- a/keyboards/mode/m75h/m75h.h
+++ b/keyboards/mode/m75h/m75h.h
@@ -21,19 +21,39 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define ___ KC_NO
 
+/*
+ * ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┐
+ * │00 │ │01 │02 │03 │04 │ │06 │07 │08 │09 │ │0A │0B │0C │0D │ │0F │
+ * └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     │1F │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2E   │2F │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3E      │3F │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C    │4E │4F │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ * │50  │51  │52  │66                      │6A  │6B  │ │6D │6E │6F │
+ * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+ * ┌─────┬───┬─────┬───────────────────────────┬─────┐
+ * │50   │51 │52   │66                         │6B   │ Tsangan
+ * └─────┴───┴─────┴───────────────────────────┴─────┘
+ */
+
 #define LAYOUT_all( \
-	K00, K01, K02, K03, K04,      K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
-	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,           K3E, K3F, \
-	K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K5C,      K4E, K4F, \
-	K50, K51, K52,                K66,                K6A, K6B,      K6D, K6E, K6F  \
+    K00, K01, K02, K03, K04,      K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,           K3E, K3F, \
+    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E, K4F, \
+    K50, K51, K52,                K66,                K6A, K6B,      K6D, K6E, K6F  \
 ) { \
-	{ K00, K01, K02, K03, K04, ___, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, K0F }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___, K1F }, \
-	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E, K2F }, \
-	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, ___, K3E, K3F }, \
-	{ K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K5C, ___, K4E, K4F }, \
-	{ K50, K51, K52, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
-        { ___, ___, ___, ___, ___, ___, K66, ___, ___, ___, K6A, K6B, ___, K6D, K6E, K6F }  \
+    { K00, K01, K02, K03, K04, ___, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, K0F }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___, K1F }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E, K2F }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, ___, K3E, K3F }, \
+    { K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, K4E, K4F }, \
+    { K50, K51, K52, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K66, ___, ___, ___, K6A, K6B, ___, K6D, K6E, K6F }  \
 }
diff --git a/keyboards/mokey/xox70hot/info.json b/keyboards/mokey/xox70hot/info.json
index 08bcc556c2..a1fc86924f 100644
--- a/keyboards/mokey/xox70hot/info.json
+++ b/keyboards/mokey/xox70hot/info.json
@@ -1,9 +1,12 @@
 {
     "keyboard_name": "xox70hot",
     "url": "",
-    "maintainer": "Mokey",
+    "maintainer": "rhmokey",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_tkl_nofrow_ansi_tsangan"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_tkl_nofrow_ansi_tsangan": {
             "layout": [
                 {"label":"k00", "x":0, "y":0},
                 {"label":"k01", "x":1, "y":0},
@@ -22,7 +25,7 @@
                 {"label":"k0f", "x":15.25, "y":0},
                 {"label":"k0g", "x":16.25, "y":0},
                 {"label":"k0h", "x":17.25, "y":0},
-                
+
                 {"label":"k10", "x":0, "y":1, "w":1.5},
                 {"label":"k12", "x":1.5, "y":1},
                 {"label":"k13", "x":2.5, "y":1},
@@ -40,7 +43,7 @@
                 {"label":"k1f", "x":15.25, "y":1},
                 {"label":"k1g", "x":16.25, "y":1},
                 {"label":"k1h", "x":17.25, "y":1},
-                
+
                 {"label":"k20", "x":0, "y":2, "w":1.75},
                 {"label":"k22", "x":1.75, "y":2},
                 {"label":"k23", "x":2.75, "y":2},
@@ -54,7 +57,7 @@
                 {"label":"k2b", "x":10.75, "y":2},
                 {"label":"k2c", "x":11.75, "y":2},
                 {"label":"k2d", "x":12.75, "y":2, "w":2.25},
-                
+
                 {"label":"k30", "x":0, "y":3, "w":2.25},
                 {"label":"k32", "x":2.25, "y":3},
                 {"label":"k33", "x":3.25, "y":3},
@@ -82,4 +85,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/mokey/xox70hot/keymaps/default/keymap.c b/keyboards/mokey/xox70hot/keymaps/default/keymap.c
index 574639fee9..e7955ce89b 100644
--- a/keyboards/mokey/xox70hot/keymaps/default/keymap.c
+++ b/keyboards/mokey/xox70hot/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    LAYOUT(
+    LAYOUT_tkl_nofrow_ansi_tsangan(
         KC_GESC, 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_INSERT, 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_DELETE, KC_END,  KC_PGDOWN,
         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,
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_GRV,  KC_RCTL,                     KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    LAYOUT(
+    LAYOUT_tkl_nofrow_ansi_tsangan(
         _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
diff --git a/keyboards/mokey/xox70hot/keymaps/via/keymap.c b/keyboards/mokey/xox70hot/keymaps/via/keymap.c
index 4af0d343a8..53f66e5214 100644
--- a/keyboards/mokey/xox70hot/keymaps/via/keymap.c
+++ b/keyboards/mokey/xox70hot/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    LAYOUT(
+    LAYOUT_tkl_nofrow_ansi_tsangan(
         KC_GESC, 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_INSERT, 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_DELETE, KC_END,  KC_PGDOWN,
         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,
@@ -25,21 +25,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_GRV,  KC_RCTL,                     KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    LAYOUT(
+    LAYOUT_tkl_nofrow_ansi_tsangan(
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
         _______, _______, _______,                   _______,                            _______, _______, _______,                     _______, _______, _______
     ),
-    LAYOUT(
+    LAYOUT_tkl_nofrow_ansi_tsangan(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
         _______, _______, _______,                   _______,                            _______, _______, _______,                     _______, _______, _______
     ),
-    LAYOUT(
+    LAYOUT_tkl_nofrow_ansi_tsangan(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
diff --git a/keyboards/mokey/xox70hot/xox70hot.h b/keyboards/mokey/xox70hot/xox70hot.h
index e4ed4bff5c..5e6f9665c8 100644
--- a/keyboards/mokey/xox70hot/xox70hot.h
+++ b/keyboards/mokey/xox70hot/xox70hot.h
@@ -20,7 +20,7 @@
 
 #define xxx KC_NO
 
-#define LAYOUT(\
+#define LAYOUT_tkl_nofrow_ansi_tsangan(\
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, k0f, k0g, k0h, \
     k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, \
     k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
diff --git a/keyboards/molecule/rules.mk b/keyboards/molecule/rules.mk
index c4e48dfa15..8573995efb 100755
--- a/keyboards/molecule/rules.mk
+++ b/keyboards/molecule/rules.mk
@@ -19,5 +19,6 @@ AUDIO_ENABLE = no           # Audio output
 
 # Add trackball support
 POINTING_DEVICE_ENABLE = yes
+POINTING_DEVICE_DRIVER = custom
 SRC += adns.c
 QUANTUM_LIB_SRC += spi_master.c
diff --git a/keyboards/moon/matrix.c b/keyboards/moon/matrix.c
index 24b4d49560..0615b60ad3 100644
--- a/keyboards/moon/matrix.c
+++ b/keyboards/moon/matrix.c
@@ -158,10 +158,12 @@ static void select_row(uint8_t row) {
 }
 
 static uint16_t read_cols(void) {
-  uint16_t state_1 = pca9555_readPins(IC2, PCA9555_PORT0);
-  uint16_t state_2 = pca9555_readPins(IC2, PCA9555_PORT1);
+  uint8_t state_1 = 0;
+  uint8_t state_2 = 0;
+  pca9555_readPins(IC2, PCA9555_PORT0, &state_1);
+  pca9555_readPins(IC2, PCA9555_PORT1, &state_2);
 
-  uint16_t state = ((state_1 & PORT0_COLS_MASK) << 3) | ((state_2 & PORT1_COLS_MASK));
+  uint16_t state = (((uint16_t)state_1 & PORT0_COLS_MASK) << 3) | (((uint16_t)state_2 & PORT1_COLS_MASK));
 
   // A low pin indicates an active column
   return (~state) & COLS_MASK;
diff --git a/keyboards/moonlander/matrix.c b/keyboards/moonlander/matrix.c
index 782f131a50..b6bac9515e 100644
--- a/keyboards/moonlander/matrix.c
+++ b/keyboards/moonlander/matrix.c
@@ -102,9 +102,9 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
             print("trying to reset mcp23018\n");
             mcp23018_init();
             if (!mcp23018_initd) {
-                print("left side not responding\n");
+                print("right side not responding\n");
             } else {
-                print("left side attached\n");
+                print("right side attached\n");
 #ifdef RGB_MATRIX_ENABLE
                 rgb_matrix_init();
 #endif
diff --git a/keyboards/moonlander/readme.md b/keyboards/moonlander/readme.md
index 0ad2e4775c..bf80f05569 100644
--- a/keyboards/moonlander/readme.md
+++ b/keyboards/moonlander/readme.md
@@ -31,7 +31,7 @@ By default, the Indicator LEDs are used to indicate the layer state for the keyb
 
 ### Oryx Configuration
 
-To enable the features from Oryx (ZSA's Configurator), either compile the the `default` keymap, or add `#define ORYX_CONFIGURATOR` to your `config.h` file.  
+To enable the features from Oryx (ZSA's Configurator), either compile the `default` keymap, or add `#define ORYX_CONFIGURATOR` to your `config.h` file.
 
 This enables the front Indicator LEDs, and the `TOGGLE_LAYER_COLOR` keycode.  The `TOGGLE_LAYER_COLOR` keycode toggles the customized LED map configured on Oryx. 
 
diff --git a/keyboards/mtbkeys/mtb60/hotswap/hotswap.h b/keyboards/mtbkeys/mtb60/hotswap/hotswap.h
index 7dae44b5da..e1e607e4c9 100644
--- a/keyboards/mtbkeys/mtb60/hotswap/hotswap.h
+++ b/keyboards/mtbkeys/mtb60/hotswap/hotswap.h
@@ -18,16 +18,32 @@
 
 #include "quantum.h"
 
-#define LAYOUT( \
-    k00, k10, k20, k30, k40, k50, k60, k70, k80, k90, ka0, kb0, kc0,      ke0, \
-         k11, k21, k31, k41, k51, k61, k71, k81, k91, ka1, kb1, kc1, kd1, ke1, \
-    k02,      k22, k32, k42, k52, k62, k72, k82, k92, ka2, kb2, kc2, kd2,      \
-    k03,      k23, k33, k43, k53, k63, k73, k83, k93, ka3, kb3,      kd3,      \
-    k04, k14, k24,                k64,                ka4, kb4,      kd4, ke4  \
+#define ___ KC_NO
+
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │11   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d        │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+ * │40  │41  │42  │46                      │4a  │4b  │4d  │4e  │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ */
+
+#define LAYOUT_60_ansi( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, \
+         k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d,      \
+    k40, k41, k42,                k46,                k4a, k4b,      k4d, k4e  \
 ) { \
-    { k00,   k10,   k20, k30,   k40,   k50,   k60, k70,   k80,   k90,   ka0, kb0, kc0,   KC_NO, ke0   }, \
-    { KC_NO, k11,   k21, k31,   k41,   k51,   k61, k71,   k81,   k91,   ka1, kb1, kc1,   kd1,   ke1   }, \
-    { k02,   KC_NO, k22, k32,   k42,   k52,   k62, k72,   k82,   k92,   ka2, kb2, kc2,   kd2,   KC_NO }, \
-    { k03,   KC_NO, k23, k33,   k43,   k53,   k63, k73,   k83,   k93,   ka3, kb3, KC_NO, kd3,   KC_NO }, \
-    { k04,   k14,   k24, KC_NO, KC_NO, KC_NO, k64, KC_NO, KC_NO, KC_NO, ka4, kb4, kd4,   KC_NO, ke4   }  \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, ___, k0e }, \
+    { ___, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \
+    { k20, ___, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, ___ }, \
+    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, ___, k3d, ___ }, \
+    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4a, k4b, k4d, ___, k4e }  \
 }
diff --git a/keyboards/mtbkeys/mtb60/hotswap/info.json b/keyboards/mtbkeys/mtb60/hotswap/info.json
index 5718d70507..9e4ae0be29 100644
--- a/keyboards/mtbkeys/mtb60/hotswap/info.json
+++ b/keyboards/mtbkeys/mtb60/hotswap/info.json
@@ -1,71 +1,78 @@
 {
     "keyboard_name": "MTB60",
     "url": "mtbkeys.com",
-    "maintainer": "MTBKeys",
+    "maintainer": "kgieselman",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_60_ansi"
+    },
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT_60_ansi": {
             "layout": [
-                {"label": "Esc"       , "x":  0, "y": 0        },
-                {"label": "!"         , "x":  1, "y": 0        },
-                {"label": "@"         , "x":  2, "y": 0        },
-                {"label": "#"         , "x":  3, "y": 0        },
-                {"label": "$"         , "x":  4, "y": 0        },
-                {"label": "%"         , "x":  5, "y": 0        },
-                {"label": "^"         , "x":  6, "y": 0        },
-                {"label": "&"         , "x":  7, "y": 0        },
-                {"label": "*"         , "x":  8, "y": 0        },
-                {"label": "("         , "x":  9, "y": 0        },
-                {"label": ")"         , "x": 10, "y": 0        },
-                {"label": "_"         , "x": 11, "y": 0        },
-                {"label": "+"         , "x": 12, "y": 0        },
-                {"label": "Back Space", "x": 13, "y": 0, "w": 2},
-                {"label": "Tab", "x":  0  , "y": 1, "w": 1.5},
-                {"label": "Q"  , "x":  1.5, "y": 1          },
-                {"label": "W"  , "x":  2.5, "y": 1          },
-                {"label": "E"  , "x":  3.5, "y": 1          },
-                {"label": "R"  , "x":  4.5, "y": 1          },
-                {"label": "T"  , "x":  5.5, "y": 1          },
-                {"label": "Y"  , "x":  6.5, "y": 1          },
-                {"label": "U"  , "x":  7.5, "y": 1          },
-                {"label": "I"  , "x":  8.5, "y": 1          },
-                {"label": "O"  , "x":  9.5, "y": 1          },
-                {"label": "P"  , "x": 10.5, "y": 1          },
-                {"label": "{"  , "x": 11.5, "y": 1          },
-                {"label": "}"  , "x": 12.5, "y": 1          },
-                {"label": "|"  , "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Caps Lock", "x":  0   , "y": 2, "w": 1.75},
-                {"label": "A"        , "x":  1.75, "y": 2           },
-                {"label": "S"        , "x":  2.75, "y": 2           },
-                {"label": "D"        , "x":  3.75, "y": 2           },
-                {"label": "F"        , "x":  4.75, "y": 2           },
-                {"label": "G"        , "x":  5.75, "y": 2           },
-                {"label": "H"        , "x":  6.75, "y": 2           },
-                {"label": "J"        , "x":  7.75, "y": 2           },
-                {"label": "K"        , "x":  8.75, "y": 2           },
-                {"label": "L"        , "x":  9.75, "y": 2           },
-                {"label": ":"        , "x": 10.75, "y": 2           },
-                {"label": "\""       , "x": 11.75, "y": 2           },
-                {"label": "Enter"    , "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Left Shift" , "x":  0   , "y": 3, "w": 2.25},
-                {"label": "Z"          , "x":  2.25, "y": 3           },
-                {"label": "X"          , "x":  3.25, "y": 3           },
-                {"label": "C"          , "x":  4.25, "y": 3           },
-                {"label": "V"          , "x":  5.25, "y": 3           },
-                {"label": "B"          , "x":  6.25, "y": 3           },
-                {"label": "N"          , "x":  7.25, "y": 3           },
-                {"label": "M"          , "x":  8.25, "y": 3           },
-                {"label": "<"          , "x":  9.25, "y": 3           },
-                {"label": ">"          , "x": 10.25, "y": 3           },
-                {"label": "?"          , "x": 11.25, "y": 3           },
-                {"label": "Right Shift", "x": 12.25, "y": 3, "w": 2.75},
-                {"label": "Left Ctrl" , "x":  0   , "y": 4, "w": 1.25},
-                {"label": "GUI"       , "x":  1.25, "y": 4, "w": 1.25},
-                {"label": "Left Alt"  , "x":  2.5 , "y": 4, "w": 1.25},
-                {"label": "Space"     , "x":  3.75, "y": 4, "w": 6.25},
-                {"label": "Right Ctrl", "x": 10   , "y": 4, "w": 1.25},
-                {"label": "GUI"       , "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "MO(1)"     , "x": 12.5 , "y": 4, "w": 1.25},
-                {"label": "Right Ctrl", "x": 13.75, "y": 4, "w": 1.25}
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Back Space", "x":13, "y":0, "w":2},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Left Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Right Shift", "x":12.25, "y":3, "w":2.75},
+
+                {"label":"Left Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+                {"label":"Left Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Right Ctrl", "x":10, "y":4, "w":1.25},
+                {"label":"GUI", "x":11.25, "y":4, "w":1.25},
+                {"label":"MO(1)", "x":12.5, "y":4, "w":1.25},
+                {"label":"Right Ctrl", "x":13.75, "y":4, "w":1.25}
             ]
         }
     }
diff --git a/keyboards/mtbkeys/mtb60/hotswap/keymaps/default/keymap.c b/keyboards/mtbkeys/mtb60/hotswap/keymaps/default/keymap.c
index 648c8201f5..58dcf77414 100644
--- a/keyboards/mtbkeys/mtb60/hotswap/keymaps/default/keymap.c
+++ b/keyboards/mtbkeys/mtb60/hotswap/keymaps/default/keymap.c
@@ -22,14 +22,14 @@ enum layer_names {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT(
+    [_BASE] = LAYOUT_60_ansi(
         KC_ESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         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_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI, MO(_FN), KC_RCTL
     ),
-    [_FN] = LAYOUT(
+    [_FN] = LAYOUT_60_ansi(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,   KC_DEL,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,  KC_RIGHT, _______, _______,          _______,
diff --git a/keyboards/mtbkeys/mtb60/hotswap/rules.mk b/keyboards/mtbkeys/mtb60/hotswap/rules.mk
index 3ff392a61f..0d092c2ef8 100644
--- a/keyboards/mtbkeys/mtb60/hotswap/rules.mk
+++ b/keyboards/mtbkeys/mtb60/hotswap/rules.mk
@@ -16,3 +16,5 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = 60_ansi
diff --git a/keyboards/mtbkeys/mtb60/solder/info.json b/keyboards/mtbkeys/mtb60/solder/info.json
index e60d3eee2f..c2e49e8f77 100644
--- a/keyboards/mtbkeys/mtb60/solder/info.json
+++ b/keyboards/mtbkeys/mtb60/solder/info.json
@@ -2,73 +2,84 @@
     "keyboard_name": "MTB60",
     "url": "mtbkeys.com",
     "maintainer": "MTBKeys",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label": "Esc"       , "x":  0, "y": 0},
-                {"label": "!"         , "x":  1, "y": 0},
-                {"label": "@"         , "x":  2, "y": 0},
-                {"label": "#"         , "x":  3, "y": 0},
-                {"label": "$"         , "x":  4, "y": 0},
-                {"label": "%"         , "x":  5, "y": 0},
-                {"label": "^"         , "x":  6, "y": 0},
-                {"label": "&"         , "x":  7, "y": 0},
-                {"label": "*"         , "x":  8, "y": 0},
-                {"label": "("         , "x":  9, "y": 0},
-                {"label": ")"         , "x": 10, "y": 0},
-                {"label": "_"         , "x": 11, "y": 0},
-                {"label": "+"         , "x": 12, "y": 0},
-                {"label": "Back Space", "x": 13, "y": 0},
-                {"label": "Delete"    , "x": 14, "y": 0},
-                {"label": "Tab", "x":  0  , "y": 1, "w": 1.5},
-                {"label": "Q"  , "x":  1.5, "y": 1          },
-                {"label": "W"  , "x":  2.5, "y": 1          },
-                {"label": "E"  , "x":  3.5, "y": 1          },
-                {"label": "R"  , "x":  4.5, "y": 1          },
-                {"label": "T"  , "x":  5.5, "y": 1          },
-                {"label": "Y"  , "x":  6.5, "y": 1          },
-                {"label": "U"  , "x":  7.5, "y": 1          },
-                {"label": "I"  , "x":  8.5, "y": 1          },
-                {"label": "O"  , "x":  9.5, "y": 1          },
-                {"label": "P"  , "x": 10.5, "y": 1          },
-                {"label": "{"  , "x": 11.5, "y": 1          },
-                {"label": "}"  , "x": 12.5, "y": 1          },
-                {"label": "|"  , "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Caps Lock", "x":  0   , "y": 2, "w": 1.75},
-                {"label": "A"        , "x":  1.75, "y": 2           },
-                {"label": "S"        , "x":  2.75, "y": 2           },
-                {"label": "D"        , "x":  3.75, "y": 2           },
-                {"label": "F"        , "x":  4.75, "y": 2           },
-                {"label": "G"        , "x":  5.75, "y": 2           },
-                {"label": "H"        , "x":  6.75, "y": 2           },
-                {"label": "J"        , "x":  7.75, "y": 2           },
-                {"label": "K"        , "x":  8.75, "y": 2           },
-                {"label": "L"        , "x":  9.75, "y": 2           },
-                {"label": ":"        , "x": 10.75, "y": 2           },
-                {"label": "\""       , "x": 11.75, "y": 2           },
-                {"label": "Enter"    , "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Left Shift" , "x":  0   , "y": 3, "w": 2.25},
-                {"label": "Z"          , "x":  2.25, "y": 3           },
-                {"label": "X"          , "x":  3.25, "y": 3           },
-                {"label": "C"          , "x":  4.25, "y": 3           },
-                {"label": "V"          , "x":  5.25, "y": 3           },
-                {"label": "B"          , "x":  6.25, "y": 3           },
-                {"label": "N"          , "x":  7.25, "y": 3           },
-                {"label": "M"          , "x":  8.25, "y": 3           },
-                {"label": "<"          , "x":  9.25, "y": 3           },
-                {"label": ">"          , "x": 10.25, "y": 3           },
-                {"label": "?"          , "x": 11.25, "y": 3           },
-                {"label": "Right Shift", "x": 12.25, "y": 3, "w": 2.75},
-                {"label": "Left Ctrl" , "x":  0   , "y": 4, "w": 1.25},
-                {"label": "GUI"       , "x":  1.25, "y": 4, "w": 1.25},
-                {"label": "Left Alt"  , "x":  2.5 , "y": 4, "w": 1.25},
-                {"label": "Space"     , "x":  3.75, "y": 4, "w": 2.25},
-                {"label": "Space"     , "x":  6   , "y": 4, "w": 1.25},
-                {"label": "Space"     , "x":  7.25, "y": 4, "w": 2.75},
-                {"label": "Right Ctrl", "x": 10   , "y": 4, "w": 1.25},
-                {"label": "GUI"       , "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "MO(1)"     , "x": 12.5 , "y": 4, "w": 1.25},
-                {"label": "Right Ctrl", "x": 13.75, "y": 4, "w": 1.25}
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Back Space", "x":13, "y":0},
+                {"label":"Delete", "x":14, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Left Shift", "x":0, "y":3},
+                {"label":"\\|", "x":1, "y":3},
+                {"label":"Z", "x":2, "y":3},
+                {"label":"X", "x":3, "y":3},
+                {"label":"C", "x":4, "y":3},
+                {"label":"V", "x":5, "y":3},
+                {"label":"B", "x":6, "y":3},
+                {"label":"N", "x":7, "y":3},
+                {"label":"M", "x":8, "y":3},
+                {"label":",<", "x":9, "y":3},
+                {"label":".>", "x":10, "y":3},
+                {"label":"/?", "x":11, "y":3},
+                {"label":"Right Shift", "x":12, "y":3},
+                {"label":"\u2191", "x":13, "y":3},
+                {"label":"End", "x":14, "y":3},
+
+                {"label":"Left Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+                {"label":"Left Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":2.25},
+                {"label":"Space", "x":6, "y":4, "w":1.25},
+                {"label":"Space", "x":7.25, "y":4, "w":2.75},
+                {"label":"Right Alt", "x":10, "y":4},
+                {"label":"GUI", "x":11, "y":4},
+                {"label":"\u2190", "x":12, "y":4},
+                {"label":"\u2193", "x":13, "y":4},
+                {"label":"\u2192", "x":14, "y":4}
             ]
         }
     }
diff --git a/keyboards/mtbkeys/mtb60/solder/keymaps/default/keymap.c b/keyboards/mtbkeys/mtb60/solder/keymaps/default/keymap.c
index 6ed34b6432..a6ce02443a 100644
--- a/keyboards/mtbkeys/mtb60/solder/keymaps/default/keymap.c
+++ b/keyboards/mtbkeys/mtb60/solder/keymaps/default/keymap.c
@@ -23,14 +23,14 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    [_BASE] = LAYOUT(
+    [_BASE] = LAYOUT_all(
         KC_ESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT, KC_RSFT,
         KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                    KC_RALT, KC_RGUI, MO(_FN), KC_RGUI, KC_RCTL
     ),
-    [_FN] = LAYOUT(
+    [_FN] = LAYOUT_all(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, _______, _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,  KC_RIGHT, _______, _______,          _______,
diff --git a/keyboards/mtbkeys/mtb60/solder/solder.h b/keyboards/mtbkeys/mtb60/solder/solder.h
index 31756e7af7..6beed5154e 100644
--- a/keyboards/mtbkeys/mtb60/solder/solder.h
+++ b/keyboards/mtbkeys/mtb60/solder/solder.h
@@ -18,16 +18,32 @@
 
 #include "quantum.h"
 
-#define LAYOUT( \
-    k00, k10, k20, k30, k40, k50, k60, k70, k80, k90, ka0, kb0, kc0, kd0, ke0, \
-         k11, k21, k31, k41, k51, k61, k71, k81, k91, ka1, kb1, kc1, kd1, ke1, \
-    k02,      k22, k32, k42, k52, k62, k72, k82, k92, ka2, kb2, kc2, kd2,      \
-    k03, k13, k23, k33, k43, k53, k63, k73, k83, k93, ka3, kb3, kc3, kd3, ke3, \
-    k04, k14,      k34, k44,      k64,      k84,      ka4, kb4, kc4, kd4, ke4  \
+#define ___ KC_NO
+
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │11   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │
+ * ├───┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┬───┤
+ * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │3d │3e │
+ * ├───┴┬──┴─┬─┴──┬┴───┴───┼───┴┬──┴───┴───┼───┼───┼───┼───┼───┤
+ * │40  │41  │42  │44      │46  │48        │4a │4b │4c │4d │4e │
+ * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┘
+ */
+
+#define LAYOUT_all( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
+         k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
+    k40, k41,      k43, k44,      k46,      k48,      k4a, k4b, k4c, k4d, k4e  \
 ) { \
-    { k00,   k10,   k20,   k30, k40, k50,   k60, k70,   k80, k90,   ka0, kb0, kc0, kd0, ke0   }, \
-    { KC_NO, k11,   k21,   k31, k41, k51,   k61, k71,   k81, k91,   ka1, kb1, kc1, kd1, ke1   }, \
-    { k02,   KC_NO, k22,   k32, k42, k52,   k62, k72,   k82, k92,   ka2, kb2, kc2, kd2, KC_NO }, \
-    { k03,   k13,   k23,   k33, k43, k53,   k63, k73,   k83, k93,   ka3, kb3, kc3, kd3, ke3   }, \
-    { k04,   k14,   KC_NO, k34, k44, KC_NO, k64, KC_NO, k84, KC_NO, ka4, kb4, kc4, kd4, ke4   }  \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
+    { ___, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \
+    { k20, ___, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, ___ }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
+    { k40, k41, ___, k43, k44, ___, k46, ___, k48, ___, k4a, k4b, k4c, k4d, k4e }  \
 }
diff --git a/keyboards/noxary/valhalla/info.json b/keyboards/noxary/valhalla/info.json
new file mode 100644
index 0000000000..01d31bce6b
--- /dev/null
+++ b/keyboards/noxary/valhalla/info.json
@@ -0,0 +1,88 @@
+{
+    "keyboard_name": "Valhalla",
+    "url": "",
+    "maintainer": "Gondolindrim",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"`~", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":9, "y":0},
+                {"label":"8*", "x":10, "y":0},
+                {"label":"9(", "x":11, "y":0},
+                {"label":"0)", "x":12, "y":0},
+                {"label":"-_", "x":13, "y":0},
+                {"label":"=+", "x":14, "y":0},
+                {"label":"Backspace", "x":15, "y":0},
+                {"label":"Backspace", "x":16, "y":0},
+                {"label":"Delete", "x":17, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":8.5, "y":1},
+                {"label":"U", "x":9.5, "y":1},
+                {"label":"I", "x":10.5, "y":1},
+                {"label":"O", "x":11.5, "y":1},
+                {"label":"P", "x":12.5, "y":1},
+                {"label":"[{", "x":13.5, "y":1},
+                {"label":"]}", "x":14.5, "y":1},
+                {"label":"\\|", "x":15.5, "y":1, "w":1.5},
+                {"label":"Page Up", "x":17, "y":1},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":8.75, "y":2},
+                {"label":"J", "x":9.75, "y":2},
+                {"label":"K", "x":10.75, "y":2},
+                {"label":"L", "x":11.75, "y":2},
+                {"label":";:", "x":12.75, "y":2},
+                {"label":"'\"", "x":13.75, "y":2},
+                {"label":"Enter", "x":14.75, "y":2, "w":2.25},
+                {"label":"Page Down", "x":17, "y":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"B", "x":8.25, "y":3},
+                {"label":"N", "x":9.25, "y":3},
+                {"label":"M", "x":10.25, "y":3},
+                {"label":",<", "x":11.25, "y":3},
+                {"label":".>", "x":12.25, "y":3},
+                {"label":"/?", "x":13.25, "y":3},
+                {"label":"Shift", "x":14.25, "y":3, "w":1.75},
+                {"label":"\u2191", "x":16, "y":3},
+                {"label":"Fn", "x":17, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"GUI", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":1.75},
+                {"label":"Space", "x":5.75, "y":4},
+                {"label":"Space", "x":8, "y":4},
+                {"label":"Space", "x":9, "y":4, "w":1.25},
+                {"label":"Alt", "x":10.25, "y":4, "w":1.5},
+                {"label":"GUI", "x":11.75, "y":4},
+                {"label":"Ctrl", "x":12.75, "y":4, "w":1.5},
+                {"label":"\u2190", "x":15, "y":4},
+                {"label":"\u2193", "x":16, "y":4},
+                {"label":"\u2192", "x":17, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/noxary/valhalla/keymaps/default/keymap.c b/keyboards/noxary/valhalla/keymaps/default/keymap.c
index 95c9120066..fb9aab0968 100755
--- a/keyboards/noxary/valhalla/keymaps/default/keymap.c
+++ b/keyboards/noxary/valhalla/keymaps/default/keymap.c
@@ -17,32 +17,32 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-   [0] = LAYOUT_all(
-        KC_GESC, 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_BSPC,
+    [0] = LAYOUT_all(
+        KC_GESC, 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_BSPC, KC_DEL ,
         KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
-        KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_ENT , KC_PGDN, KC_DEL ,
+        KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,          KC_ENT , KC_PGDN,
         KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP,   MO(1)  ,
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_SPC , KC_SPC , KC_SPC , KC_RALT, KC_RGUI, KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT
-),
-   [1] = LAYOUT_all(
-	RESET  , 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_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
-),
+    ),
+    [1] = LAYOUT_all(
+        RESET  , 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_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+    ),
     [2] = LAYOUT_all(
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
-),
-   [3] = LAYOUT_all(
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
-)
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+    )
 };
diff --git a/keyboards/noxary/valhalla/keymaps/via/keymap.c b/keyboards/noxary/valhalla/keymaps/via/keymap.c
index 95c9120066..fb9aab0968 100755
--- a/keyboards/noxary/valhalla/keymaps/via/keymap.c
+++ b/keyboards/noxary/valhalla/keymaps/via/keymap.c
@@ -17,32 +17,32 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-   [0] = LAYOUT_all(
-        KC_GESC, 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_BSPC,
+    [0] = LAYOUT_all(
+        KC_GESC, 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_BSPC, KC_DEL ,
         KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
-        KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_ENT , KC_PGDN, KC_DEL ,
+        KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,          KC_ENT , KC_PGDN,
         KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP,   MO(1)  ,
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_SPC , KC_SPC , KC_SPC , KC_RALT, KC_RGUI, KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT
-),
-   [1] = LAYOUT_all(
-	RESET  , 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_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
-),
+    ),
+    [1] = LAYOUT_all(
+        RESET  , 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_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+    ),
     [2] = LAYOUT_all(
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
-),
-   [3] = LAYOUT_all(
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
-)
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+    )
 };
diff --git a/keyboards/noxary/valhalla/valhalla.h b/keyboards/noxary/valhalla/valhalla.h
index 5369d9d355..cd6f8e36d0 100644
--- a/keyboards/noxary/valhalla/valhalla.h
+++ b/keyboards/noxary/valhalla/valhalla.h
@@ -22,9 +22,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ___ KC_NO
 
 #define LAYOUT_all( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K2E, \
 	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
+	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, K2D, \
 	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
 	K40, K41, K42, K43, K44, K45, K46, K47, K48, K49,           K4C, K4D, K4E  \
 ) { \
diff --git a/keyboards/pistachio/rules.mk b/keyboards/pistachio/rules.mk
deleted file mode 100644
index 93ae534be9..0000000000
--- a/keyboards/pistachio/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = pistachio/rev2
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/ariccb/.vscode/settings.json b/keyboards/planck/keymaps/ariccb/.vscode/settings.json
new file mode 100644
index 0000000000..31e9436a77
--- /dev/null
+++ b/keyboards/planck/keymaps/ariccb/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "files.associations": {
+        "select_word.h": "c"
+    }
+}
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/ariccb/config.h b/keyboards/planck/keymaps/ariccb/config.h
new file mode 100644
index 0000000000..322aa9277f
--- /dev/null
+++ b/keyboards/planck/keymaps/ariccb/config.h
@@ -0,0 +1,56 @@
+/* Copyright 2015-2021 Jack Humbert
+ *
+ * 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
+
+#ifdef AUDIO_ENABLE
+#    define STARTUP_SONG SONG(PLANCK_SOUND)
+// #define STARTUP_SONG SONG(NO_SOUND)
+
+#    define DEFAULT_LAYER_SONGS \
+        { SONG(QWERTY_SOUND), SONG(COLEMAK_SOUND), SONG(DVORAK_SOUND) }
+#endif
+/*
+ * MIDI options
+ */
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+#define MIDI_BASIC
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+#define TAPPING_TERM 150
+#define IGNORE_MOD_TAP_INTERRUPT
+// #define IGNORE_MOD_TAP_INTERRUPT
+// #define HOLD_ON_OTHER_KEY_PRESS
+
+#define COMBO_TERM 20
+
+
+
+#define MOUSEKEY_INTERVAL 16        //Time between cursor movements in milliseconds.
+                                    //If the refresh rate of your display is 60Hz, you could set it to 16 (1/60). As this raises the cursor speed significantly, you may want to lower MOUSEKEY_MAX_SPEED
+#define MOUSEKEY_MAX_SPEED 8        //Maximum cursor speed at which acceleration stops
+#define MOUSEKEY_TIME_TO_MAX 50     //Time until maximum scroll speed is reached
+#define MOUSEKEY_DELAY 100          //Delay between pressing a movement key and cursor movement
+#define MOUSEKEY_MOVE_DELTA 8       //Step size
diff --git a/keyboards/planck/keymaps/ariccb/features/caps_word.c b/keyboards/planck/keymaps/ariccb/features/caps_word.c
new file mode 100644
index 0000000000..c37e65d28a
--- /dev/null
+++ b/keyboards/planck/keymaps/ariccb/features/caps_word.c
@@ -0,0 +1,122 @@
+// Copyright 2021-2022 Google LLC
+//
+// 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
+//
+//     https://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.
+//
+//
+// For full documentation, see
+// https://getreuer.info/posts/keyboards/caps-word
+
+#include "caps_word.h"
+
+static bool caps_word_active = false;
+
+bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
+#ifndef NO_ACTION_ONESHOT
+  const uint8_t mods = get_mods() | get_oneshot_mods();
+#else
+  const uint8_t mods = get_mods();
+#endif  // NO_ACTION_ONESHOT
+
+  if (!caps_word_active) {
+    // Pressing both shift keys at the same time enables caps word.
+    if ((mods & MOD_MASK_SHIFT) == MOD_MASK_SHIFT) {
+      caps_word_set(true);  // Activate Caps Word.
+      return false;
+    }
+    return true;
+  }
+
+  if (!record->event.pressed) { return true; }
+
+  if (!(mods & ~MOD_MASK_SHIFT)) {
+    switch (keycode) {
+      // Ignore MO, TO, TG, TT, and OSL layer switch keys.
+      case QK_MOMENTARY ... QK_MOMENTARY + 255:
+      case QK_TO ... QK_TO + 255:
+      case QK_TOGGLE_LAYER ... QK_TOGGLE_LAYER + 255:
+      case QK_LAYER_TAP_TOGGLE ... QK_LAYER_TAP_TOGGLE + 255:
+      case QK_ONE_SHOT_LAYER ... QK_ONE_SHOT_LAYER + 255:
+        return true;
+
+#ifndef NO_ACTION_TAPPING
+      case QK_MOD_TAP ... QK_MOD_TAP_MAX:
+        if (record->tap.count == 0) {
+          // Deactivate if a mod becomes active through holding a mod-tap key.
+          caps_word_set(false);
+          return true;
+        }
+        keycode &= 0xff;
+        break;
+
+#ifndef NO_ACTION_LAYER
+      case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
+#endif  // NO_ACTION_LAYER
+        if (record->tap.count == 0) { return true; }
+        keycode &= 0xff;
+        break;
+#endif  // NO_ACTION_TAPPING
+
+#ifdef SWAP_HANDS_ENABLE
+      case QK_SWAP_HANDS ... QK_SWAP_HANDS_MAX:
+        if (keycode > 0x56F0 || record->tap.count == 0) { return true; }
+        keycode &= 0xff;
+        break;
+#endif  // SWAP_HANDS_ENABLE
+    }
+
+    if (caps_word_press_user(keycode)) {
+      return true;
+    }
+  }
+
+  caps_word_set(false);  // Deactivate Caps Word.
+  return true;
+}
+
+void caps_word_set(bool active) {
+  if (active != caps_word_active) {
+    if (active) {
+      clear_mods();
+#ifndef NO_ACTION_ONESHOT
+      clear_oneshot_mods();
+#endif  // NO_ACTION_ONESHOT
+    }
+
+    caps_word_active = active;
+    caps_word_set_user(active);
+  }
+}
+
+bool caps_word_get(void) { return caps_word_active; }
+
+__attribute__((weak)) void caps_word_set_user(bool active) {}
+
+__attribute__((weak)) bool caps_word_press_user(uint16_t keycode) {
+  switch (keycode) {
+    // Keycodes that continue Caps Word, with shift applied.
+    case KC_A ... KC_Z:
+      add_weak_mods(MOD_BIT(KC_LSFT));  // Apply shift to the next key.
+      return true;
+
+    // Keycodes that continue Caps Word, without shifting.
+    case KC_1 ... KC_0:
+    case KC_P1 ... KC_P0:
+    case KC_BSPC:
+    case KC_MINS:
+    case KC_UNDS:
+      return true;
+
+    default:
+      return false;  // Deactivate Caps Word.
+  }
+}
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/ariccb/features/caps_word.h b/keyboards/planck/keymaps/ariccb/features/caps_word.h
new file mode 100644
index 0000000000..523c815157
--- /dev/null
+++ b/keyboards/planck/keymaps/ariccb/features/caps_word.h
@@ -0,0 +1,101 @@
+// Copyright 2021-2022 Google LLC
+//
+// 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
+//
+//     https://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.
+//
+//
+// Caps Word, activated by pressing both shift keys at the same time.
+//
+// This library implements "Caps Word", which is like conventional Caps Lock,
+// but automatically disables itself at the end of the word. This is useful for
+// typing all-caps identifiers like `MOD_MASK_ALT`.
+//
+// Caps Word is activated by pressing the left and right shift keys at the same
+// time. This way you don't need a dedicated key for using Caps Word. I've
+// tested that this works as expected with one-shot mods and Space Cadet Shift.
+// If your shift keys are mod-taps, activate Caps Word by holding both shift
+// mod-tap keys until the tapping term, release them, then begin typing.
+//
+// For full documentation, see
+// https://getreuer.info/posts/keyboards/caps-word
+
+#pragma once
+
+#include QMK_KEYBOARD_H
+
+// Call this function from `process_record_user()` to implement Caps Word.
+bool process_caps_word(uint16_t keycode, keyrecord_t* record);
+
+// Activates or deactivates Caps Word. For instance activate Caps Word with a
+// combo by defining a `COMBO_ACTION` that calls `caps_word_set(true)`:
+//
+// void process_combo_event(uint16_t combo_index, bool pressed) {
+//   switch(combo_index) {
+//     case CAPS_COMBO:
+//       if (pressed) {
+//         caps_word_set(true);  // Activate Caps Word.
+//       }
+//       break;
+//
+//     // Other combos...
+//   }
+// }
+void caps_word_set(bool active);
+
+// Returns whether Caps Word is currently active.
+bool caps_word_get(void);
+
+// An optional callback that gets called when Caps Word turns on or off. This is
+// useful to represent the current Caps Word state, e.g. by setting an LED or
+// playing a sound. In your keymap, define
+//
+//   void caps_word_set_user(bool active) {
+//     if (active) {
+//       // Do something when Caps Word activates.
+//     } else {
+//       // Do something when Caps Word deactivates.
+//     }
+//   }
+void caps_word_set_user(bool active);
+
+// An optional callback which is called on every key press while Caps Word is
+// active. When the key should be shifted (that is, a letter key), the callback
+// should call `add_weak_mods(MOD_BIT(KC_LSFT))` to shift the key. The callback
+// also determines whether the key should continue Caps Word. Returning true
+// continues the current "word", while returning false is "word breaking" and
+// deactivates Caps Word. The default callback is
+//
+//   bool caps_word_press_user(uint16_t keycode) {
+//     switch (keycode) {
+//       // Keycodes that continue Caps Word, with shift applied.
+//       case KC_A ... KC_Z:
+//         add_weak_mods(MOD_BIT(KC_LSFT));  // Apply shift to the next key.
+//         return true;
+//
+//       // Keycodes that continue Caps Word, without shifting.
+//       case KC_1 ... KC_0:
+//       case KC_BSPC:
+//       case KC_MINS:
+//       case KC_UNDS:
+//         return true;
+//
+//       default:
+//         return false;  // Deactivate Caps Word.
+//     }
+//   }
+//
+// To customize, copy the above function into your keymap and add/remove
+// keycodes to the above cases.
+//
+// NOTE: Outside of this callback, you can use `caps_word_set(false)` to
+// deactivate Caps Word.
+bool caps_word_press_user(uint16_t keycode);
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/ariccb/features/select_word.c b/keyboards/planck/keymaps/ariccb/features/select_word.c
new file mode 100644
index 0000000000..c0ffe0a90d
--- /dev/null
+++ b/keyboards/planck/keymaps/ariccb/features/select_word.c
@@ -0,0 +1,110 @@
+// Copyright 2021 Google LLC
+//
+// 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
+//
+//     https://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.
+//
+//
+// For full documentation, see
+// https://getreuer.info/posts/keyboards/select-word
+
+#include "select_word.h"
+
+// Mac users, uncomment this line:
+// #define MAC_HOTKEYS
+
+enum { STATE_NONE, STATE_SELECTED, STATE_WORD, STATE_FIRST_LINE, STATE_LINE };
+
+bool process_select_word(uint16_t keycode, keyrecord_t* record,
+                         uint16_t sel_keycode) {
+  static uint8_t state = STATE_NONE;
+
+  if (keycode == KC_LSFT || keycode == KC_RSFT) { return true; }
+
+  if (keycode == sel_keycode && record->event.pressed) {  // On key press.
+    const uint8_t mods = get_mods();
+#ifndef NO_ACTION_ONESHOT
+    const uint8_t all_mods = mods | get_oneshot_mods();
+#else
+    const uint8_t all_mods = mods;
+#endif  // NO_ACTION_ONESHOT
+    if ((all_mods & MOD_MASK_SHIFT) == 0) {  // Select word.
+#ifdef MAC_HOTKEYS
+      register_code(KC_LALT);
+#else
+      register_code(KC_LCTL);
+#endif  // MAC_HOTKEYS
+      if (state == STATE_NONE) {
+        tap_code(KC_RGHT);
+        tap_code(KC_LEFT);
+      }
+      register_code(KC_LSFT);
+      register_code(KC_RGHT);
+      state = STATE_WORD;
+    } else {  // Select line.
+      if (state == STATE_NONE) {
+        clear_mods();
+#ifndef NO_ACTION_ONESHOT
+        clear_oneshot_mods();
+#endif  // NO_ACTION_ONESHOT
+#ifdef MAC_HOTKEYS
+        register_code16(LCTL(KC_A));
+        tap_code16(LSFT(KC_E));
+        unregister_code16(LCTL(KC_A));
+#else
+        tap_code(KC_HOME);
+        tap_code16(LSFT(KC_END));
+#endif  // MAC_HOTKEYS
+        set_mods(mods);
+        state = STATE_FIRST_LINE;
+      } else {
+        register_code(KC_DOWN);
+        state = STATE_LINE;
+      }
+    }
+    return false;
+  }
+
+  // `sel_keycode` was released, or another key was pressed.
+  switch (state) {
+    case STATE_WORD:
+      unregister_code(KC_RGHT);
+      unregister_code(KC_LSFT);
+#ifdef MAC_HOTKEYS
+      unregister_code(KC_LALT);
+#else
+      unregister_code(KC_LCTL);
+#endif  // MAC_HOTKEYS
+      state = STATE_SELECTED;
+      break;
+
+    case STATE_FIRST_LINE:
+      state = STATE_SELECTED;
+      break;
+
+    case STATE_LINE:
+      unregister_code(KC_DOWN);
+      state = STATE_SELECTED;
+      break;
+
+    case STATE_SELECTED:
+      if (keycode == KC_ESC) {
+        tap_code(KC_RGHT);
+        state = STATE_NONE;
+        return false;
+      }
+      // Fallthrough.
+    default:
+      state = STATE_NONE;
+  }
+
+  return true;
+}
diff --git a/keyboards/planck/keymaps/ariccb/features/select_word.h b/keyboards/planck/keymaps/ariccb/features/select_word.h
new file mode 100644
index 0000000000..f762ba1179
--- /dev/null
+++ b/keyboards/planck/keymaps/ariccb/features/select_word.h
@@ -0,0 +1,37 @@
+// Copyright 2021 Google LLC
+//
+// 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
+//
+//     https://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.
+//
+//
+// Select word/line button.
+//
+// Implements a button that selects the current word, assuming conventional text
+// editor hotkeys. Pressing it again extends the selection to the following
+// word. The effect is similar to word selection (W) in the Kakoune editor.
+//
+// Pressing the button with shift selects the current line, and pressing the
+// button again extends the selection to the following line.
+//
+// Note for Mac users: Windows/Linux editing hotkeys are assumed by default.
+// Uncomment the `#define MAC_HOTKEYS` line in select_word.c for Mac hotkeys.
+// The Mac implementation is untested, let me know if it has problems.
+//
+// For full documentation, see
+// https://getreuer.info/posts/keyboards/select-word
+
+#pragma once
+
+#include QMK_KEYBOARD_H
+
+bool process_select_word(uint16_t keycode, keyrecord_t* record,
+                         uint16_t sel_keycode);
diff --git a/keyboards/planck/keymaps/ariccb/keymap.c b/keyboards/planck/keymaps/ariccb/keymap.c
new file mode 100644
index 0000000000..c0b4e490fa
--- /dev/null
+++ b/keyboards/planck/keymaps/ariccb/keymap.c
@@ -0,0 +1,664 @@
+ /* Copyright 2021 Aric Crosson Bouwers
+  *
+  * 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 "muse.h"
+#include "features/select_word.h"
+#include "features/caps_word.h"
+
+// using the Word Selection QMK Macro by Pascal Getreuer, found here: https://getreuer.info/posts/keyboards/select-word/index.html
+// THANKS Pascal for such amazing functionality!!
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+#define _QWERTY 0
+#define _COLEMAK_VCP 1
+#define _LOWER 2
+#define _RAISE 3
+#define _NUMPAD 4
+#define _FN 5
+#define _ADJUST 6
+#define _GAMING 7
+
+#define MICMUTE LALT(KC_M)
+#define DESKTR LGUI(LCTL(KC_RGHT))  // move one virtual desktop to the right
+#define DESKTL LGUI(LCTL(KC_LEFT))  // move one virtual desktop to the left
+#define MTLCTL_F9 MT(MOD_LCTL, KC_F9)
+#define MTLSFT_F10 MT(MOD_LSFT, KC_F10)
+#define MTLALT_F11 MT(MOD_LALT, KC_F11)
+#define MTLGUI_Z MT(MOD_LGUI, KC_Z)
+#define MTLALT_PL MT(MOD_LALT, KC_MPLY)
+#define MTLALT_NXT MT(MOD_LALT, KC_MNXT)
+#define MTENTER MT(MOD_LCTL, KC_ENT)
+#define MTRSFTBSLS MT(MOD_RSFT, KC_BSLS)
+#define MTRCTLQUO MT(MOD_RCTL, KC_QUOT)
+#define MTTAB MT(MOD_LCTL | MOD_LGUI | MOD_LALT, KC_TAB)
+#define LTESC LT(_FN, KC_ESC)
+#define MTPLAY MT(MOD_RALT, KC_MPLY)
+#define KC_COPY LCTL(KC_C)
+#define KC_CUT LCTL(KC_X)
+#define KC_PASTE LCTL(KC_V)
+#define KC_WINPASTE LGUI(KC_V)
+#define KC_PTXT LCTL(LSFT(KC_V))
+#define KC_UNDO LCTL(KC_Z)
+#define KC_REDO LCTL(KC_Y)
+
+enum planck_keycodes {
+  QWERTY = SAFE_RANGE,
+  COLEMAK_VCP,
+  LOWER,
+  RAISE,
+  FN,
+  ADJUST,
+  NUMPAD,
+  GAMING,
+  EXT_NUM,
+  EXT_GAMING,
+  SELWORD,
+  BRACES,
+  BRACES2,
+  ARROW,
+  ALT_TAB
+};
+
+// Define a type for as many tap dance states as you need
+typedef enum {
+    TD_NONE,
+    TD_UNKNOWN,
+    TD_SINGLE_TAP,
+    TD_SINGLE_HOLD,
+    TD_DOUBLE_TAP
+} td_state_t;
+
+typedef struct {
+    bool is_press_action;
+    td_state_t state;
+} td_tap_t;
+
+ // Our custom tap dance keys; add any other tap dance keys to this enum
+enum {
+    UNDS_LOWER,
+    PLAY_RAISE
+};
+
+// Declare the functions to be used with your tap dance key(s)
+// Function associated with all tap dances
+td_state_t cur_dance(qk_tap_dance_state_t *state);
+
+// Functions associated with individual tap dances
+void usl_finished(qk_tap_dance_state_t *state, void *user_data);
+void usl_reset(qk_tap_dance_state_t *state, void *user_data);
+
+/* ----------------------------------------------------------------------------------------------------------------------------- */
+
+// This is a completely modified layout that stikes a balance between muscle memory for keys, where I was coming from a standard
+// Qwerty keyboard, and efficiency gained by using layers. I've switched tab and esc because it's more natural to me this way, and
+// added layer switch on hold functionality for each key. Enter has moved to the key beside LOWER, to allow usage while still having
+// the right hand on the mouse.
+
+// Lower incorporates a numpad on the right side, and all of the symbols included on the left. There is logic for the symbols needed for
+// calculators and math are located around the numpad, and coding symbols are placed in easy to remember spots.
+
+// CAPS has moved to the Fn layer, and a few additional shortcut modifiers like CTRL_ALT_UP and DOWN for adding additional cursors in VSCode.
+// Play/Pause has a prime spot on the base layer, and the Fn version skips to next track
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* MIT Layout (QWERTY)
+ *
+ * ,------------------------------------------------------------------------.
+ * |FN,Esc|  q  |  w  |  e  |  r  |  t  |  y  |  u  |  i  |  o  |  p  |Bsp  |
+ * |------------------------------------------------------------------------|
+  |CSW,Tab|  a  |  s  |  d  |  f  |  g  |  h  |  j  |  k  |  l  |  ;  |Ctl,'|
+ * |------------------------------------------------------------------------|
+ * |Shift |Win,z|  x  |  c  |  v  |  b  |  n  |  m  |  ,  |  .  |  /  |Sft,\|
+ * |------------------------------------------------------------------------|
+ * |      |     |     |Ctl,Ent|LOWER|  Space  |RAISE|Alt,Play|  |     |     |
+ * `------------------------------------------------------------------------'
+ */
+[_QWERTY] = LAYOUT_planck_grid( /* QWERTY */
+    LTESC,   KC_Q,     KC_W,     KC_E,    KC_R,           KC_T,   KC_Y,   KC_U,   KC_I,      KC_O,   KC_P,    KC_BSPC,
+    MTTAB,   KC_A,     KC_S,     KC_D,    KC_F,           KC_G,   KC_H,   KC_J,   KC_K,      KC_L,   KC_SCLN, MTRCTLQUO,
+    KC_LSFT, MTLGUI_Z, KC_X,     KC_C,    KC_V,           KC_B,   KC_N,   KC_M,   KC_COMM,   KC_DOT, KC_SLSH, MTRSFTBSLS,
+    KC_NO,   KC_NO,    KC_NO,    MTENTER, TD(UNDS_LOWER), KC_SPC, KC_SPC, MO(3),  MTLALT_PL, KC_NO,  KC_NO,   KC_NO
+ ),
+
+ /* MIT Layout (COLEMAK_VCP)
+ *
+ * ,------------------------------------------------------------------------.
+ * |FN,ESC|  q  |  w  |  f  |  d  |  b  |  j  |  l  |  u  |  y  |  ;  | Bsp |
+ * |------------------------------------------------------------------------|
+  |CSW,Tab|  a  |  r  |  s  |  t  |  g  |  m  |  n  |  e  |  i  |  o  |Ctl,'|
+ * |------------------------------------------------------------------------|
+ * |Shift |Win,z|  x  |  v  |  c  |  p  |  k  |  h  |  ,  |  .  |  /  |Sft,\|
+ * |------------------------------------------------------------------------|
+ * |      |     |   |Ctl,Ent|LWR,_|   Space   |RAISE|Alt,Play|  |     |     |
+ * `------------------------------------------------------------------------'
+ */
+[_COLEMAK_VCP] = LAYOUT_planck_grid( /* COLEMAK_VCP */
+    LTESC,   KC_Q,     KC_W,     KC_F,    KC_D,           KC_B,   KC_J,   KC_L,   KC_U,      KC_Y,   KC_SCLN, KC_BSPC,
+    MTTAB,   KC_A,     KC_R,     KC_S,    KC_T,           KC_G,   KC_M,   KC_N,   KC_E,      KC_I,   KC_O,    MTRCTLQUO,
+    KC_LSFT, MTLGUI_Z, KC_X,     KC_V,    KC_C,           KC_P,   KC_K,   KC_H,   KC_COMM,   KC_DOT, KC_SLSH, MTRSFTBSLS,
+    KC_NO,   KC_NO,    KC_NO,    MTENTER, TD(UNDS_LOWER), KC_SPC, KC_SPC, MO(3),  MTLALT_PL, KC_NO,  KC_NO,   KC_NO
+ ),
+
+/* MIT Layout (RAISE)
+ *
+ * ,----------------------------------------------------------------------------.
+ * |  ~  |  !  |     |     |      |      |      |  Cut  | Undo| Redo|P2TXT| Bsp |
+ * |----------------------------------------------------------------------------|
+ * |     |Menu |     |     |      |      |ARROW |SELWORD|Copy|Paste|WinPst|  "  |
+ * |----------------------------------------------------------------------------|
+ * |     |Vol+ |Vol- | Mute|      |      |Braces|Braces2|  <  |  >  |  ?  |  !  |
+ * |----------------------------------------------------------------------------|
+ * |     |     |     |     |Adjust|             |       |     |     |     |     |
+ * `----------------------------------------------------------------------------'
+ */
+[_RAISE] = LAYOUT_planck_grid( /* RAISE */
+  KC_TILD, KC_EXLM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CUT,  KC_UNDO, KC_REDO,  KC_PTXT,     KC_BSPC,
+  KC_TRNS, KC_APP,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, ARROW,   SELWORD, KC_COPY, KC_PASTE, KC_WINPASTE, KC_DQUO,
+  KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, BRACES,  BRACES2, KC_LABK, KC_RABK,  KC_QUES,     KC_EXLM,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(6),   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_NO,       KC_NO
+),
+
+/* MIT Layout (LOWER)
+ * XZ
+ * ,-----------------------------------------------------------------------.
+ * |  `  |  !  |  #  |  $  |  <  |  >  |  :  |  7  |  8  |  9  |  =  | Bsp |
+ * |-----------------------------------------------------------------------|
+ * |  '  |  _  |  ^  |  %  |  (  |  )  |  M  |  4  |  5  |  6  |  -  |  +  |
+ * |-----------------------------------------------------------------------|
+ * |Shift|  |  |  &  |  "  |  {  |  }  |  @  |  1  |  2  |  3  |  /  |  *  |
+ * |-----------------------------------------------------------------------|
+ * |     |     |     |     |     |         |MO(6),0|  .  |     |     |     |
+ * `-----------------------------------------------------------------------'
+ */
+[_LOWER] = LAYOUT_planck_grid( /* LOWER */
+  KC_GRV,  KC_EXLM, KC_HASH, KC_DLR,  KC_LABK, KC_RABK, KC_COLN, KC_P7, KC_P8,   KC_P9,  KC_EQL,  KC_BSPC,
+  KC_QUOT, KC_UNDS, KC_CIRC, KC_PERC, KC_LPRN, KC_RPRN, KC_M,    KC_P4, KC_P5,   KC_P6,  KC_PMNS, KC_PPLS,
+  KC_TRNS, KC_PIPE, KC_AMPR, KC_DQUO, KC_LCBR, KC_RCBR, KC_AT,   KC_P1, KC_P2,   KC_P3,  KC_PSLS, KC_PAST,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P0, KC_PDOT, KC_NO,  KC_NO,   KC_NO
+),
+
+/* MIT Layout (GAMING)
+ *.
+ * ,-----------------------------------------------------------------------.
+ * |ESC,`|  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |EXIT GAMING|
+ * |-----------------------------------------------------------------------|
+ * | TAB |  Q  |  W  |  E  |  R  |  T  |  I  |  4  |  5  |  6  |  -  |  +  |
+ * |-----------------------------------------------------------------------|
+ * |Shift|  A  |  S  |  D  |  F  |  G  |  K  |  1  |  2  |  3  |  /  |  *  |
+ * |-----------------------------------------------------------------------|
+ * |     |     |     |  Ctl | Alt |   SPACE   |  0  |  .  |     |     |    |
+ * `-----------------------------------------------------------------------'
+ */
+[_GAMING] = LAYOUT_planck_grid( /* GAMING */
+  KC_GESC, KC_1,  KC_2,  KC_3,    KC_4,    KC_5,   KC_6,   KC_7,  KC_P8,   KC_9,  KC_0,    EXT_GAMING,
+  KC_TAB,  KC_Q,  KC_W,  KC_E,    KC_R,    KC_T,   KC_I,   KC_P4, KC_P5,   KC_P6, KC_PMNS, KC_PPLS,
+  KC_LSFT, KC_A,  KC_S,  KC_D,    KC_F,    KC_G,   KC_K,   KC_P1, KC_P2,   KC_P3, KC_PSLS, KC_PAST,
+  KC_NO,   KC_NO, KC_NO, KC_LCTL, KC_LALT, KC_SPC, KC_SPC, KC_P0, KC_PDOT, KC_NO, KC_NO,   KC_NO
+),
+
+/* MIT Layout (FN)
+ *
+ * ,----------------------------------------------------------------------------.
+ * | |Ctl,F9 |Sft,F10|Alt,F11| F12 |MyComp|Calc  |home |  up  | end |PrtScr| Del |
+ * |-----------------------------------------------------------------------------|
+ * |    | F5 |   F6  |   F7  | F8  |DeskL |DeskR |left | down |right|ScrLck| CAPS|
+ * |-----------------------------------------------------------------------------|
+ * |    | F1 |   F2  |   F3  | F4  |ALT_TAB|MicM |pgup |LCA_dn| pgdn|Pse/Brk| Ins|
+ * |-----------------------------------------------------------------------------|
+ * |    |    |       |       |     |             |     |Alt,MNext|  |      |     |
+ * `-----------------------------------------------------------------------------'
+ */
+[_FN] = LAYOUT_planck_grid( /* FUNCTION */
+  KC_TRNS, MTLCTL_F9, MTLSFT_F10, MTLALT_F11, KC_F12,  KC_MYCM, KC_CALC, KC_HOME, KC_UP,        KC_END,  KC_PSCR,   KC_DEL,
+  KC_TRNS, KC_F5,     KC_F6,      KC_F7,      KC_F8,   DESKTL,  DESKTR,  KC_LEFT, KC_DOWN,      KC_RGHT, KC_SLCK,   KC_CAPS,
+  KC_TRNS, KC_F1,     KC_F2,      KC_F3,      KC_F4,   ALT_TAB, MICMUTE, KC_PGUP, LCA(KC_DOWN), KC_PGDN, KC_PAUSE, KC_INS,
+  KC_NO,   KC_NO,     KC_NO,      KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MTLALT_NXT,   KC_NO,   KC_NO,    KC_NO
+),
+
+/* MIT Layout (ADJUST)
+ *
+ * ,-----------------------------------------------------------------------------.
+ * |RGBtog|Ms3 | Ms2 |MsUp | Ms1  |  Hue+|  Hue- | Sat+| Sat- |Brt+ |Brt- | RESET|
+ * |-----------------------------------------------------------------------------|
+ * |RGBMod| MWL | MsL |MDn  |MsR  |GAMING|       |AU_ON|AU_OFF|MU_ON|MU_OF| DEBUG|
+ * |-----------------------------------------------------------------------------|
+ * |     |MWLft|MWUp |NWDn |NWRght|QWERTY|CMK_VCP|MI_ON|MI_OF |     |     |MU_Mod|
+ * |-----------------------------------------------------------------------------|
+ * |     |     |     |SLEEP|      |              |     |      |     |     |      |
+ * `-----------------------------------------------------------------------------'
+ */
+[_ADJUST] = LAYOUT_planck_grid( /* ADJUST LAYER */
+  RGB_TOG, KC_BTN3, KC_BTN2, KC_MS_U, KC_BTN1, RGB_HUI, RGB_HUD,     RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RESET,
+  RGB_MOD, KC_NO,   KC_MS_L, KC_MS_D, KC_MS_R, GAMING,  KC_NO,       AU_ON,   AU_OFF,  MU_ON,   MU_OFF,  DEBUG,
+  KC_TRNS, KC_WH_L, KC_WH_U, KC_WH_D, KC_WH_R, QWERTY,  COLEMAK_VCP, MI_ON,   MI_OFF,  KC_TRNS, KC_TRNS, MU_MOD,
+  KC_NO,   KC_NO,   KC_NO,   KC_SLEP, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_NO,   KC_NO
+)
+};
+
+#ifdef AUDIO_ENABLE
+float layerswitch_song[][2] = SONG(PLANCK_SOUND);
+float tone_startup[][2]     = SONG(STARTUP_SOUND);
+float tone_qwerty[][2]      = SONG(QWERTY_SOUND);
+float tone_COLEMAK_VCP[][2] = SONG(COLEMAK_SOUND);
+float music_scale[][2]      = SONG(MUSIC_SCALE_SOUND);
+float tone_goodbye[][2]     = SONG(GOODBYE_SOUND);
+
+#endif
+
+bool is_alt_tab_active = false;
+layer_state_t layer_state_set_user(layer_state_t state) {
+
+	static bool is_this_layer_on = false;
+	if (layer_state_cmp(state, 4) != is_this_layer_on) {
+		is_this_layer_on = layer_state_cmp(state, 4);
+		if (is_this_layer_on) {
+			PLAY_SONG(layerswitch_song);
+		}
+		else {
+			stop_all_notes();
+		}
+	}
+  if (is_alt_tab_active) {
+        unregister_code(KC_LALT);
+        is_alt_tab_active = false;
+    }
+    return state;
+
+	switch (get_highest_layer(state)) {
+		case _ADJUST:
+			rgblight_setrgb (0xFF,  0x00, 0x00);
+			break;
+		case _LOWER:
+			rgblight_setrgb (0x00,  0x00, 0xFF);
+			break;
+    case _NUMPAD:
+			rgblight_setrgb (0x00,  0x00, 0xFF);
+			break;
+		case _RAISE:
+			rgblight_setrgb (0x7A,  0x00, 0xFF);
+			break;
+		case _FN:
+			rgblight_setrgb (0x00,  0xFF, 0x00);
+			break;
+		default: //  for any other layers, or the default layer
+			rgblight_setrgb (0xFF,  0xFF, 0xFF);
+			break;
+		}
+	  return state;
+}
+
+// void dance_media (qk_tap_dance_state_t *state, void *user_data)
+//     if (state->count == 1) {
+//         tap_code(KC_MPLY);
+//     } else if (state->count == 2) {
+//         tap_code (KC_MNXT);
+//     } else if (state->count == 3) {
+//         tap_code(KC_MPRV);
+//     } else {
+//         reset_tap_dance (state);
+//     }
+// }
+
+// qk_tap_dance_action_t tap_dance_actions[] = {
+//  [0] = ACTION_TAP_DANCE_FN (dance_media),
+// };
+
+// Determine the current tap dance state
+td_state_t cur_dance(qk_tap_dance_state_t *state) {
+    if (state->interrupted) return TD_SINGLE_HOLD;
+    if (state->count == 1) {
+        if (!state->pressed) return TD_SINGLE_TAP;
+        else return TD_SINGLE_HOLD;
+    } else if (state->count == 2) return TD_DOUBLE_TAP;
+    else return TD_UNKNOWN;
+}
+
+// Initialize tap structure associated with example tap dance key
+static td_tap_t usl_tap_state = {
+    .is_press_action = true,
+    .state = TD_NONE
+};
+
+// Functions that control what our tap dance key does
+void usl_finished(qk_tap_dance_state_t *state, void *user_data) {
+    usl_tap_state.state = cur_dance(state);
+    switch (usl_tap_state.state) {
+        case TD_SINGLE_TAP:
+            tap_code16(KC_UNDS);
+            break;
+        case TD_SINGLE_HOLD:
+            layer_on(_LOWER);
+            // update_tri_layer(_LOWER, _RAISE, _ADJUST);
+            break;
+        case TD_DOUBLE_TAP:
+            // Check to see if the layer is already set
+            if (layer_state_is(_LOWER)) {
+                // If already set, then switch it off
+                layer_off(_LOWER);
+                #ifdef AUDIO_ENABLE
+                  PLAY_SONG(tone_goodbye);
+                #endif
+            } else {
+                // If not already set, then switch the layer on
+                layer_on(_LOWER);
+                #ifdef AUDIO_ENABLE
+                  PLAY_SONG(layerswitch_song);
+                #endif
+            }
+            break;
+        default:
+            break;
+    }
+}
+
+void usl_reset(qk_tap_dance_state_t *state, void *user_data) {
+    // If the key was held down and now is released then switch off the layer
+    if (usl_tap_state.state == TD_SINGLE_HOLD) {
+        layer_off(_LOWER);
+        // update_tri_layer(_LOWER, _RAISE, _ADJUST);
+    }
+    usl_tap_state.state = TD_NONE;
+}
+
+// Associate our tap dance key with its functionality
+qk_tap_dance_action_t tap_dance_actions[] = {
+    [UNDS_LOWER] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, usl_finished, usl_reset, 175)
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  if (!process_select_word(keycode, record, SELWORD)) { return false; }
+  if (!process_caps_word(keycode, record)) { return false; }
+
+  const uint8_t mods = get_mods();
+  const uint8_t oneshot_mods = get_oneshot_mods();
+
+  switch (keycode) {
+    case QWERTY:
+      if (record->event.pressed) {
+        set_single_persistent_default_layer(_QWERTY);
+      }
+      return false;
+      break;
+    case KC_CAPS:
+      if (record->event.pressed) {
+        #ifdef AUDIO_ENABLE
+          PLAY_SONG(tone_qwerty);
+        #endif
+        register_code(KC_CAPS);
+      }
+      return false;
+      break;
+    case GAMING:
+      if (record->event.pressed) {
+        layer_off(_RAISE);
+        layer_off(_LOWER);
+        layer_off(_ADJUST);
+        layer_on(_GAMING);
+        #ifdef AUDIO_ENABLE
+          PLAY_SONG(layerswitch_song);
+        #endif
+      }
+      return false;
+      break;
+    case EXT_GAMING:
+      if (record->event.pressed) {
+        layer_off(_GAMING);
+        #ifdef AUDIO_ENABLE
+          PLAY_SONG(tone_goodbye);
+        #endif
+      }
+      return false;
+      break;
+    case COLEMAK_VCP:
+      if (record->event.pressed) {
+        set_single_persistent_default_layer(_COLEMAK_VCP);
+      }
+      return false;
+      break;
+    case BRACES:  // Types (), or {}, and puts cursor between braces.
+      if (record->event.pressed) {
+        clear_mods();  // Temporarily disable mods.
+        clear_oneshot_mods();
+        if ((mods | oneshot_mods) & MOD_MASK_SHIFT) {
+          SEND_STRING("{}");
+        } else {
+          SEND_STRING("<>");
+        }
+        tap_code(KC_LEFT);  // Move cursor between braces.
+        set_mods(mods);  // Restore mods.
+      }
+      return false;
+    case BRACES2:  // Types [], or <>, and puts cursor between braces.
+      if (record->event.pressed) {
+        clear_mods();  // Temporarily disable mods.
+        clear_oneshot_mods();
+        if ((mods | oneshot_mods) & MOD_MASK_SHIFT) {
+          SEND_STRING("()");
+        } else {
+          SEND_STRING("[]");
+        }
+        tap_code(KC_LEFT);  // Move cursor between braces.
+        set_mods(mods);  // Restore mods.
+      }
+      return false;
+    case ARROW:  // Arrow macro, types -> or =>.
+      if (record->event.pressed) {
+        if ((mods | oneshot_mods) & MOD_MASK_SHIFT) {  // Is shift held?
+          del_mods(MOD_MASK_SHIFT);  // Temporarily delete shift.
+          del_oneshot_mods(MOD_MASK_SHIFT);
+          SEND_STRING("->");
+          set_mods(mods);            // Restore mods.
+        } else {
+          SEND_STRING("=>");
+        }
+      }
+      return false;
+    case ALT_TAB: // super alt tab macro
+      if (record->event.pressed) {
+          if (!is_alt_tab_active) {
+              is_alt_tab_active = true;
+              register_code(KC_LALT);
+          }
+          register_code(KC_TAB);
+      } else {
+          unregister_code(KC_TAB);
+      }
+      return false;
+      break;
+  }
+  return true;
+}
+
+
+enum combo_events {
+  EM_EMAIL,
+  EM_WORK_EMAIL,
+  HTML_P,
+  HTML_TITLE,
+  HTML_DIV,
+  HTML_HTML,
+  HTML_HEAD,
+  HTML_BODY,
+  HTML_FOOTER,
+  HTML_A_HREF,
+  HTML_IMG,
+  CSS_STYLE,
+  HTML_GENERIC_TAG,
+  CTLRGHT,
+  CTLLEFT,
+  COMBO_LENGTH
+};
+uint16_t COMBO_LEN = COMBO_LENGTH; // remove the COMBO_COUNT define and use this instead!
+
+const uint16_t PROGMEM email_combo[] = {KC_E, KC_M, COMBO_END};
+const uint16_t PROGMEM email_work_combo[] = {KC_E, KC_K, COMBO_END};
+const uint16_t PROGMEM html_p_combo[] = {KC_P, KC_DOT, COMBO_END};
+const uint16_t PROGMEM html_title_combo[] = {KC_T, KC_DOT, COMBO_END};
+const uint16_t PROGMEM html_div_combo[] = {KC_D, KC_DOT, COMBO_END};
+const uint16_t PROGMEM html_html_combo[] = {KC_Q, KC_DOT, COMBO_END};
+const uint16_t PROGMEM html_head_combo[] = {KC_W, KC_DOT, COMBO_END};
+const uint16_t PROGMEM html_body_combo[] = {KC_R, KC_DOT, COMBO_END};
+const uint16_t PROGMEM html_footer_combo[] = {KC_X, KC_DOT, COMBO_END};
+const uint16_t PROGMEM html_a_href_combo[] = {KC_A, KC_DOT, COMBO_END};
+const uint16_t PROGMEM html_img_combo[] = {KC_F, KC_DOT, COMBO_END};
+const uint16_t PROGMEM css_style_combo[] = {KC_S, KC_DOT, COMBO_END};
+const uint16_t PROGMEM html_generic_tag_combo[] = {KC_G, KC_DOT, COMBO_END};
+const uint16_t PROGMEM ctrrght_combo[] = {KC_RGHT, KC_DOWN, COMBO_END};
+const uint16_t PROGMEM ctrleft_combo[] = {KC_LEFT, KC_DOWN, COMBO_END};
+// const uint8_t combo_mods = get_mods();
+// const uint8_t combo_oneshot_mods = get_oneshot_mods();
+
+combo_t key_combos[] = {
+  [EM_EMAIL] = COMBO_ACTION(email_combo),
+  [EM_WORK_EMAIL] = COMBO_ACTION(email_work_combo),
+  [HTML_P] = COMBO_ACTION(html_p_combo),
+  [HTML_TITLE] = COMBO_ACTION(html_title_combo),
+  [HTML_DIV] = COMBO_ACTION(html_div_combo),
+  [HTML_HTML] = COMBO_ACTION(html_html_combo),
+  [HTML_HEAD] = COMBO_ACTION(html_head_combo),
+  [HTML_BODY] = COMBO_ACTION(html_body_combo),
+  [HTML_FOOTER] = COMBO_ACTION(html_footer_combo),
+  [HTML_A_HREF] = COMBO_ACTION(html_a_href_combo),
+  [HTML_IMG] = COMBO_ACTION(html_img_combo),
+  [CSS_STYLE] = COMBO_ACTION(css_style_combo),
+  [HTML_GENERIC_TAG] = COMBO_ACTION(html_generic_tag_combo),
+  [CTLRGHT] = COMBO_ACTION(ctrrght_combo),
+  [CTLLEFT] = COMBO_ACTION(ctrleft_combo),
+};
+/* COMBO_ACTION(x) is same as COMBO(x, KC_NO) */
+
+void process_combo_event(uint16_t combo_index, bool pressed) {
+  switch(combo_index) {
+    case EM_EMAIL:
+      if (pressed) {
+        SEND_STRING("aricbouwers@outlook.com");
+      }
+      break;
+    case EM_WORK_EMAIL:
+      if (pressed) {
+        SEND_STRING("acrossonbouwers@rjc.ca");
+      }
+      break;
+    case HTML_DIV:
+      if (pressed) {
+        SEND_STRING("<div></div>");
+        for (int i = 0; i < 6; i++) {
+          tap_code16(KC_LEFT);
+        }
+      }
+      break;
+    case HTML_P:
+      if (pressed) {
+        SEND_STRING("<p></p>");
+        for (int i = 0; i < 4; i++) {
+          tap_code16(KC_LEFT);
+        }
+      }
+      break;
+    case HTML_TITLE:
+      if (pressed) {
+        SEND_STRING("<title></title>");
+        for (int i = 0; i < 8; i++) {
+          tap_code16(KC_LEFT);
+        }
+      }
+      break;
+      case CSS_STYLE:
+      if (pressed) {
+        SEND_STRING("<style></style>");
+         for (int i = 0; i < 8; i++) {
+          tap_code16(KC_LEFT);
+        }
+      }
+      break;
+    case HTML_HTML:
+      if (pressed) {
+        SEND_STRING("<html lang=\"en\"></html>");
+        for (int i = 0; i < 7; i++) {
+          tap_code16(KC_LEFT);
+        }
+      }
+      break;
+    case HTML_HEAD:
+      if (pressed) {
+        SEND_STRING("<head></head>");
+        for (int i = 0; i < 7; i++) {
+          tap_code16(KC_LEFT);
+        }
+      }
+      break;
+    case HTML_BODY:
+      if (pressed) {
+        SEND_STRING("<body></body>");
+        for (int i = 0; i < 7; i++) {
+          tap_code16(KC_LEFT);
+        }
+      }
+      break;
+    case HTML_FOOTER:
+      if (pressed) {
+        SEND_STRING("<footer></footer>");
+        for (int i = 0; i < 9; i++) {
+          tap_code16(KC_LEFT);
+        }
+      }
+      break;
+    case HTML_A_HREF:
+      if (pressed) {
+        SEND_STRING("<a href=\"link_goes_here\">name_of_link_goes_here</a>");
+        tap_code16(KC_HOME);
+        for (int i = 0; i < 10; i++) {
+          tap_code16(KC_RGHT);
+        }
+      }
+      break;
+    case HTML_IMG:
+      if (pressed) {
+        SEND_STRING("<img src=\"image_source_or_link_goes_here\" alt=\"name_if_cant_load\" width=\"num_pixels\" height=\"num_pixels\">");
+        tap_code16(KC_HOME);
+        for (int i = 0; i < 11; i++) {
+          tap_code16(KC_RGHT);
+        }
+      }
+      break;
+    case HTML_GENERIC_TAG:
+      if (pressed) {
+        SEND_STRING("<TAG></TAG>");
+        tap_code16(KC_ESC);
+        for (int i = 0; i < 9; i++) {
+          tap_code16(KC_LEFT);
+        }
+        tap_code16(LCTL(KC_D));
+        tap_code16(LCTL(KC_D));
+        tap_code16(KC_BSPC);
+      }
+      break;
+    case CTLLEFT:
+      if (pressed) {
+        tap_code16(C(KC_LEFT));
+      }
+      break;
+    case CTLRGHT:
+      if (pressed) {
+        tap_code16(C(KC_RGHT));
+      }
+      break;
+  }
+}
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/ariccb/readme.md b/keyboards/planck/keymaps/ariccb/readme.md
new file mode 100644
index 0000000000..500373ea1a
--- /dev/null
+++ b/keyboards/planck/keymaps/ariccb/readme.md
@@ -0,0 +1,78 @@
+```
+QWERTY LAYER
+ * ,------------------------------------------------------------------------.
+ * |FN,Esc|  q  |  w  |  e  |  r  |  t  |  y  |  u  |  i  |  o  |  p  |Bsp  |
+ * |------------------------------------------------------------------------|
+  |CSW,Tab|  a  |  s  |  d  |  f  |  g  |  h  |  j  |  k  |  l  |  ;  |Ctl,'|
+ * |------------------------------------------------------------------------|
+ * |Shift |Win,z|  x  |  c  |  v  |  b  |  n  |  m  |  ,  |  .  |  /  |Sft,\|
+ * |------------------------------------------------------------------------|
+ * |      |     |     |Ctl,Ent|LOWER|  Space  |RAISE|Alt,Play|  |     |     |
+ * `------------------------------------------------------------------------'
+
+COLEMAK_VCP(default) LAYER
+ * ,------------------------------------------------------------------------.
+ * |FN,ESC|  q  |  w  |  f  |  d  |  b  |  j  |  l  |  u  |  y  |  ;  | Bsp |
+ * |------------------------------------------------------------------------|
+  |CSW,Tab|  a  |  r  |  s  |  t  |  g  |  m  |  n  |  e  |  i  |  o  |Ctl,'|
+ * |------------------------------------------------------------------------|
+ * |Shift |Win,z|  x  |  v  |  c  |  p  |  k  |  h  |  ,  |  .  |  /  |Sft,\|
+ * |------------------------------------------------------------------------|
+ * |      |     |   |Ctl,Ent|LWR,_|   Space   |RAISE|Alt,Play|  |     |     |
+ * `------------------------------------------------------------------------'
+
+LOWER LAYER
+ * ,-----------------------------------------------------------------------.
+ * |  `  |  !  |  #  |  $  |  <  |  >  |  :  |  7  |  8  |  9  |  =  | Bsp |
+ * |-----------------------------------------------------------------------|
+ * |  '  |  _  |  ^  |  %  |  (  |  )  |  M  |  4  |  5  |  6  |  -  |  +  |
+ * |-----------------------------------------------------------------------|
+ * |Shift|  |  |  &  |  "  |  {  |  }  |  @  |  1  |  2  |  3  |  /  |  *  |
+ * |-----------------------------------------------------------------------|
+ * |     |     |     |     |     |         |MO(6),0|  .  |     |     |     |
+ * `-----------------------------------------------------------------------'
+
+ RAISED LAYER
+ * ,-----------------------------------------------------------------------------.
+ * |  ~  |  !  |     |     |      |      |       |  Cut  | Undo| Redo|P2TXT| Bsp |
+ * |-----------------------------------------------------------------------------|
+ * |     |Menu |     |     |      |      | ARROW |SELWORD|Copy|Paste|WinPst|  "  |
+ * |-----------------------------------------------------------------------------|
+ * |     |Vol+ |Vol- | Mute|      |      | Braces|Braces2|  <  |  >  |  ?  |  !  |
+ * |-----------------------------------------------------------------------------|
+ * |     |     |     |     |Adjust|              |       |     |     |     |     |
+ * `-----------------------------------------------------------------------------'
+
+ FN LAYER
+ * ,----------------------------------------------------------------------------.
+ * | |Ctl,F9 |Sft,F10|Alt,F11| F12 |MyComp|Calc  |home |  up  | end |PrtScr| Del |
+ * |-----------------------------------------------------------------------------|
+ * |    | F5 |   F6  |   F7  | F8  |DeskL |DeskR |left | down |right|ScrLck| CAPS|
+ * |-----------------------------------------------------------------------------|
+ * |    | F1 |   F2  |   F3  | F4  |ALT_TAB| MicM|pgup |LCA_dn| pgdn|Pse/Brk| Ins|
+ * |-----------------------------------------------------------------------------|
+ * |    |    |       |       |     |             |     |Alt,MNext|  |      |     |
+ * `-----------------------------------------------------------------------------'
+
+GAMING LAYER
+ * ,-----------------------------------------------------------------------.
+ * |ESC,`|  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |EXIT GAMING|
+ * |-----------------------------------------------------------------------|
+ * | TAB |  Q  |  W  |  E  |  R  |  T  |  I  |  4  |  5  |  6  |  -  |  +  |
+ * |-----------------------------------------------------------------------|
+ * |Shift|  A  |  S  |  D  |  F  |  G  |  K  |  1  |  2  |  3  |  /  |  *  |
+ * |-----------------------------------------------------------------------|
+ * |     |     |     |  Ctl | Alt |   SPACE   |  0  |  .  |     |     |    |
+ * `-----------------------------------------------------------------------'
+
+ ADJUST LAYER
+ * ,-----------------------------------------------------------------------------.
+ * |RGBtog|Ms3 | Ms2 |MsUp | Ms1  |  Hue+|  Hue- | Sat+| Sat- |Brt+ |Brt- | RESET|
+ * |-----------------------------------------------------------------------------|
+ * |RGBMod| MWL | MsL |MDn  |MsR  |GAMING|       |AU_ON|AU_OFF|MU_ON|MU_OF| DEBUG|
+ * |-----------------------------------------------------------------------------|
+ * |     |MWLft|MWUp |NWDn |NWRght|QWERTY|CMK_VCP|MI_ON|MI_OF |     |     |MU_Mod|
+ * |-----------------------------------------------------------------------------|
+ * |     |     |     |SLEEP|      |              |     |      |     |     |      |
+ * `-----------------------------------------------------------------------------'
+ ```
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/ariccb/rules.mk b/keyboards/planck/keymaps/ariccb/rules.mk
new file mode 100644
index 0000000000..cc92ab40f3
--- /dev/null
+++ b/keyboards/planck/keymaps/ariccb/rules.mk
@@ -0,0 +1,10 @@
+BOOTMAGIC_ENABLE = no
+CONSOLE_ENABLE = no
+BACKLIGHT_ENABLE = yes
+MIDI_ENABLE = yes
+TAP_DANCE_ENABLE = yes
+DIP_SWITCH_ENABLE = no
+COMBO_ENABLE = yes
+
+SRC += features/select_word.c
+SRC += features/caps_word.c
diff --git a/keyboards/planck/keymaps/jimmysjolund/keymap.c b/keyboards/planck/keymaps/jimmysjolund/keymap.c
index 6b89b99540..aaf8600faf 100644
--- a/keyboards/planck/keymaps/jimmysjolund/keymap.c
+++ b/keyboards/planck/keymaps/jimmysjolund/keymap.c
@@ -53,23 +53,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
  * `-----------------------------------------------------------------------------------'
  */
-/* Qwerty - jimmysjolund 2021-09-22
+/* Qwerty - jimmysjolund 2022-02-06
  * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
+ * | `    |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+ * |Raise |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Shift |
+ * |Lower |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Shift |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  | Ctrl | GUI  | Alt  |Lower |Raise |Enter |Space |AltGr | Down |  Up  |Enter |
+ * | Esc  | Tab  | GUI  |Shift | Bksp | Ctrl |Enter |Space |AltGr | Alt  | Down |  Up  |
  * `-----------------------------------------------------------------------------------'
  */
 
 [_QWERTY] = LAYOUT_planck_grid(
-    KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    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_DEL, KC_LCTL, KC_LGUI, KC_LALT, LOWER,   RAISE,  KC_ENT,  KC_SPC,   KC_ALGR, KC_DOWN, KC_UP,   KC_ENT
+    KC_GRV,  KC_Q,    KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,    KC_U,    KC_I,     KC_O,     KC_P,     KC_DEL,
+    RAISE,   KC_A,    KC_S,     KC_D,     KC_F,     KC_G,     KC_H,    KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
+    LOWER,   KC_Z,    KC_X,     KC_C,     KC_V,     KC_B,     KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,
+    KC_ESC,  KC_TAB,  KC_LGUI,  KC_LSFT,  KC_BSPC,  KC_LCTL,  KC_ENT,  KC_SPC,  KC_ALGR,  KC_LALT,  KC_DOWN,  KC_UP
 ),
 
 /* Colemak Original
@@ -85,20 +85,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 /* Colemak jimmysjolund
  * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
+ * |  `   |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Del  |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
+ * |Raise |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Shift |
+ * |Lower |   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Shift |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  | Ctrl | GUI  | Alt  |Lower |Raise |Enter |Space |AltGr | Down |  Up  |Enter |
+ * | Esc  | Tab  | GUI  |Shift | Bksp | Ctrl |Enter |Space |AltGr | Alt  | Down |  Up  |
  * `-----------------------------------------------------------------------------------'
  */
 [_COLEMAK] = LAYOUT_planck_grid(
-    KC_ESC,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    KC_TAB,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    KC_DEL, KC_LCTL, KC_LGUI, KC_LALT, LOWER,   RAISE,   KC_ENT,  KC_SPC,  KC_ALGR, KC_DOWN,  KC_UP,   KC_ENT
+    KC_GRV, KC_Q,   KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_DEL,
+    RAISE,  KC_A,   KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
+    LOWER,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+    KC_ESC, KC_TAB, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_ENT,  KC_SPC,  KC_ALGR, KC_LALT, KC_DOWN, KC_UP
 ),
 
 /* Dvorak
diff --git a/keyboards/planck/keymaps/oryx/keymap.c b/keyboards/planck/keymaps/oryx/keymap.c
index e84b9913a8..0368c98420 100644
--- a/keyboards/planck/keymaps/oryx/keymap.c
+++ b/keyboards/planck/keymaps/oryx/keymap.c
@@ -91,7 +91,7 @@ void set_layer_color(int layer) {
 }
 
 void rgb_matrix_indicators_user(void) {
-    if (g_suspend_state || keyboard_config.disable_layer_led) {
+    if (keyboard_config.disable_layer_led) {
         return;
     }
     switch (biton32(layer_state)) {
diff --git a/keyboards/planck/keymaps/oryx/rules.mk b/keyboards/planck/keymaps/oryx/rules.mk
index 1e29b5f218..5f561b32e1 100644
--- a/keyboards/planck/keymaps/oryx/rules.mk
+++ b/keyboards/planck/keymaps/oryx/rules.mk
@@ -3,5 +3,7 @@
 CONSOLE_ENABLE = no
 COMMAND_ENABLE = no
 MOUSEKEY_ENABLE = no
+RGBLIGHT_ENABLE = no
+RGB_MATRIX_ENABLE = yes
 WEBUSB_ENABLE = yes
 ORYX_ENABLE = yes
diff --git a/keyboards/ploopyco/mouse/keymaps/uqs/keymap.c b/keyboards/ploopyco/mouse/keymaps/uqs/keymap.c
new file mode 100644
index 0000000000..564dad13df
--- /dev/null
+++ b/keyboards/ploopyco/mouse/keymaps/uqs/keymap.c
@@ -0,0 +1,36 @@
+// Copyright 2022 Ulrich Spörlein (@uqs)
+// SPDX-License-Identifier: GPL-2.0-or-later
+// vi:et sw=4:
+
+#include QMK_KEYBOARD_H
+
+enum custom_keycodes {
+    DBL_CLK_NO = SAFE_RANGE,
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        // This works fine in xev(1) or a browser, but not in the game where I
+        // would want it. Maybe need to increase the delay? Also needs to be
+        // rewritten to use Deferred Execution.
+        case DBL_CLK_NO:
+            if (record->event.pressed) {
+                tap_code(KC_BTN2);
+                wait_ms(150);
+                tap_code(KC_BTN2);
+                wait_ms(300);
+                tap_code(KC_N);
+            }
+            return false;
+    }
+    return true;
+}
+
+
+// Layout is:
+// left-most, M1, M3, M2, right-most, fwd, back (on side), tiny middle one
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(KC_E, KC_BTN1, KC_BTN3, KC_BTN2, KC_LSFT, KC_BTN4, KC_BTN5, DF(1)),  // shooters
+    [1] = LAYOUT(KC_1, KC_BTN1, KC_Y, KC_BTN2, DBL_CLK_NO, KC_N, KC_Y, DF(0)),        // stardew valley, sword on 1
+};
diff --git a/keyboards/ploopyco/mouse/keymaps/uqs/rules.mk b/keyboards/ploopyco/mouse/keymaps/uqs/rules.mk
new file mode 100644
index 0000000000..59222a688a
--- /dev/null
+++ b/keyboards/ploopyco/mouse/keymaps/uqs/rules.mk
@@ -0,0 +1 @@
+#VIA_ENABLE = yes
diff --git a/keyboards/preonic/keymaps/uqs/keymap.c b/keyboards/preonic/keymaps/uqs/keymap.c
new file mode 100644
index 0000000000..ec22890388
--- /dev/null
+++ b/keyboards/preonic/keymaps/uqs/keymap.c
@@ -0,0 +1,117 @@
+// Copyright 2022 Ulrich Spörlein (@uqs)
+// SPDX-License-Identifier: GPL-2.0-or-later
+// vi:et sw=4 cc=5,15,25,35,45,55,65:
+
+#include "uqs.h"
+
+/*
+ * My custom layout macro that allows for easy diff(1) operations between
+ * various keyboards. It probably doesn't make sense to you.
+ */
+#define LAYOUT_uqs(               \
+    k00, k01, k02, k03, k04, k05, \
+    k10, k11, k12, k13, k14, k15, \
+    k20, k21, k22, k23, k24, k25, \
+    k30, k31, k32, k33, k34, k35, \
+         k43, k44,                \
+    k40, k41, k42,                \
+    k06, k07, k08, k09, k0a, k0b, \
+    k16, k17, k18, k19, k1a, k1b, \
+    k26, k27, k28, k29, k2a, k2b, \
+    k36, k37, k38, k39, k3a, k3b, \
+              k46, k48,           \
+                   k49, k4a, k4b  \
+)                                 \
+LAYOUT_preonic_2x2u( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
+    k40, k41, k42, k43, k44,      k46,      k48, k49, k4a, k4b \
+)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [L_QWER] = LAYOUT_uqs(
+     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,
+     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,
+     KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,
+     KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,
+
+     /*thumb*/ LT_EXTD_ESC, KC_SPC,
+      /*aux*/  KC_NO,    KC_LGUI,  KC_LALT,
+     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINUS,
+     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,
+     /*thumb*/ KC_ENT,   LT_NUM_BSPC,
+      /*aux*/  MO(L_FUNC), KC_NO,  KC_NO
+  ),
+  [L_EXTD] = LAYOUT_uqs(
+     KC_F11,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,
+     _______,  KC_BTN1,  KC_SCTAB, KC_PGUP,  KC_CTAB,  KC_LEAD,
+     _______,  OSM_GUI,  OSM_ALT,  OSM_SFT,  OSM_CTL,  KC_RALT,
+     _______,  ALT_TAB,  MS_WHUP,  MS_WHDN,  KC_PGDN,  INS_HARD,
+     /*thumb*/ _______,  _______,
+      /*aux*/  _______,  _______,  _______,
+               /* ^^^^ can't be used */
+     KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F12,
+     KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,   KC_INS,   KC_NO,
+     KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_DEL,   KC_NO,
+     WIN_LEFT, WIN_DN,   WIN_UP,   WIN_RGHT, KC_PSTE,  KC_NO,
+     /*thumb*/ _______,  KC_BSPC,
+      /*aux*/  _______,  _______,  KC_ENTER
+               /* ^^^^ use these */
+  ),
+
+  [L_NUM] = LAYOUT_uqs(
+     KC_F11,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,
+     _______,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,
+     _______,  KC_SCLN,  KC_COLN,  KC_LCBR,  KC_LPRN,  KC_LBRC,
+     _______,  KC_CIRC,  KC_AMPR,  KC_RCBR,  KC_RPRN,  KC_RBRC,
+     /*thumb*/ KC_ESC,   _______,
+      /*aux*/  _______,  _______,  _______,
+               /* ^^^^ use these */
+     KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F12,
+     KC_EQUAL, KC_7,     KC_8,     KC_9,     KC_KP_PLUS,_______,
+     KC_KP_ASTERISK,KC_4,KC_5,     KC_6,     MINS_UNDSCR,_______,
+     KC_COMM,  KC_1,     KC_2,     KC_3,     KC_KP_SLASH,KC_KP_ENTER,  // Enter here, because thumb is occupied
+     /*thumb*/ _______,  _______,
+      /*aux*/  KC_0,     KC_KP_DOT, _______
+               /* ^^^^ can't be used */
+  ),
+
+  [L_FUNC] = LAYOUT_uqs(
+     _______,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
+     _______,  KC_NO,    KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_NO,
+     _______,  KC_LGUI,  KC_LALT,  KC_LSFT,  KC_LCTL,  KC_NO,
+     _______,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
+     /*thumb*/ _______,  _______,
+      /*aux*/  _______,  _______,  _______,
+               /* ^^^^ use these */
+     KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
+     KC_PSCR,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_NO,
+     KC_SLCK,  KC_F4,    KC_F5,    KC_F6,    KC_F11,   KC_NO,
+     KC_PAUS,  KC_F1,    KC_F2,    KC_F3,    KC_F12,   KC_NO,
+     /*thumb*/ _______,  _______,
+      /*aux*/  _______,  _______,  _______
+               /* ^^^^ can't be used */
+  ),
+
+  [L_MOUSE] = LAYOUT_uqs(
+     KC_NO,    _______,  _______,  _______,  _______,  _______,
+     KC_NO,    KC_NO,    KC_BTN2,  KC_BTN3,  KC_BTN1,  KC_VOLU,
+     KC_NO,    KC_NO,    KC_ACL0,  KC_ACL1,  KC_ACL2,  KC_VOLD,
+     KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_MUTE,
+     /*thumb*/ _______,  _______,
+      /*aux*/  _______,  _______,  _______,
+               /* ^^^^ can't be used */
+     _______,  _______,  _______,  _______,  _______,  _______,
+     _______,  _______,  KC_MS_UP, MS_WHUP,  _______,  _______,
+     MS_WHLEFT,KC_MS_L,  KC_MS_D,  KC_MS_R,  MS_WHRGHT,_______,
+     _______,  MS_WHDN,  KC_BTN3,  KC_BTN4,  KC_BTN5,  _______,
+     /*thumb*/ KC_BTN1,  KC_BTN2,
+      /*aux*/  KC_NO,    KC_NO,    KC_NO
+               /* use these ^^^^ */
+  ),
+};
diff --git a/keyboards/preonic/keymaps/uqs/rules.mk b/keyboards/preonic/keymaps/uqs/rules.mk
new file mode 100644
index 0000000000..ca99fa107c
--- /dev/null
+++ b/keyboards/preonic/keymaps/uqs/rules.mk
@@ -0,0 +1,14 @@
+LTO_ENABLE=no
+AUDIO_ENABLE=no
+ENCODER_ENABLE=no
+
+# Broken with gcc >6, see https://github.com/qmk/qmk_firmware/issues/6753
+# (yes, different option, but I suspect the code has moved around)
+# This produces working firmware on Arch Linux with GCC 11, but is still broken
+# on Debian with 8.3.1
+RGBLIGHT_ENABLE=no
+RGB_MATRIX_ENABLE=no
+
+# not required, but helps on debian where there is a soft/hard float confusion.
+# but see above, gcc 8.3.1 still fucks up the firmware.
+USE_FPU=no
diff --git a/keyboards/eggman/config.h b/keyboards/qpockets/eggman/config.h
similarity index 100%
rename from keyboards/eggman/config.h
rename to keyboards/qpockets/eggman/config.h
diff --git a/keyboards/eggman/eggman.c b/keyboards/qpockets/eggman/eggman.c
similarity index 100%
rename from keyboards/eggman/eggman.c
rename to keyboards/qpockets/eggman/eggman.c
diff --git a/keyboards/eggman/eggman.h b/keyboards/qpockets/eggman/eggman.h
similarity index 100%
rename from keyboards/eggman/eggman.h
rename to keyboards/qpockets/eggman/eggman.h
diff --git a/keyboards/eggman/info.json b/keyboards/qpockets/eggman/info.json
similarity index 100%
rename from keyboards/eggman/info.json
rename to keyboards/qpockets/eggman/info.json
diff --git a/keyboards/eggman/keymaps/default/config.h b/keyboards/qpockets/eggman/keymaps/default/config.h
similarity index 100%
rename from keyboards/eggman/keymaps/default/config.h
rename to keyboards/qpockets/eggman/keymaps/default/config.h
diff --git a/keyboards/eggman/keymaps/default/keymap.c b/keyboards/qpockets/eggman/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/eggman/keymaps/default/keymap.c
rename to keyboards/qpockets/eggman/keymaps/default/keymap.c
diff --git a/keyboards/wanten/keymaps/2u_bars/rules.mk b/keyboards/qpockets/eggman/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/wanten/keymaps/2u_bars/rules.mk
rename to keyboards/qpockets/eggman/keymaps/default/rules.mk
diff --git a/keyboards/eggman/readme.md b/keyboards/qpockets/eggman/readme.md
similarity index 88%
rename from keyboards/eggman/readme.md
rename to keyboards/qpockets/eggman/readme.md
index 156b4086fa..e0066fbe1f 100644
--- a/keyboards/eggman/readme.md
+++ b/keyboards/qpockets/eggman/readme.md
@@ -9,10 +9,10 @@ i am he and you are me
 
 Make example for this keyboard (after setting up your build environment):
 
-    make eggman:default
+    make qpockets/eggman:default
 
 Flashing example for this keyboard:
 
-    make eggman:default:flash
+    make qpockets/eggman:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/eggman/rules.mk b/keyboards/qpockets/eggman/rules.mk
similarity index 100%
rename from keyboards/eggman/rules.mk
rename to keyboards/qpockets/eggman/rules.mk
diff --git a/keyboards/space_space/readme.md b/keyboards/qpockets/space_space/readme.md
similarity index 88%
rename from keyboards/space_space/readme.md
rename to keyboards/qpockets/space_space/readme.md
index 08fa640f22..c84a583267 100644
--- a/keyboards/space_space/readme.md
+++ b/keyboards/qpockets/space_space/readme.md
@@ -9,10 +9,10 @@ Give your space some space
 
 Make example for this keyboard (after setting up your build environment):
 
-    make space_space/rev2:default
+    make qpockets/space_space/rev2:default
 
 Flashing example for this keyboard:
 
-    make space_space/rev2:default:flash
+    make qpockets/space_space/rev2:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/space_space/rev1/config.h b/keyboards/qpockets/space_space/rev1/config.h
similarity index 100%
rename from keyboards/space_space/rev1/config.h
rename to keyboards/qpockets/space_space/rev1/config.h
diff --git a/keyboards/space_space/rev1/info.json b/keyboards/qpockets/space_space/rev1/info.json
similarity index 100%
rename from keyboards/space_space/rev1/info.json
rename to keyboards/qpockets/space_space/rev1/info.json
diff --git a/keyboards/space_space/rev1/keymaps/big_space/config.h b/keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h
similarity index 100%
rename from keyboards/space_space/rev1/keymaps/big_space/config.h
rename to keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h
diff --git a/keyboards/space_space/rev1/keymaps/big_space/keymap.c b/keyboards/qpockets/space_space/rev1/keymaps/big_space/keymap.c
similarity index 100%
rename from keyboards/space_space/rev1/keymaps/big_space/keymap.c
rename to keyboards/qpockets/space_space/rev1/keymaps/big_space/keymap.c
diff --git a/keyboards/space_space/rev1/keymaps/big_space/rules.mk b/keyboards/qpockets/space_space/rev1/keymaps/big_space/rules.mk
similarity index 100%
rename from keyboards/space_space/rev1/keymaps/big_space/rules.mk
rename to keyboards/qpockets/space_space/rev1/keymaps/big_space/rules.mk
diff --git a/keyboards/space_space/rev1/keymaps/default/config.h b/keyboards/qpockets/space_space/rev1/keymaps/default/config.h
similarity index 100%
rename from keyboards/space_space/rev1/keymaps/default/config.h
rename to keyboards/qpockets/space_space/rev1/keymaps/default/config.h
diff --git a/keyboards/space_space/rev1/keymaps/default/keymap.c b/keyboards/qpockets/space_space/rev1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/space_space/rev1/keymaps/default/keymap.c
rename to keyboards/qpockets/space_space/rev1/keymaps/default/keymap.c
diff --git a/keyboards/space_space/rev1/keymaps/default/rules.mk b/keyboards/qpockets/space_space/rev1/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/space_space/rev1/keymaps/default/rules.mk
rename to keyboards/qpockets/space_space/rev1/keymaps/default/rules.mk
diff --git a/keyboards/space_space/rev1/keymaps/readme.md b/keyboards/qpockets/space_space/rev1/keymaps/readme.md
similarity index 100%
rename from keyboards/space_space/rev1/keymaps/readme.md
rename to keyboards/qpockets/space_space/rev1/keymaps/readme.md
diff --git a/keyboards/space_space/rev1/readme.md b/keyboards/qpockets/space_space/rev1/readme.md
similarity index 100%
rename from keyboards/space_space/rev1/readme.md
rename to keyboards/qpockets/space_space/rev1/readme.md
diff --git a/keyboards/space_space/rev1/rev1.c b/keyboards/qpockets/space_space/rev1/rev1.c
similarity index 100%
rename from keyboards/space_space/rev1/rev1.c
rename to keyboards/qpockets/space_space/rev1/rev1.c
diff --git a/keyboards/space_space/rev1/rev1.h b/keyboards/qpockets/space_space/rev1/rev1.h
similarity index 100%
rename from keyboards/space_space/rev1/rev1.h
rename to keyboards/qpockets/space_space/rev1/rev1.h
diff --git a/keyboards/space_space/rev1/rules.mk b/keyboards/qpockets/space_space/rev1/rules.mk
similarity index 100%
rename from keyboards/space_space/rev1/rules.mk
rename to keyboards/qpockets/space_space/rev1/rules.mk
diff --git a/keyboards/space_space/rev2/config.h b/keyboards/qpockets/space_space/rev2/config.h
similarity index 100%
rename from keyboards/space_space/rev2/config.h
rename to keyboards/qpockets/space_space/rev2/config.h
diff --git a/keyboards/space_space/rev2/info.json b/keyboards/qpockets/space_space/rev2/info.json
similarity index 100%
rename from keyboards/space_space/rev2/info.json
rename to keyboards/qpockets/space_space/rev2/info.json
diff --git a/keyboards/space_space/rev2/keymaps/big_space/config.h b/keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h
similarity index 100%
rename from keyboards/space_space/rev2/keymaps/big_space/config.h
rename to keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h
diff --git a/keyboards/space_space/rev2/keymaps/big_space/keymap.c b/keyboards/qpockets/space_space/rev2/keymaps/big_space/keymap.c
similarity index 100%
rename from keyboards/space_space/rev2/keymaps/big_space/keymap.c
rename to keyboards/qpockets/space_space/rev2/keymaps/big_space/keymap.c
diff --git a/keyboards/space_space/rev2/keymaps/big_space/rules.mk b/keyboards/qpockets/space_space/rev2/keymaps/big_space/rules.mk
similarity index 100%
rename from keyboards/space_space/rev2/keymaps/big_space/rules.mk
rename to keyboards/qpockets/space_space/rev2/keymaps/big_space/rules.mk
diff --git a/keyboards/space_space/rev2/keymaps/default/config.h b/keyboards/qpockets/space_space/rev2/keymaps/default/config.h
similarity index 100%
rename from keyboards/space_space/rev2/keymaps/default/config.h
rename to keyboards/qpockets/space_space/rev2/keymaps/default/config.h
diff --git a/keyboards/space_space/rev2/keymaps/default/keymap.c b/keyboards/qpockets/space_space/rev2/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/space_space/rev2/keymaps/default/keymap.c
rename to keyboards/qpockets/space_space/rev2/keymaps/default/keymap.c
diff --git a/keyboards/wanten/keymaps/625_bar/rules.mk b/keyboards/qpockets/space_space/rev2/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/wanten/keymaps/625_bar/rules.mk
rename to keyboards/qpockets/space_space/rev2/keymaps/default/rules.mk
diff --git a/keyboards/space_space/rev2/keymaps/qpockets/config.h b/keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h
similarity index 100%
rename from keyboards/space_space/rev2/keymaps/qpockets/config.h
rename to keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h
diff --git a/keyboards/space_space/rev2/keymaps/qpockets/keymap.c b/keyboards/qpockets/space_space/rev2/keymaps/qpockets/keymap.c
similarity index 100%
rename from keyboards/space_space/rev2/keymaps/qpockets/keymap.c
rename to keyboards/qpockets/space_space/rev2/keymaps/qpockets/keymap.c
diff --git a/keyboards/space_space/rev2/keymaps/qpockets/rules.mk b/keyboards/qpockets/space_space/rev2/keymaps/qpockets/rules.mk
similarity index 100%
rename from keyboards/space_space/rev2/keymaps/qpockets/rules.mk
rename to keyboards/qpockets/space_space/rev2/keymaps/qpockets/rules.mk
diff --git a/keyboards/space_space/rev2/readme.md b/keyboards/qpockets/space_space/rev2/readme.md
similarity index 100%
rename from keyboards/space_space/rev2/readme.md
rename to keyboards/qpockets/space_space/rev2/readme.md
diff --git a/keyboards/space_space/rev2/rev2.c b/keyboards/qpockets/space_space/rev2/rev2.c
similarity index 100%
rename from keyboards/space_space/rev2/rev2.c
rename to keyboards/qpockets/space_space/rev2/rev2.c
diff --git a/keyboards/space_space/rev2/rev2.h b/keyboards/qpockets/space_space/rev2/rev2.h
similarity index 100%
rename from keyboards/space_space/rev2/rev2.h
rename to keyboards/qpockets/space_space/rev2/rev2.h
diff --git a/keyboards/space_space/rev2/rules.mk b/keyboards/qpockets/space_space/rev2/rules.mk
similarity index 100%
rename from keyboards/space_space/rev2/rules.mk
rename to keyboards/qpockets/space_space/rev2/rules.mk
diff --git a/keyboards/qpockets/space_space/rules.mk b/keyboards/qpockets/space_space/rules.mk
new file mode 100644
index 0000000000..0ffe2efbf2
--- /dev/null
+++ b/keyboards/qpockets/space_space/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = qpockets/space_space/rev2
diff --git a/keyboards/wanten/config.h b/keyboards/qpockets/wanten/config.h
similarity index 100%
rename from keyboards/wanten/config.h
rename to keyboards/qpockets/wanten/config.h
diff --git a/keyboards/wanten/info.json b/keyboards/qpockets/wanten/info.json
similarity index 100%
rename from keyboards/wanten/info.json
rename to keyboards/qpockets/wanten/info.json
diff --git a/keyboards/wanten/keymaps/2u_bars/config.h b/keyboards/qpockets/wanten/keymaps/2u_bars/config.h
similarity index 100%
rename from keyboards/wanten/keymaps/2u_bars/config.h
rename to keyboards/qpockets/wanten/keymaps/2u_bars/config.h
diff --git a/keyboards/wanten/keymaps/2u_bars/keymap.c b/keyboards/qpockets/wanten/keymaps/2u_bars/keymap.c
similarity index 100%
rename from keyboards/wanten/keymaps/2u_bars/keymap.c
rename to keyboards/qpockets/wanten/keymaps/2u_bars/keymap.c
diff --git a/keyboards/wanten/keymaps/default/rules.mk b/keyboards/qpockets/wanten/keymaps/2u_bars/rules.mk
similarity index 100%
rename from keyboards/wanten/keymaps/default/rules.mk
rename to keyboards/qpockets/wanten/keymaps/2u_bars/rules.mk
diff --git a/keyboards/wanten/keymaps/625_bar/config.h b/keyboards/qpockets/wanten/keymaps/625_bar/config.h
similarity index 100%
rename from keyboards/wanten/keymaps/625_bar/config.h
rename to keyboards/qpockets/wanten/keymaps/625_bar/config.h
diff --git a/keyboards/wanten/keymaps/625_bar/keymap.c b/keyboards/qpockets/wanten/keymaps/625_bar/keymap.c
similarity index 100%
rename from keyboards/wanten/keymaps/625_bar/keymap.c
rename to keyboards/qpockets/wanten/keymaps/625_bar/keymap.c
diff --git a/keyboards/qpockets/wanten/keymaps/625_bar/rules.mk b/keyboards/qpockets/wanten/keymaps/625_bar/rules.mk
new file mode 100644
index 0000000000..ab1e438182
--- /dev/null
+++ b/keyboards/qpockets/wanten/keymaps/625_bar/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/wanten/keymaps/default/config.h b/keyboards/qpockets/wanten/keymaps/default/config.h
similarity index 100%
rename from keyboards/wanten/keymaps/default/config.h
rename to keyboards/qpockets/wanten/keymaps/default/config.h
diff --git a/keyboards/wanten/keymaps/default/keymap.c b/keyboards/qpockets/wanten/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/wanten/keymaps/default/keymap.c
rename to keyboards/qpockets/wanten/keymaps/default/keymap.c
diff --git a/keyboards/wanten/keymaps/default/readme.md b/keyboards/qpockets/wanten/keymaps/default/readme.md
similarity index 100%
rename from keyboards/wanten/keymaps/default/readme.md
rename to keyboards/qpockets/wanten/keymaps/default/readme.md
diff --git a/keyboards/qpockets/wanten/keymaps/default/rules.mk b/keyboards/qpockets/wanten/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ab1e438182
--- /dev/null
+++ b/keyboards/qpockets/wanten/keymaps/default/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/wanten/readme.md b/keyboards/qpockets/wanten/readme.md
similarity index 93%
rename from keyboards/wanten/readme.md
rename to keyboards/qpockets/wanten/readme.md
index 90dd1ae132..243e949f34 100644
--- a/keyboards/wanten/readme.md
+++ b/keyboards/qpockets/wanten/readme.md
@@ -10,11 +10,11 @@ an ortho drop in PCB for Van cases
 
 Make example for this keyboard (after setting up your build environment):
 
-    make wanten:default
+    make qpockets/wanten:default
 
 Flashing example for this keyboard:
 
-    make wanten:default:flash
+    make qpockets/wanten:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
diff --git a/keyboards/wanten/rules.mk b/keyboards/qpockets/wanten/rules.mk
similarity index 100%
rename from keyboards/wanten/rules.mk
rename to keyboards/qpockets/wanten/rules.mk
diff --git a/keyboards/wanten/wanten.c b/keyboards/qpockets/wanten/wanten.c
similarity index 100%
rename from keyboards/wanten/wanten.c
rename to keyboards/qpockets/wanten/wanten.c
diff --git a/keyboards/wanten/wanten.h b/keyboards/qpockets/wanten/wanten.h
similarity index 100%
rename from keyboards/wanten/wanten.h
rename to keyboards/qpockets/wanten/wanten.h
diff --git a/keyboards/pistachio/config.h b/keyboards/rate/pistachio/config.h
similarity index 100%
rename from keyboards/pistachio/config.h
rename to keyboards/rate/pistachio/config.h
diff --git a/keyboards/pistachio/info.json b/keyboards/rate/pistachio/info.json
similarity index 100%
rename from keyboards/pistachio/info.json
rename to keyboards/rate/pistachio/info.json
diff --git a/keyboards/pistachio/keymaps/default/keymap.c b/keyboards/rate/pistachio/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/pistachio/keymaps/default/keymap.c
rename to keyboards/rate/pistachio/keymaps/default/keymap.c
diff --git a/keyboards/pistachio/keymaps/rate/keymap.c b/keyboards/rate/pistachio/keymaps/rate/keymap.c
similarity index 100%
rename from keyboards/pistachio/keymaps/rate/keymap.c
rename to keyboards/rate/pistachio/keymaps/rate/keymap.c
diff --git a/keyboards/pistachio/keymaps/via/keymap.c b/keyboards/rate/pistachio/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/pistachio/keymaps/via/keymap.c
rename to keyboards/rate/pistachio/keymaps/via/keymap.c
diff --git a/keyboards/rate/pistachio/keymaps/via/rules.mk b/keyboards/rate/pistachio/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/rate/pistachio/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/pistachio/pistachio.c b/keyboards/rate/pistachio/pistachio.c
similarity index 100%
rename from keyboards/pistachio/pistachio.c
rename to keyboards/rate/pistachio/pistachio.c
diff --git a/keyboards/pistachio/pistachio.h b/keyboards/rate/pistachio/pistachio.h
similarity index 89%
rename from keyboards/pistachio/pistachio.h
rename to keyboards/rate/pistachio/pistachio.h
index 8cbb967f49..7bf2c59ad6 100644
--- a/keyboards/pistachio/pistachio.h
+++ b/keyboards/rate/pistachio/pistachio.h
@@ -18,8 +18,8 @@
 
 #include "quantum.h"
 
-#if defined(KEYBOARD_pistachio_rev1)
+#if defined(KEYBOARD_rate_pistachio_rev1)
 #    include "rev1.h"
-#elif defined(KEYBOARD_pistachio_rev2)
+#elif defined(KEYBOARD_rate_pistachio_rev2)
 #    include "rev2.h"
 #endif
diff --git a/keyboards/pistachio/readme.md b/keyboards/rate/pistachio/readme.md
similarity index 85%
rename from keyboards/pistachio/readme.md
rename to keyboards/rate/pistachio/readme.md
index 8ff5933f4f..dc989bbe6c 100644
--- a/keyboards/pistachio/readme.md
+++ b/keyboards/rate/pistachio/readme.md
@@ -10,9 +10,9 @@ This is a 92-key split keyboard with JIS layout and spare keys.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make pistachio/rev1:default
-    make pistachio/rev2:default
+    make rate/pistachio/rev1:default
+    make rate/pistachio/rev2:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
-[Build guide](https://ratelog.net/pistachio-build-guide/)
\ No newline at end of file
+[Build guide](https://ratelog.net/pistachio-build-guide/)
diff --git a/keyboards/pistachio/rev1/config.h b/keyboards/rate/pistachio/rev1/config.h
similarity index 100%
rename from keyboards/pistachio/rev1/config.h
rename to keyboards/rate/pistachio/rev1/config.h
diff --git a/keyboards/pistachio/rev1/readme.md b/keyboards/rate/pistachio/rev1/readme.md
similarity index 100%
rename from keyboards/pistachio/rev1/readme.md
rename to keyboards/rate/pistachio/rev1/readme.md
diff --git a/keyboards/pistachio/rev1/rev1.c b/keyboards/rate/pistachio/rev1/rev1.c
similarity index 100%
rename from keyboards/pistachio/rev1/rev1.c
rename to keyboards/rate/pistachio/rev1/rev1.c
diff --git a/keyboards/pistachio/rev1/rev1.h b/keyboards/rate/pistachio/rev1/rev1.h
similarity index 100%
rename from keyboards/pistachio/rev1/rev1.h
rename to keyboards/rate/pistachio/rev1/rev1.h
diff --git a/keyboards/pistachio/rev1/rules.mk b/keyboards/rate/pistachio/rev1/rules.mk
similarity index 100%
rename from keyboards/pistachio/rev1/rules.mk
rename to keyboards/rate/pistachio/rev1/rules.mk
diff --git a/keyboards/pistachio/rev2/config.h b/keyboards/rate/pistachio/rev2/config.h
similarity index 100%
rename from keyboards/pistachio/rev2/config.h
rename to keyboards/rate/pistachio/rev2/config.h
diff --git a/keyboards/pistachio/rev2/readme.md b/keyboards/rate/pistachio/rev2/readme.md
similarity index 100%
rename from keyboards/pistachio/rev2/readme.md
rename to keyboards/rate/pistachio/rev2/readme.md
diff --git a/keyboards/pistachio/rev2/rev2.c b/keyboards/rate/pistachio/rev2/rev2.c
similarity index 100%
rename from keyboards/pistachio/rev2/rev2.c
rename to keyboards/rate/pistachio/rev2/rev2.c
diff --git a/keyboards/pistachio/rev2/rev2.h b/keyboards/rate/pistachio/rev2/rev2.h
similarity index 100%
rename from keyboards/pistachio/rev2/rev2.h
rename to keyboards/rate/pistachio/rev2/rev2.h
diff --git a/keyboards/pistachio/rev2/rules.mk b/keyboards/rate/pistachio/rev2/rules.mk
similarity index 100%
rename from keyboards/pistachio/rev2/rules.mk
rename to keyboards/rate/pistachio/rev2/rules.mk
diff --git a/keyboards/rate/pistachio/rules.mk b/keyboards/rate/pistachio/rules.mk
new file mode 100644
index 0000000000..a5f4485316
--- /dev/null
+++ b/keyboards/rate/pistachio/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = rate/pistachio/rev2
diff --git a/keyboards/pistachio_mp/config.h b/keyboards/rate/pistachio_mp/config.h
similarity index 100%
rename from keyboards/pistachio_mp/config.h
rename to keyboards/rate/pistachio_mp/config.h
diff --git a/keyboards/pistachio_mp/info.json b/keyboards/rate/pistachio_mp/info.json
similarity index 100%
rename from keyboards/pistachio_mp/info.json
rename to keyboards/rate/pistachio_mp/info.json
diff --git a/keyboards/pistachio_mp/keymaps/default/keymap.c b/keyboards/rate/pistachio_mp/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/pistachio_mp/keymaps/default/keymap.c
rename to keyboards/rate/pistachio_mp/keymaps/default/keymap.c
diff --git a/keyboards/pistachio_mp/keymaps/default/readme.md b/keyboards/rate/pistachio_mp/keymaps/default/readme.md
similarity index 100%
rename from keyboards/pistachio_mp/keymaps/default/readme.md
rename to keyboards/rate/pistachio_mp/keymaps/default/readme.md
diff --git a/keyboards/pistachio_mp/keymaps/via/keymap.c b/keyboards/rate/pistachio_mp/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/pistachio_mp/keymaps/via/keymap.c
rename to keyboards/rate/pistachio_mp/keymaps/via/keymap.c
diff --git a/keyboards/pistachio_mp/keymaps/via/readme.md b/keyboards/rate/pistachio_mp/keymaps/via/readme.md
similarity index 100%
rename from keyboards/pistachio_mp/keymaps/via/readme.md
rename to keyboards/rate/pistachio_mp/keymaps/via/readme.md
diff --git a/keyboards/rate/pistachio_mp/keymaps/via/rules.mk b/keyboards/rate/pistachio_mp/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/rate/pistachio_mp/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/pistachio_mp/pistachio_mp.c b/keyboards/rate/pistachio_mp/pistachio_mp.c
similarity index 100%
rename from keyboards/pistachio_mp/pistachio_mp.c
rename to keyboards/rate/pistachio_mp/pistachio_mp.c
diff --git a/keyboards/pistachio_mp/pistachio_mp.h b/keyboards/rate/pistachio_mp/pistachio_mp.h
similarity index 100%
rename from keyboards/pistachio_mp/pistachio_mp.h
rename to keyboards/rate/pistachio_mp/pistachio_mp.h
diff --git a/keyboards/pistachio_mp/readme.md b/keyboards/rate/pistachio_mp/readme.md
similarity index 92%
rename from keyboards/pistachio_mp/readme.md
rename to keyboards/rate/pistachio_mp/readme.md
index 0e5b030a6e..b8ea088a4a 100644
--- a/keyboards/pistachio_mp/readme.md
+++ b/keyboards/rate/pistachio_mp/readme.md
@@ -10,12 +10,12 @@ This is a numeric keypad with a rotary encoder that uses a stainless steel plate
 
 Make example for this keyboard (after setting up your build environment):
 
-    make pistachio_mp:default
+    make rate/pistachio_mp:default
 
 Flashing example for this keyboard:
 
-    make pistachio_mp:default:flash
+    make rate/pistachio_mp:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
-[Build guide](https://ratelog.net/pistachiomacropad-build-guide/)
\ No newline at end of file
+[Build guide](https://ratelog.net/pistachiomacropad-build-guide/)
diff --git a/keyboards/pistachio_mp/rules.mk b/keyboards/rate/pistachio_mp/rules.mk
similarity index 100%
rename from keyboards/pistachio_mp/rules.mk
rename to keyboards/rate/pistachio_mp/rules.mk
diff --git a/keyboards/pistachio_pro/config.h b/keyboards/rate/pistachio_pro/config.h
similarity index 97%
rename from keyboards/pistachio_pro/config.h
rename to keyboards/rate/pistachio_pro/config.h
index c3cb584962..f268967f6e 100644
--- a/keyboards/pistachio_pro/config.h
+++ b/keyboards/rate/pistachio_pro/config.h
@@ -96,7 +96,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* OLED */
 #define OLED_DISPLAY_128X64
-#define OLED_FONT_H "keyboards/pistachio_pro/lib/glcdfont.c"
+#define OLED_FONT_H "keyboards/rate/pistachio_pro/lib/glcdfont.c"
 
 #define OLED_FONT_WIDTH 6
 #define OLED_FONT_HEIGHT 6
diff --git a/keyboards/pistachio_pro/info.json b/keyboards/rate/pistachio_pro/info.json
similarity index 100%
rename from keyboards/pistachio_pro/info.json
rename to keyboards/rate/pistachio_pro/info.json
diff --git a/keyboards/pistachio_pro/keymaps/default/keymap.c b/keyboards/rate/pistachio_pro/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/pistachio_pro/keymaps/default/keymap.c
rename to keyboards/rate/pistachio_pro/keymaps/default/keymap.c
diff --git a/keyboards/pistachio_pro/keymaps/default/readme.md b/keyboards/rate/pistachio_pro/keymaps/default/readme.md
similarity index 100%
rename from keyboards/pistachio_pro/keymaps/default/readme.md
rename to keyboards/rate/pistachio_pro/keymaps/default/readme.md
diff --git a/keyboards/pistachio_pro/keymaps/rate/keymap.c b/keyboards/rate/pistachio_pro/keymaps/rate/keymap.c
similarity index 100%
rename from keyboards/pistachio_pro/keymaps/rate/keymap.c
rename to keyboards/rate/pistachio_pro/keymaps/rate/keymap.c
diff --git a/keyboards/pistachio_pro/keymaps/rate/readme.md b/keyboards/rate/pistachio_pro/keymaps/rate/readme.md
similarity index 100%
rename from keyboards/pistachio_pro/keymaps/rate/readme.md
rename to keyboards/rate/pistachio_pro/keymaps/rate/readme.md
diff --git a/keyboards/pistachio_pro/keymaps/via/keymap.c b/keyboards/rate/pistachio_pro/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/pistachio_pro/keymaps/via/keymap.c
rename to keyboards/rate/pistachio_pro/keymaps/via/keymap.c
diff --git a/keyboards/pistachio_pro/keymaps/via/readme.md b/keyboards/rate/pistachio_pro/keymaps/via/readme.md
similarity index 100%
rename from keyboards/pistachio_pro/keymaps/via/readme.md
rename to keyboards/rate/pistachio_pro/keymaps/via/readme.md
diff --git a/keyboards/rate/pistachio_pro/keymaps/via/rules.mk b/keyboards/rate/pistachio_pro/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/rate/pistachio_pro/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/pistachio_pro/lib/bme280.c b/keyboards/rate/pistachio_pro/lib/bme280.c
similarity index 100%
rename from keyboards/pistachio_pro/lib/bme280.c
rename to keyboards/rate/pistachio_pro/lib/bme280.c
diff --git a/keyboards/pistachio_pro/lib/bme280.h b/keyboards/rate/pistachio_pro/lib/bme280.h
similarity index 100%
rename from keyboards/pistachio_pro/lib/bme280.h
rename to keyboards/rate/pistachio_pro/lib/bme280.h
diff --git a/keyboards/pistachio_pro/lib/glcdfont.c b/keyboards/rate/pistachio_pro/lib/glcdfont.c
similarity index 100%
rename from keyboards/pistachio_pro/lib/glcdfont.c
rename to keyboards/rate/pistachio_pro/lib/glcdfont.c
diff --git a/keyboards/pistachio_pro/matrix.c b/keyboards/rate/pistachio_pro/matrix.c
similarity index 100%
rename from keyboards/pistachio_pro/matrix.c
rename to keyboards/rate/pistachio_pro/matrix.c
diff --git a/keyboards/pistachio_pro/pistachio_pro.c b/keyboards/rate/pistachio_pro/pistachio_pro.c
similarity index 100%
rename from keyboards/pistachio_pro/pistachio_pro.c
rename to keyboards/rate/pistachio_pro/pistachio_pro.c
diff --git a/keyboards/pistachio_pro/pistachio_pro.h b/keyboards/rate/pistachio_pro/pistachio_pro.h
similarity index 100%
rename from keyboards/pistachio_pro/pistachio_pro.h
rename to keyboards/rate/pistachio_pro/pistachio_pro.h
diff --git a/keyboards/pistachio_pro/readme.md b/keyboards/rate/pistachio_pro/readme.md
similarity index 91%
rename from keyboards/pistachio_pro/readme.md
rename to keyboards/rate/pistachio_pro/readme.md
index b224c874e6..752f98b73b 100644
--- a/keyboards/pistachio_pro/readme.md
+++ b/keyboards/rate/pistachio_pro/readme.md
@@ -10,11 +10,11 @@ This is a JIS layout TKL keyboard with 89 keys, encoder and OLED.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make pistachio_pro:default
+    make rate/pistachio_pro:default
 
 Flashing example for this keyboard:
 
-    make pistachio_pro:default:flash
+    make rate/pistachio_pro:default:flash
 
 To reset the keyboard into bootloader mode, press the reset switch on the underside.
 
diff --git a/keyboards/pistachio_pro/rules.mk b/keyboards/rate/pistachio_pro/rules.mk
similarity index 100%
rename from keyboards/pistachio_pro/rules.mk
rename to keyboards/rate/pistachio_pro/rules.mk
diff --git a/keyboards/rgbkb/mun/rules.mk b/keyboards/rgbkb/mun/rules.mk
index d2ad9cdcc2..a682f3aa04 100644
--- a/keyboards/rgbkb/mun/rules.mk
+++ b/keyboards/rgbkb/mun/rules.mk
@@ -5,8 +5,9 @@ MCU = STM32F303
 BOOTLOADER = stm32-dfu
 
 # Touch encoder needs
-SRC += ../common/touch_encoder.c
-SRC += ../common/common_oled.c
+VPATH += keyboards/rgbkb/common
+SRC += touch_encoder.c
+SRC += common_oled.c
 QUANTUM_LIB_SRC += i2c_master.c
 
 # Build Options
@@ -35,8 +36,7 @@ SERIAL_DRIVER = usart
 LTO_ENABLE = yes
 OPT = 3
 
-OPT_DEFS += -DOLED_FONT_H=\"../common/glcdfont.c\"
-OPT_DEFS += -Ikeyboards/rgbkb/common
+OPT_DEFS += -DOLED_FONT_H=\"keyboards/rgbkb/common/glcdfont.c\"
 
 # matrix optimisations
 SRC += matrix.c
diff --git a/keyboards/rgbkb/sol3/rules.mk b/keyboards/rgbkb/sol3/rules.mk
index 8389a7a9c4..e30330d333 100644
--- a/keyboards/rgbkb/sol3/rules.mk
+++ b/keyboards/rgbkb/sol3/rules.mk
@@ -5,8 +5,9 @@ MCU = STM32F303
 BOOTLOADER = stm32-dfu
 
 # Touch encoder needs
-SRC += ../common/touch_encoder.c
-SRC += ../common/common_oled.c
+VPATH += keyboards/rgbkb/common
+SRC += touch_encoder.c
+SRC += common_oled.c
 QUANTUM_LIB_SRC += i2c_master.c
 
 # Build Options
@@ -39,8 +40,7 @@ SERIAL_DRIVER = usart
 LTO_ENABLE = yes
 OPT = 3
 
-OPT_DEFS += -DOLED_FONT_H=\"../common/glcdfont.c\"
-OPT_DEFS += -Ikeyboards/rgbkb/common
+OPT_DEFS += -DOLED_FONT_H=\"keyboards/rgbkb/common/glcdfont.c\"
 
 # TODO: Implement fast matrix scanning
 # matrix optimisations
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/333fred/rules.mk b/keyboards/rgbkb/zen/rev1/keymaps/333fred/rules.mk
index f858bbe3da..a5b4454073 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/333fred/rules.mk
+++ b/keyboards/rgbkb/zen/rev1/keymaps/333fred/rules.mk
@@ -1,4 +1,4 @@
 RGBLIGHT_ENABLE = yes
 KEY_LOCK_ENABLE = yes
 CONSOLE_ENABLE = no
-EXTRAFLAGS += -flto
+LTO_ENABLE = yes
diff --git a/keyboards/rgbkb/zygomorph/keymaps/kageurufu/rules.mk b/keyboards/rgbkb/zygomorph/keymaps/kageurufu/rules.mk
index d484c47366..c5cc34d898 100644
--- a/keyboards/rgbkb/zygomorph/keymaps/kageurufu/rules.mk
+++ b/keyboards/rgbkb/zygomorph/keymaps/kageurufu/rules.mk
@@ -41,4 +41,4 @@ ifeq ($(strip $(RGBLIGHT_SPLIT_ENABLE)), yes)
 endif
 
 # Link time optimization, should save on firmware size
-EXTRAFLAGS += -flto
+LTO_ENABLE = yes
diff --git a/keyboards/comet46/comet46.c b/keyboards/satt/comet46/comet46.c
similarity index 100%
rename from keyboards/comet46/comet46.c
rename to keyboards/satt/comet46/comet46.c
diff --git a/keyboards/comet46/comet46.h b/keyboards/satt/comet46/comet46.h
similarity index 100%
rename from keyboards/comet46/comet46.h
rename to keyboards/satt/comet46/comet46.h
diff --git a/keyboards/comet46/config.h b/keyboards/satt/comet46/config.h
similarity index 100%
rename from keyboards/comet46/config.h
rename to keyboards/satt/comet46/config.h
diff --git a/keyboards/comet46/i2c.c b/keyboards/satt/comet46/i2c.c
similarity index 100%
rename from keyboards/comet46/i2c.c
rename to keyboards/satt/comet46/i2c.c
diff --git a/keyboards/comet46/i2c.h b/keyboards/satt/comet46/i2c.h
similarity index 100%
rename from keyboards/comet46/i2c.h
rename to keyboards/satt/comet46/i2c.h
diff --git a/keyboards/comet46/info.json b/keyboards/satt/comet46/info.json
similarity index 100%
rename from keyboards/comet46/info.json
rename to keyboards/satt/comet46/info.json
diff --git a/keyboards/comet46/keymaps/default-rgbled/keymap.c b/keyboards/satt/comet46/keymaps/default-rgbled/keymap.c
similarity index 100%
rename from keyboards/comet46/keymaps/default-rgbled/keymap.c
rename to keyboards/satt/comet46/keymaps/default-rgbled/keymap.c
diff --git a/keyboards/comet46/keymaps/default-rgbled/readme.md b/keyboards/satt/comet46/keymaps/default-rgbled/readme.md
similarity index 100%
rename from keyboards/comet46/keymaps/default-rgbled/readme.md
rename to keyboards/satt/comet46/keymaps/default-rgbled/readme.md
diff --git a/keyboards/comet46/keymaps/default/config.h b/keyboards/satt/comet46/keymaps/default/config.h
similarity index 100%
rename from keyboards/comet46/keymaps/default/config.h
rename to keyboards/satt/comet46/keymaps/default/config.h
diff --git a/keyboards/comet46/keymaps/default/keymap.c b/keyboards/satt/comet46/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/comet46/keymaps/default/keymap.c
rename to keyboards/satt/comet46/keymaps/default/keymap.c
diff --git a/keyboards/comet46/keymaps/default/readme.md b/keyboards/satt/comet46/keymaps/default/readme.md
similarity index 100%
rename from keyboards/comet46/keymaps/default/readme.md
rename to keyboards/satt/comet46/keymaps/default/readme.md
diff --git a/keyboards/comet46/keymaps/default/rules.mk b/keyboards/satt/comet46/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/comet46/keymaps/default/rules.mk
rename to keyboards/satt/comet46/keymaps/default/rules.mk
diff --git a/keyboards/comet46/keymaps/satt/action_pseudo_lut.c b/keyboards/satt/comet46/keymaps/satt/action_pseudo_lut.c
similarity index 100%
rename from keyboards/comet46/keymaps/satt/action_pseudo_lut.c
rename to keyboards/satt/comet46/keymaps/satt/action_pseudo_lut.c
diff --git a/keyboards/comet46/keymaps/satt/action_pseudo_lut.h b/keyboards/satt/comet46/keymaps/satt/action_pseudo_lut.h
similarity index 100%
rename from keyboards/comet46/keymaps/satt/action_pseudo_lut.h
rename to keyboards/satt/comet46/keymaps/satt/action_pseudo_lut.h
diff --git a/keyboards/comet46/keymaps/satt/config.h b/keyboards/satt/comet46/keymaps/satt/config.h
similarity index 100%
rename from keyboards/comet46/keymaps/satt/config.h
rename to keyboards/satt/comet46/keymaps/satt/config.h
diff --git a/keyboards/comet46/keymaps/satt/keymap.c b/keyboards/satt/comet46/keymaps/satt/keymap.c
similarity index 100%
rename from keyboards/comet46/keymaps/satt/keymap.c
rename to keyboards/satt/comet46/keymaps/satt/keymap.c
diff --git a/keyboards/comet46/keymaps/satt/keymap_jis2us.h b/keyboards/satt/comet46/keymaps/satt/keymap_jis2us.h
similarity index 100%
rename from keyboards/comet46/keymaps/satt/keymap_jis2us.h
rename to keyboards/satt/comet46/keymaps/satt/keymap_jis2us.h
diff --git a/keyboards/comet46/keymaps/satt/readme.md b/keyboards/satt/comet46/keymaps/satt/readme.md
similarity index 100%
rename from keyboards/comet46/keymaps/satt/readme.md
rename to keyboards/satt/comet46/keymaps/satt/readme.md
diff --git a/keyboards/comet46/keymaps/satt/rules.mk b/keyboards/satt/comet46/keymaps/satt/rules.mk
similarity index 100%
rename from keyboards/comet46/keymaps/satt/rules.mk
rename to keyboards/satt/comet46/keymaps/satt/rules.mk
diff --git a/keyboards/comet46/lib/glcdfont.c b/keyboards/satt/comet46/lib/glcdfont.c
similarity index 100%
rename from keyboards/comet46/lib/glcdfont.c
rename to keyboards/satt/comet46/lib/glcdfont.c
diff --git a/keyboards/comet46/lib/host_led_state_reader.c b/keyboards/satt/comet46/lib/host_led_state_reader.c
similarity index 100%
rename from keyboards/comet46/lib/host_led_state_reader.c
rename to keyboards/satt/comet46/lib/host_led_state_reader.c
diff --git a/keyboards/comet46/lib/keylogger.c b/keyboards/satt/comet46/lib/keylogger.c
similarity index 100%
rename from keyboards/comet46/lib/keylogger.c
rename to keyboards/satt/comet46/lib/keylogger.c
diff --git a/keyboards/comet46/lib/modifier_state_reader.c b/keyboards/satt/comet46/lib/modifier_state_reader.c
similarity index 100%
rename from keyboards/comet46/lib/modifier_state_reader.c
rename to keyboards/satt/comet46/lib/modifier_state_reader.c
diff --git a/keyboards/comet46/matrix.c b/keyboards/satt/comet46/matrix.c
similarity index 100%
rename from keyboards/comet46/matrix.c
rename to keyboards/satt/comet46/matrix.c
diff --git a/keyboards/comet46/readme.md b/keyboards/satt/comet46/readme.md
similarity index 96%
rename from keyboards/comet46/readme.md
rename to keyboards/satt/comet46/readme.md
index 3db64d291b..60cb432a48 100644
--- a/keyboards/comet46/readme.md
+++ b/keyboards/satt/comet46/readme.md
@@ -11,7 +11,7 @@ Firmware for nordic MCUs: [SRC and precompiled](https://github.com/satt99/comet4
 
 Make example for this keyboard (after setting up your build environment):
 
-    make comet46:default
+    make satt/comet46:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
diff --git a/keyboards/comet46/rules.mk b/keyboards/satt/comet46/rules.mk
similarity index 100%
rename from keyboards/comet46/rules.mk
rename to keyboards/satt/comet46/rules.mk
diff --git a/keyboards/comet46/ssd1306.c b/keyboards/satt/comet46/ssd1306.c
similarity index 100%
rename from keyboards/comet46/ssd1306.c
rename to keyboards/satt/comet46/ssd1306.c
diff --git a/keyboards/comet46/ssd1306.h b/keyboards/satt/comet46/ssd1306.h
similarity index 100%
rename from keyboards/comet46/ssd1306.h
rename to keyboards/satt/comet46/ssd1306.h
diff --git a/keyboards/sneakbox/aliceclonergb/aliceclonergb.c b/keyboards/sneakbox/aliceclonergb/aliceclonergb.c
new file mode 100644
index 0000000000..e2136312d3
--- /dev/null
+++ b/keyboards/sneakbox/aliceclonergb/aliceclonergb.c
@@ -0,0 +1,32 @@
+/*
+Copyright 2021 Bryan Ong
+
+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 "aliceclonergb.h"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index,clockwise)) { return false; }
+    if (index == 0) { /* First encoder */
+        if (clockwise) {
+            tap_code(KC_DOWN);
+        } else {
+            tap_code(KC_UP);
+        }
+    } 
+    return true;
+}
+#endif
diff --git a/keyboards/sneakbox/aliceclonergb/aliceclonergb.h b/keyboards/sneakbox/aliceclonergb/aliceclonergb.h
new file mode 100644
index 0000000000..a946202ba4
--- /dev/null
+++ b/keyboards/sneakbox/aliceclonergb/aliceclonergb.h
@@ -0,0 +1,60 @@
+/*
+Copyright 2021 Bryan Ong
+
+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 LAYOUT_all LAYOUT_alice_split_bs
+
+#define LAYOUT_alice_split_bs( \
+	K020,   K000, K001, K002, K003, K004, K005, K006,       K010, K011, K012, K013, K014, K015, K016, K017, \
+	K040,   K021,       K022, K023, K024, K025, K026,       K030, K031, K032, K033, K034, K035, K036, K037, \
+	K060,   K041,       K042, K043, K044, K045, K046,       K050, K051, K052, K053, K054, K055,       K056, \
+	        K061,       K062, K063, K064, K065, K066,       K070, K071, K072, K073, K074, K075, K076, K077, \
+	        K081,                   K083, K085, K086,       K091, K093,                               K097  \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  KC_NO }, \
+	{ K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017 }, \
+	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  KC_NO }, \
+	{ K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037 }, \
+	{ K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO }, \
+	{ K050,  K051,  K052,  K053,  K054,  K055,  K056,  KC_NO }, \
+	{ K060,  K061,  K062,  K063,  K064,  K065,  K066,  KC_NO }, \
+	{ K070,  K071,  K072,  K073,  K074,  K075,  K076,  K077 }, \
+	{ KC_NO, K081,  KC_NO, K083,  KC_NO, K085,  K086,  KC_NO }, \
+	{ KC_NO, K091,  KC_NO, K093,  KC_NO, KC_NO, KC_NO, K097 }  \
+}
+
+#define LAYOUT_alice( \
+    K020,   K000, K001, K002, K003, K004, K005, K006,       K010, K011, K012, K013, K014, K015,       K016, \
+    K040,   K021,       K022, K023, K024, K025, K026,       K030, K031, K032, K033, K034, K035, K036, K037, \
+    K060,   K041,       K042, K043, K044, K045, K046,       K050, K051, K052, K053, K054, K055,       K056, \
+            K061,       K062, K063, K064, K065, K066,       K070, K071, K072, K073, K074, K075, K076, K077, \
+            K081,                   K083, K085, K086,       K091, K093,                               K097  \
+) { \
+    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  KC_NO }, \
+    { K010,  K011,  K012,  K013,  K014,  K015,  K016,  KC_NO }, \
+    { K020,  K021,  K022,  K023,  K024,  K025,  K026,  KC_NO }, \
+    { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037 }, \
+    { K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO }, \
+    { K050,  K051,  K052,  K053,  K054,  K055,  K056,  KC_NO }, \
+    { K060,  K061,  K062,  K063,  K064,  K065,  K066,  KC_NO }, \
+    { K070,  K071,  K072,  K073,  K074,  K075,  K076,  K077 }, \
+    { KC_NO, K081,  KC_NO, K083,  KC_NO, K085,  K086,  KC_NO }, \
+    { KC_NO, K091,  KC_NO, K093,  KC_NO, KC_NO, KC_NO, K097 }  \
+}
diff --git a/keyboards/sneakbox/aliceclonergb/config.h b/keyboards/sneakbox/aliceclonergb/config.h
new file mode 100644
index 0000000000..6e30dbca96
--- /dev/null
+++ b/keyboards/sneakbox/aliceclonergb/config.h
@@ -0,0 +1,73 @@
+/*
+Copyright 2021 Bryan Ong
+
+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"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x5342
+#define PRODUCT_ID      0x0006
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Sneakbox
+#define PRODUCT         AliceClone RGB
+
+/*Bootmagic boot button, set to topmost, leftmost key */
+#define BOOTMAGIC_LITE_ROW	2
+#define BOOTMAGIC_LITE_COLUMN	0
+
+/* encoder */
+/* #define NUMBER_OF_ENCODERS 1 */
+#define ENCODERS_PAD_A { D3 }
+#define ENCODERS_PAD_B { D2 }
+#define ENCODER_RESOLUTION 1
+
+
+/* key matrix size */
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 8
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { F1, E6, F4, B1, F5, B2, F6, B3, F7, B7 }
+#define MATRIX_COL_PINS { F0, D0, C7, C6, B6, B5, B4, D1 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#define LED_NUM_LOCK_PIN  D4
+#define LED_CAPS_LOCK_PIN D6
+#define LED_SCROLL_LOCK_PIN D7
+
+#define RGB_DI_PIN D5
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLED_NUM 16
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/sneakbox/aliceclonergb/info.json b/keyboards/sneakbox/aliceclonergb/info.json
new file mode 100644
index 0000000000..9fbee0c692
--- /dev/null
+++ b/keyboards/sneakbox/aliceclonergb/info.json
@@ -0,0 +1,25 @@
+{
+  "keyboard_name": "Alice Clone",
+  "url": "https://sneakbox.design",
+  "maintainer": "mujimanic",
+  "layouts": {
+      "LAYOUT_alice_split_bs": {
+          "layout": [
+              {"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0},
+              {"x":0, "y":1}, {"x":1.25, "y":1, "w":1.5}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1}, {"x":16.75, "y":1, "w":1.5},
+              {"x":0, "y":2}, {"x":1.25, "y":2, "w":1.75}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2, "w":2.25},
+              {"x":1.25, "y":3, "w":2.25}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"x":15.5, "y":3, "w":1.75}, {"x":17.25, "y":3},
+              {"x":1.25, "y":4, "w":1.5}, {"x":4, "y":4, "w":1.5}, {"x":5.5, "y":4, "w":2.25}, {"x":7.75, "y":4}, {"x":9.75, "y":4, "w":2.75}, {"x":12.5, "y":4, "w":1.5}, {"x":16.75, "y":4, "w":1.5}
+			]
+      },
+      "LAYOUT_alice": {
+          "layout": [
+              {"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0, "w":2},
+              {"x":0, "y":1}, {"x":1.25, "y":1, "w":1.5}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1}, {"x":16.75, "y":1, "w":1.5},
+              {"x":0, "y":2}, {"x":1.25, "y":2, "w":1.75}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2, "w":2.25},
+              {"x":1.25, "y":3, "w":2.25}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"x":15.5, "y":3, "w":1.75}, {"x":17.25, "y":3},
+              {"x":1.25, "y":4, "w":1.5}, {"x":4, "y":4, "w":1.5}, {"x":5.5, "y":4, "w":2.25}, {"x":7.75, "y":4}, {"x":9.75, "y":4, "w":2.75}, {"x":12.5, "y":4, "w":1.5}, {"x":16.75, "y":4, "w":1.5}
+            ]
+      }
+  }
+}
diff --git a/keyboards/sneakbox/aliceclonergb/keymaps/default/keymap.c b/keyboards/sneakbox/aliceclonergb/keymaps/default/keymap.c
new file mode 100644
index 0000000000..9dd7ee5eae
--- /dev/null
+++ b/keyboards/sneakbox/aliceclonergb/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+/*
+Copyright 2021 Bryan Ong
+
+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
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_alice_split_bs(
+        KC_ESC,    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_BSPC,
+        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_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_B,    KC_N,    KC_M,    KC_COMM,    KC_DOT,    KC_SLSH,    KC_RSFT,    KC_LGUI,
+                   KC_LCTL,                     KC_LALT, KC_SPC, LT(_FN, KC_SPC),                KC_SPC, KC_RALT,                                              KC_RCTL),
+    [_FN] = LAYOUT_alice_split_bs(
+        KC_TRNS,   KC_TRNS,   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_TRNS,    KC_TRNS,
+        KC_TRNS,   KC_TRNS,   KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   RGB_RMOD,   RGB_MOD,    RGB_TOG,
+        RESET,     KC_TRNS,   KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    RGB_VAD,   RGB_VAI,    KC_TRNS,
+                   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    RGB_SAD,   RGB_SAI,    KC_TRNS,    RGB_HUI,
+                   KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS,                                             KC_TRNS),
+};
diff --git a/keyboards/sneakbox/aliceclonergb/keymaps/via/keymap.c b/keyboards/sneakbox/aliceclonergb/keymaps/via/keymap.c
new file mode 100644
index 0000000000..0f1e600bd1
--- /dev/null
+++ b/keyboards/sneakbox/aliceclonergb/keymaps/via/keymap.c
@@ -0,0 +1,54 @@
+/*
+Copyright 2021 Bryan Ong
+
+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
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN,
+    _L3,
+    _L4
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_BASE] = LAYOUT_alice_split_bs(
+        KC_ESC,    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_BSPC,
+        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_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_B,    KC_N,    KC_M,    KC_COMM,    KC_DOT,    KC_SLSH,    KC_RSFT,    KC_LGUI,
+                   KC_LCTL,                     KC_LALT, KC_SPC, LT(_FN, KC_SPC),                KC_SPC, KC_RALT,                                              KC_RCTL),
+    [_FN] = LAYOUT_alice_split_bs(
+        KC_TRNS,   KC_TRNS,   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_TRNS,    KC_TRNS,
+        KC_TRNS,   KC_TRNS,   KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   RGB_RMOD,   RGB_MOD,    RGB_TOG,
+        RESET,     KC_TRNS,   KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    RGB_VAD,   RGB_VAI,    KC_TRNS,
+                   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    RGB_SAD,   RGB_SAI,    KC_TRNS,    RGB_HUI,
+                   KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS,                                             KC_TRNS),
+    [_L3] = LAYOUT_alice_split_bs(
+        KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,
+        KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+        KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,
+                   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+                   KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS,                                             KC_TRNS),
+    [_L4] = LAYOUT_alice_split_bs(
+        KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,
+        KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+        KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,
+                   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+                   KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS,                                             KC_TRNS),
+};
diff --git a/keyboards/sneakbox/aliceclonergb/keymaps/via/rules.mk b/keyboards/sneakbox/aliceclonergb/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/sneakbox/aliceclonergb/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/sneakbox/aliceclonergb/readme.md b/keyboards/sneakbox/aliceclonergb/readme.md
new file mode 100644
index 0000000000..dc4291bcdf
--- /dev/null
+++ b/keyboards/sneakbox/aliceclonergb/readme.md
@@ -0,0 +1,23 @@
+# Sneakbox Alice Clone RGB PCB
+
+![Sneakbox Alice Clone RGB PCB](https://i.imgur.com/pMZNqLXl.jpg)
+
+An Alice-compatible PCB with hotswap with pushbutton rotary encoder socket placed at the top left key position. This PCB is the successor to the v3 AliceClone PCB and features RGB underglow lighting along with revised hardware components.
+
+* Keyboard Maintainer: [mujimanic](https://github.com/mujimanic)
+* Hardware Supported: Any Alice-layout case.
+* Hardware Availability: [sneakbox.design](https://sneakbox.design/products/sneakbox-alice-hotswap-pcbs)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make sneakbox/aliceclonergb:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the top left key in the nevigation cluster (Escape key) and plug in the keyboard
+* **Physical reset button**: Briefly press the small metal button on the back of the PCB
+* **Keycode in layout**: Press and hold the key next to the right split spacebar (to the right of the spacebar) and then press the End key (located on the bottom of the four-key navigation cluster)
diff --git a/keyboards/sneakbox/aliceclonergb/rules.mk b/keyboards/sneakbox/aliceclonergb/rules.mk
new file mode 100644
index 0000000000..6d57d29a86
--- /dev/null
+++ b/keyboards/sneakbox/aliceclonergb/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+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            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
+
+LAYOUTS = alice alice_split_bs
diff --git a/keyboards/space_space/rules.mk b/keyboards/space_space/rules.mk
deleted file mode 100644
index 2ca04be440..0000000000
--- a/keyboards/space_space/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = space_space/rev2
diff --git a/keyboards/nebula12/chconf.h b/keyboards/spaceholdings/nebula12/chconf.h
similarity index 100%
rename from keyboards/nebula12/chconf.h
rename to keyboards/spaceholdings/nebula12/chconf.h
diff --git a/keyboards/nebula12/config.h b/keyboards/spaceholdings/nebula12/config.h
similarity index 100%
rename from keyboards/nebula12/config.h
rename to keyboards/spaceholdings/nebula12/config.h
diff --git a/keyboards/nebula12/halconf.h b/keyboards/spaceholdings/nebula12/halconf.h
similarity index 100%
rename from keyboards/nebula12/halconf.h
rename to keyboards/spaceholdings/nebula12/halconf.h
diff --git a/keyboards/nebula12/info.json b/keyboards/spaceholdings/nebula12/info.json
similarity index 100%
rename from keyboards/nebula12/info.json
rename to keyboards/spaceholdings/nebula12/info.json
diff --git a/keyboards/nebula12/keymaps/default/keymap.c b/keyboards/spaceholdings/nebula12/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/nebula12/keymaps/default/keymap.c
rename to keyboards/spaceholdings/nebula12/keymaps/default/keymap.c
diff --git a/keyboards/nebula12/keymaps/default/readme.md b/keyboards/spaceholdings/nebula12/keymaps/default/readme.md
similarity index 100%
rename from keyboards/nebula12/keymaps/default/readme.md
rename to keyboards/spaceholdings/nebula12/keymaps/default/readme.md
diff --git a/keyboards/nebula12/keymaps/via/keymap.c b/keyboards/spaceholdings/nebula12/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/nebula12/keymaps/via/keymap.c
rename to keyboards/spaceholdings/nebula12/keymaps/via/keymap.c
diff --git a/keyboards/nebula12/keymaps/via/readme.md b/keyboards/spaceholdings/nebula12/keymaps/via/readme.md
similarity index 100%
rename from keyboards/nebula12/keymaps/via/readme.md
rename to keyboards/spaceholdings/nebula12/keymaps/via/readme.md
diff --git a/keyboards/spaceholdings/nebula12/keymaps/via/rules.mk b/keyboards/spaceholdings/nebula12/keymaps/via/rules.mk
new file mode 100755
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/spaceholdings/nebula12/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/nebula12/mcuconf.h b/keyboards/spaceholdings/nebula12/mcuconf.h
similarity index 100%
rename from keyboards/nebula12/mcuconf.h
rename to keyboards/spaceholdings/nebula12/mcuconf.h
diff --git a/keyboards/nebula12/nebula12.c b/keyboards/spaceholdings/nebula12/nebula12.c
similarity index 100%
rename from keyboards/nebula12/nebula12.c
rename to keyboards/spaceholdings/nebula12/nebula12.c
diff --git a/keyboards/nebula12/nebula12.h b/keyboards/spaceholdings/nebula12/nebula12.h
similarity index 100%
rename from keyboards/nebula12/nebula12.h
rename to keyboards/spaceholdings/nebula12/nebula12.h
diff --git a/keyboards/nebula12/readme.md b/keyboards/spaceholdings/nebula12/readme.md
similarity index 96%
rename from keyboards/nebula12/readme.md
rename to keyboards/spaceholdings/nebula12/readme.md
index 3a68d0a97d..0fc5be178f 100755
--- a/keyboards/nebula12/readme.md
+++ b/keyboards/spaceholdings/nebula12/readme.md
@@ -12,7 +12,7 @@ This is a standard fixed layout 12 key PCB. It supports VIA, full per-key RGB an
 
 Make example for this keyboard (after setting up your build environment):
 
-    make nebula12:via
+    make spaceholdings/nebula12:via
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
diff --git a/keyboards/nebula12/rules.mk b/keyboards/spaceholdings/nebula12/rules.mk
similarity index 100%
rename from keyboards/nebula12/rules.mk
rename to keyboards/spaceholdings/nebula12/rules.mk
diff --git a/keyboards/nebula68/config.h b/keyboards/spaceholdings/nebula68/config.h
similarity index 100%
rename from keyboards/nebula68/config.h
rename to keyboards/spaceholdings/nebula68/config.h
diff --git a/keyboards/nebula68/halconf.h b/keyboards/spaceholdings/nebula68/halconf.h
similarity index 100%
rename from keyboards/nebula68/halconf.h
rename to keyboards/spaceholdings/nebula68/halconf.h
diff --git a/keyboards/nebula68/info.json b/keyboards/spaceholdings/nebula68/info.json
similarity index 100%
rename from keyboards/nebula68/info.json
rename to keyboards/spaceholdings/nebula68/info.json
diff --git a/keyboards/nebula68/keymaps/default/keymap.c b/keyboards/spaceholdings/nebula68/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/nebula68/keymaps/default/keymap.c
rename to keyboards/spaceholdings/nebula68/keymaps/default/keymap.c
diff --git a/keyboards/nebula68/keymaps/default/readme.md b/keyboards/spaceholdings/nebula68/keymaps/default/readme.md
similarity index 100%
rename from keyboards/nebula68/keymaps/default/readme.md
rename to keyboards/spaceholdings/nebula68/keymaps/default/readme.md
diff --git a/keyboards/nebula68/keymaps/via/keymap.c b/keyboards/spaceholdings/nebula68/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/nebula68/keymaps/via/keymap.c
rename to keyboards/spaceholdings/nebula68/keymaps/via/keymap.c
diff --git a/keyboards/nebula68/keymaps/via/readme.md b/keyboards/spaceholdings/nebula68/keymaps/via/readme.md
similarity index 100%
rename from keyboards/nebula68/keymaps/via/readme.md
rename to keyboards/spaceholdings/nebula68/keymaps/via/readme.md
diff --git a/keyboards/spaceholdings/nebula68/keymaps/via/rules.mk b/keyboards/spaceholdings/nebula68/keymaps/via/rules.mk
new file mode 100755
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/spaceholdings/nebula68/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/nebula68/mcuconf.h b/keyboards/spaceholdings/nebula68/mcuconf.h
similarity index 100%
rename from keyboards/nebula68/mcuconf.h
rename to keyboards/spaceholdings/nebula68/mcuconf.h
diff --git a/keyboards/nebula68/nebula68.c b/keyboards/spaceholdings/nebula68/nebula68.c
similarity index 100%
rename from keyboards/nebula68/nebula68.c
rename to keyboards/spaceholdings/nebula68/nebula68.c
diff --git a/keyboards/nebula68/nebula68.h b/keyboards/spaceholdings/nebula68/nebula68.h
similarity index 100%
rename from keyboards/nebula68/nebula68.h
rename to keyboards/spaceholdings/nebula68/nebula68.h
diff --git a/keyboards/nebula68/readme.md b/keyboards/spaceholdings/nebula68/readme.md
similarity index 96%
rename from keyboards/nebula68/readme.md
rename to keyboards/spaceholdings/nebula68/readme.md
index b990ed20dc..528d397529 100755
--- a/keyboards/nebula68/readme.md
+++ b/keyboards/spaceholdings/nebula68/readme.md
@@ -12,7 +12,7 @@ This is a standard fixed layout 68% PCB. It supports VIA, full per-key RGB and u
 
 Make example for this keyboard (after setting up your build environment):
 
-    make nebula68:via
+    make spaceholdings/nebula68:via
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
diff --git a/keyboards/nebula68/rules.mk b/keyboards/spaceholdings/nebula68/rules.mk
similarity index 100%
rename from keyboards/nebula68/rules.mk
rename to keyboards/spaceholdings/nebula68/rules.mk
diff --git a/keyboards/nebula68b/config.h b/keyboards/spaceholdings/nebula68b/config.h
similarity index 100%
rename from keyboards/nebula68b/config.h
rename to keyboards/spaceholdings/nebula68b/config.h
diff --git a/keyboards/nebula68b/info.json b/keyboards/spaceholdings/nebula68b/info.json
similarity index 100%
rename from keyboards/nebula68b/info.json
rename to keyboards/spaceholdings/nebula68b/info.json
diff --git a/keyboards/nebula68b/keymaps/default/keymap.c b/keyboards/spaceholdings/nebula68b/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/nebula68b/keymaps/default/keymap.c
rename to keyboards/spaceholdings/nebula68b/keymaps/default/keymap.c
diff --git a/keyboards/nebula68b/keymaps/default/readme.md b/keyboards/spaceholdings/nebula68b/keymaps/default/readme.md
similarity index 100%
rename from keyboards/nebula68b/keymaps/default/readme.md
rename to keyboards/spaceholdings/nebula68b/keymaps/default/readme.md
diff --git a/keyboards/nebula68b/keymaps/via/keymap.c b/keyboards/spaceholdings/nebula68b/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/nebula68b/keymaps/via/keymap.c
rename to keyboards/spaceholdings/nebula68b/keymaps/via/keymap.c
diff --git a/keyboards/nebula68b/keymaps/via/readme.md b/keyboards/spaceholdings/nebula68b/keymaps/via/readme.md
similarity index 100%
rename from keyboards/nebula68b/keymaps/via/readme.md
rename to keyboards/spaceholdings/nebula68b/keymaps/via/readme.md
diff --git a/keyboards/spaceholdings/nebula68b/keymaps/via/rules.mk b/keyboards/spaceholdings/nebula68b/keymaps/via/rules.mk
new file mode 100755
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/spaceholdings/nebula68b/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/nebula68b/nebula68b.c b/keyboards/spaceholdings/nebula68b/nebula68b.c
similarity index 100%
rename from keyboards/nebula68b/nebula68b.c
rename to keyboards/spaceholdings/nebula68b/nebula68b.c
diff --git a/keyboards/nebula68b/nebula68b.h b/keyboards/spaceholdings/nebula68b/nebula68b.h
similarity index 100%
rename from keyboards/nebula68b/nebula68b.h
rename to keyboards/spaceholdings/nebula68b/nebula68b.h
diff --git a/keyboards/nebula68b/readme.md b/keyboards/spaceholdings/nebula68b/readme.md
similarity index 96%
rename from keyboards/nebula68b/readme.md
rename to keyboards/spaceholdings/nebula68b/readme.md
index c0834e463a..624d9aced0 100755
--- a/keyboards/nebula68b/readme.md
+++ b/keyboards/spaceholdings/nebula68b/readme.md
@@ -12,7 +12,7 @@ This is a standard fixed layout 68% PCB. It supports VIA, full per-key RGB and u
 
 Make example for this keyboard (after setting up your build environment):
 
-    make nebula68b:via
+    make spaceholdings/nebula68b:via
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
diff --git a/keyboards/nebula68b/rules.mk b/keyboards/spaceholdings/nebula68b/rules.mk
similarity index 100%
rename from keyboards/nebula68b/rules.mk
rename to keyboards/spaceholdings/nebula68b/rules.mk
diff --git a/keyboards/splitkb/kyria/keymaps/gotham/rules.mk b/keyboards/splitkb/kyria/keymaps/gotham/rules.mk
index 81b7123ba5..be3789ce9b 100644
--- a/keyboards/splitkb/kyria/keymaps/gotham/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/gotham/rules.mk
@@ -16,6 +16,7 @@ endif
 
 ifeq ($(strip $(THUMBSTICK_ENABLE)), yes)
     POINTING_DEVICE_ENABLE = yes
+    POINTING_DEVICE_DRIVER = custom
     OPT_DEFS += -DTHUMBSTICK_ENABLE
 	SRC += analog.c
 	SRC += thumbstick.c
diff --git a/keyboards/splitkb/kyria/keymaps/uqs/config.h b/keyboards/splitkb/kyria/keymaps/uqs/config.h
new file mode 100644
index 0000000000..ae34b0e04d
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/uqs/config.h
@@ -0,0 +1,13 @@
+// Copyright 2022 Ulrich Spörlein (@uqs)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#ifdef RGBLIGHT_ENABLE
+  //#define RGBLIGHT_ANIMATIONS
+  #define RGBLIGHT_HUE_STEP 8
+  #define RGBLIGHT_SAT_STEP 8
+  #define RGBLIGHT_VAL_STEP 8
+  #define RGBLIGHT_LIMIT_VAL 150
+#endif
+
+#define EE_HANDS
diff --git a/keyboards/splitkb/kyria/keymaps/uqs/keymap.c b/keyboards/splitkb/kyria/keymaps/uqs/keymap.c
new file mode 100644
index 0000000000..53b6ee77b1
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/uqs/keymap.c
@@ -0,0 +1,158 @@
+// Copyright 2022 Ulrich Spörlein (@uqs)
+// SPDX-License-Identifier: GPL-2.0-or-later
+// vi:et sw=4 cc=5,15,25,35,45,55,65:
+
+#include "uqs.h"
+
+/*
+ * My custom layout macro that allows for easy diff(1) operations between
+ * various keyboards. It probably doesn't make sense to you.
+ */
+#define LAYOUT_uqs(               \
+    L00, L01, L02, L03, L04, L05, \
+    L12, L13, L14, L15, L16, L17, \
+    L24, L25, L26, L27, L28, L29, \
+              L40, L41,           \
+         L42, L43, L44,           \
+         L30, L31,                \
+    R06, R07, R08, R09, R10, R11, \
+    R18, R19, R20, R21, R22, R23, \
+    R34, R35, R36, R37, R38, R39, \
+              R48, R49,           \
+         R45, R46, R47,           \
+         R32, R33                 \
+)                                 \
+LAYOUT_stack(                     \
+    L00, L01, L02, L03, L04, L05,                   \
+    L12, L13, L14, L15, L16, L17,                   \
+    L24, L25, L26, L27, L28, L29, L30, L31,         \
+                   L40, L41, L42, L43, L44,         \
+                                                    \
+                  R06, R07, R08, R09, R10, R11,     \
+                  R18, R19, R20, R21, R22, R23,     \
+        R32, R33, R34, R35, R36, R37, R38, R39,     \
+        R45, R46, R47, R48, R49                     \
+)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [L_QWER] = LAYOUT_uqs(
+     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,
+     KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,
+     KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,
+                         KC_LBRC,  KC_RBRC,
+     /*thumb*/ LT_EXTD_ESC, KC_SPC, LT_MOUSE_ALT_SHIFT_INS,
+      /*aux*/  OSM_GUI,  KC_LALT,
+     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,  RSFT_T(KC_GRV),
+                         KC_MINS,  KC_EQL,
+     /*thumb*/ LT_FUNC_SHIFT_INS, KC_ENT, LT_NUM_BSPC,
+      /*aux*/  KC_RALT,  KC_APP
+  ),
+
+  [L_WASD] = LAYOUT_uqs(
+     KC_T,     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,
+     KC_G,     KC_LSFT,  KC_A,     KC_S,     KC_D,     KC_F,
+     KC_B,     KC_GRV,   KC_Z,     KC_X,     KC_C,     KC_V,
+                         KC_LBRC,  KC_RBRC,
+     /*thumb*/ KC_LCTL,  KC_SPC,   KC_R,
+      /*aux*/  OSM_GUI,  KC_LALT,
+     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,  RSFT_T(KC_GRV),
+                         KC_MINS,  KC_EQL,
+     /*thumb*/ DF(L_COLM), KC_ENT, KC_BSPC,
+      /*aux*/  KC_RALT,  KC_APP
+  ),
+
+  [L_COLM] = LAYOUT_uqs(
+     KC_BTN2,  KC_Q,     KC_W,     KC_F,     KC_P,     KC_B,
+     KC_BTN1,  KC_G_A,   KC_A_R,   KC_S_S,   KC_C_T,   KC_G,
+     KC_BTN3,  KC_Z,     KC_X,     KC_C,     KC_D,     KC_V,
+                         MS_WHUP,  MS_WHDN,
+     /*thumb*/ LT_EXTD_ESC, SFT_T(KC_SPC), LT(L_MOUSE, KC_TAB),
+      /*aux*/  OSM_GUI,  KC_LALT,
+     KC_J,     KC_L,     KC_U,     KC_Y,     KC_QUOT,  KC_NO,
+     KC_M,     KC_C_N,   KC_S_E,   KC_A_I,   KC_G_O,   KC_NO,
+     KC_K,     KC_H,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_NO,
+                         KC_NO,    KC_NO,
+     /*thumb*/ LT_FUNC_SHIFT_INS, KC_ENT, LT_NUM_BSPC,
+      /*aux*/  KC_RALT,  KC_APP
+  ),
+
+  // Updated with inspiration from https://forum.colemak.com/topic/2014-extend-extra-extreme/
+  // I like the AltGr trick from https://stevep99.github.io/seniply/ and should probably incorporate some stuff from it.
+  [L_EXTD] = LAYOUT_uqs(
+     _______,  KC_BTN1,  KC_SCTAB, KC_PGUP,  KC_CTAB,  KC_LEAD,
+     _______,  OSM_GUI,  OSM_ALT,  OSM_SFT,  OSM_CTL,  KC_RALT,
+     _______,  ALT_TAB,  MS_WHUP,  MS_WHDN,  KC_PGDN,  INS_HARD,
+                         _______,  _______,
+     /*thumb*/ _______,  _______,  _______,
+      /*aux*/  _______,  _______,
+               /* ^^^^ can't be used */
+     KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,   KC_INS,   KC_NO,
+     KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_DEL,   KC_NO,
+     WIN_LEFT, WIN_DN,   WIN_UP,   WIN_RGHT, KC_PSTE,  KC_NO,  // KC_PSTE works in XTerm to emulate middle-click
+                         _______,  _______,
+     /*thumb*/ _______,  _______,  KC_BSPC,
+      /*aux*/  _______,  _______
+               /* ^^^^ use these */
+  ),
+
+  // TODO: maybe swap # with ;, that way I can roll :w or :wq which I need
+  // often ... probably better to add a combo?
+  [L_NUM] = LAYOUT_uqs(
+     _______,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,
+     _______,  KC_SCLN,  KC_COLN,  KC_LCBR,  KC_LPRN,  KC_LBRC,
+     _______,  KC_CIRC,  KC_AMPR,  KC_RCBR,  KC_RPRN,  KC_RBRC,
+                         KC_GRV,   KC_TILDE,
+     /*thumb*/ KC_ESC,   KC_SPC,   KC_0,
+      /*aux*/  _______,_______,
+               /* ^^^^ use these */
+
+     KC_EQUAL, KC_7,     KC_8,     KC_9,     KC_KP_PLUS,_______,
+     KC_KP_ASTERISK,KC_4,KC_5,     KC_6,     MINS_UNDSCR,_______,
+     KC_COMM,  KC_1,     KC_2,     KC_3,     KC_KP_SLASH,KC_KP_ENTER,  // Enter here, because thumb is occupied
+                         KC_0,     KC_KP_DOT,
+     /*thumb*/ _______,  _______,  _______,
+      /*aux*/  _______,  _______
+               /* ^^^^ can't be used */
+  ),
+
+  [L_FUNC] = LAYOUT_uqs(
+     _______,  KC_NO,    KC_MUTE,  KC_VOLD,  KC_VOLU,  DF(L_WASD),
+     _______,  KC_LGUI,  KC_LALT,  KC_LSFT,  KC_LCTL,  DF(L_QWER),
+     _______,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    DF(L_COLM),
+                         KC_NO,    KC_NO,
+     /*thumb*/ KC_NO,    KC_NO,    KC_NO,
+      /*aux*/  _______,  _______,
+               /* ^^^^ use these */
+
+     KC_PSCR,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_NO,
+     KC_SLCK,  KC_F4,    KC_F5,    KC_F6,    KC_F11,   KC_NO,
+     KC_PAUS,  KC_F1,    KC_F2,    KC_F3,    KC_F12,   KC_NO,
+                         KC_NO,    KC_NO,
+     /*thumb*/ _______,  _______,  _______,
+      /*aux*/  _______,  _______
+               /* ^^^^ can't be used */
+  ),
+
+  [L_MOUSE] = LAYOUT_uqs(
+     _______,  KC_NO,    KC_BTN2,  KC_BTN3,  KC_BTN1,  KC_VOLU,
+     _______,  KC_NO,    KC_ACL0,  KC_ACL1,  KC_ACL2,  KC_VOLD,
+     _______,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_MUTE,
+                         KC_NO,    KC_NO,
+     /*thumb*/ _______,  _______,  _______,
+      /*aux*/  _______,  _______,
+               /* ^^^^ can't be used */
+
+     _______,  _______,  KC_MS_UP, MS_WHUP,  _______,  _______,
+     MS_WHLEFT,KC_MS_L,  KC_MS_D,  KC_MS_R,  MS_WHRGHT,_______,
+     _______,  MS_WHDN,  KC_BTN3,  KC_BTN4,  KC_BTN5,  _______,
+                         KC_NO,    KC_NO,
+     /*thumb*/ KC_NO,    KC_BTN1,  KC_BTN2,
+      /*aux*/  _______,  _______
+               /* use these ^^^^ */
+  ),
+};
diff --git a/keyboards/splitkb/kyria/keymaps/uqs/rules.mk b/keyboards/splitkb/kyria/keymaps/uqs/rules.mk
new file mode 100644
index 0000000000..517f469b6d
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/uqs/rules.mk
@@ -0,0 +1 @@
+OLED_ENABLE = no
diff --git a/keyboards/studiokestra/galatea/rev1/info.json b/keyboards/studiokestra/galatea/rev1/info.json
index 46e07d7a43..e3f31198fe 100644
--- a/keyboards/studiokestra/galatea/rev1/info.json
+++ b/keyboards/studiokestra/galatea/rev1/info.json
@@ -1,101 +1,308 @@
 {
     "keyboard_name": "Galatea",
     "url": "https://studiokestra.ca/galatea",
-    "maintainer": "Studio Kestra",
+    "maintainer": "studiokestra",
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0}, 
-                {"label":"F1", "x":1.25, "y":0}, 
-                {"label":"F2", "x":2.25, "y":0}, 
-                {"label":"F3", "x":3.25, "y":0}, 
-                {"label":"F4", "x":4.25, "y":0}, 
-                {"label":"F5", "x":5.5, "y":0}, 
-                {"label":"F6", "x":6.5, "y":0}, 
-                {"label":"F7", "x":7.5, "y":0}, 
-                {"label":"F8", "x":8.5, "y":0}, 
-                {"label":"F9", "x":9.75, "y":0}, 
-                {"label":"F10", "x":10.75, "y":0}, 
-                {"label":"F11", "x":11.75, "y":0}, 
-                {"label":"F12", "x":12.75, "y":0}, 
-                {"label":"F13", "x":14, "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":"~", "x":0, "y":1.25}, 
-                {"label":"!", "x":1, "y":1.25}, 
-                {"label":"@", "x":2, "y":1.25}, 
-                {"label":"#", "x":3, "y":1.25}, 
-                {"label":"$", "x":4, "y":1.25}, 
-                {"label":"%", "x":5, "y":1.25}, 
-                {"label":"^", "x":6, "y":1.25}, 
-                {"label":"&", "x":7, "y":1.25}, 
-                {"label":"*", "x":8, "y":1.25}, 
-                {"label":"(", "x":9, "y":1.25}, 
-                {"label":")", "x":10, "y":1.25}, 
-                {"label":"_", "x":11, "y":1.25}, 
-                {"label":"+", "x":12, "y":1.25}, 
-                {"label":"|", "x":13, "y":1.25}, 
-                {"label":"Delete", "x":14, "y":1.25}, 
-                {"label":"Insert", "x":15.25, "y":1.25}, 
-                {"label":"Home", "x":16.25, "y":1.25}, 
-                {"label":"PgUp", "x":17.25, "y":1.25}, 
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5}, 
-                {"label":"Q", "x":1.5, "y":2.25}, 
-                {"label":"W", "x":2.5, "y":2.25}, 
-                {"label":"E", "x":3.5, "y":2.25}, 
-                {"label":"R", "x":4.5, "y":2.25}, 
-                {"label":"T", "x":5.5, "y":2.25}, 
-                {"label":"Y", "x":6.5, "y":2.25}, 
-                {"label":"U", "x":7.5, "y":2.25}, 
-                {"label":"I", "x":8.5, "y":2.25}, 
-                {"label":"O", "x":9.5, "y":2.25}, 
-                {"label":"P", "x":10.5, "y":2.25}, 
-                {"label":"{", "x":11.5, "y":2.25}, 
-                {"label":"}", "x":12.5, "y":2.25}, 
-                {"label":"Backspace", "x":13.5, "y":2.25, "w":1.5}, 
-                {"label":"Delete", "x":15.25, "y":2.25}, 
-                {"label":"End", "x":16.25, "y":2.25}, 
-                {"label":"PgDn", "x":17.25, "y":2.25}, 
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, 
-                {"label":"A", "x":1.75, "y":3.25}, 
-                {"label":"S", "x":2.75, "y":3.25}, 
-                {"label":"D", "x":3.75, "y":3.25}, 
-                {"label":"F", "x":4.75, "y":3.25}, 
-                {"label":"G", "x":5.75, "y":3.25}, 
-                {"label":"H", "x":6.75, "y":3.25}, 
-                {"label":"J", "x":7.75, "y":3.25}, 
-                {"label":"K", "x":8.75, "y":3.25}, 
-                {"label":"L", "x":9.75, "y":3.25}, 
-                {"label":":", "x":10.75, "y":3.25}, 
-                {"label":"\"", "x":11.75, "y":3.25}, 
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, 
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25}, 
-                {"label":"|", "x":1.25, "y":4.25}, 
-                {"label":"Z", "x":2.25, "y":4.25}, 
-                {"label":"X", "x":3.25, "y":4.25}, 
-                {"label":"C", "x":4.25, "y":4.25}, 
-                {"label":"V", "x":5.25, "y":4.25}, 
-                {"label":"B", "x":6.25, "y":4.25}, 
-                {"label":"N", "x":7.25, "y":4.25}, 
-                {"label":"M", "x":8.25, "y":4.25}, 
-                {"label":"<", "x":9.25, "y":4.25}, 
-                {"label":">", "x":10.25, "y":4.25}, 
-                {"label":"?", "x":11.25, "y":4.25}, 
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, 
-                {"label":"\u2191", "x":16.25, "y":4.25}, 
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, 
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, 
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, 
-                {"x":3.75, "y":5.25, "w":6.25}, 
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25}, 
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25}, 
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25}, 
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, 
-                {"label":"\u2190", "x":15.25, "y":5.25}, 
-                {"label":"\u2193", "x":16.25, "y":5.25}, 
+                {"x": 0, "y": 0},
+
+                {"x": 1.25, "y": 0},
+                {"x": 2.25, "y": 0},
+                {"x": 3.25, "y": 0},
+                {"x": 4.25, "y": 0},
+                {"x": 5.5, "y": 0},
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+                {"x": 9.75, "y": 0},
+                {"x": 10.75, "y": 0},
+                {"x": 11.75, "y": 0},
+                {"x": 12.75, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
+
+                {"x": 0, "y": 1.25},
+                {"x": 1, "y": 1.25},
+                {"x": 2, "y": 1.25},
+                {"x": 3, "y": 1.25},
+                {"x": 4, "y": 1.25},
+                {"x": 5, "y": 1.25},
+                {"x": 6, "y": 1.25},
+                {"x": 7, "y": 1.25},
+                {"x": 8, "y": 1.25},
+                {"x": 9, "y": 1.25},
+                {"x": 10, "y": 1.25},
+                {"x": 11, "y": 1.25},
+                {"x": 12, "y": 1.25},
+                {"x": 13, "y": 1.25},
+                {"x": 14, "y": 1.25},
+
+                {"x": 15.25, "y": 1.25},
+                {"x": 16.25, "y": 1.25},
+                {"x": 17.25, "y": 1.25},
+
+                {"x": 0, "y": 2.25, "w": 1.5},
+                {"x": 1.5, "y": 2.25},
+                {"x": 2.5, "y": 2.25},
+                {"x": 3.5, "y": 2.25},
+                {"x": 4.5, "y": 2.25},
+                {"x": 5.5, "y": 2.25},
+                {"x": 6.5, "y": 2.25},
+                {"x": 7.5, "y": 2.25},
+                {"x": 8.5, "y": 2.25},
+                {"x": 9.5, "y": 2.25},
+                {"x": 10.5, "y": 2.25},
+                {"x": 11.5, "y": 2.25},
+                {"x": 12.5, "y": 2.25},
+                {"x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"x": 15.25, "y": 2.25},
+                {"x": 16.25, "y": 2.25},
+                {"x": 17.25, "y": 2.25},
+
+                {"x": 0, "y": 3.25, "w": 1.75},
+                {"x": 1.75, "y": 3.25},
+                {"x": 2.75, "y": 3.25},
+                {"x": 3.75, "y": 3.25},
+                {"x": 4.75, "y": 3.25},
+                {"x": 5.75, "y": 3.25},
+                {"x": 6.75, "y": 3.25},
+                {"x": 7.75, "y": 3.25},
+                {"x": 8.75, "y": 3.25},
+                {"x": 9.75, "y": 3.25},
+                {"x": 10.75, "y": 3.25},
+                {"x": 11.75, "y": 3.25},
+                {"x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"x": 0, "y": 4.25, "w": 1.25},
+                {"x": 1.25, "y": 4.25},
+                {"x": 2.25, "y": 4.25},
+                {"x": 3.25, "y": 4.25},
+                {"x": 4.25, "y": 4.25},
+                {"x": 5.25, "y": 4.25},
+                {"x": 6.25, "y": 4.25},
+                {"x": 7.25, "y": 4.25},
+                {"x": 8.25, "y": 4.25},
+                {"x": 9.25, "y": 4.25},
+                {"x": 10.25, "y": 4.25},
+                {"x": 11.25, "y": 4.25},
+                {"x": 12.25, "y": 4.25, "w": 1.75},
+                {"x": 14, "y": 4.25},
+
+                {"x": 16.25, "y": 4.25},
+
+                {"x": 0, "y": 5.25, "w": 1.25},
+                {"x": 1.25, "y": 5.25, "w": 1.25},
+                {"x": 2.5, "y": 5.25, "w": 1.25},
+                {"x": 3.75, "y": 5.25, "w": 6.25},
+                {"x": 10, "y": 5.25, "w": 1.25},
+                {"x": 11.25, "y": 5.25, "w": 1.25},
+                {"x": 12.5, "y": 5.25, "w": 1.25},
+                {"x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"x": 15.25, "y": 5.25},
+                {"x": 16.25, "y": 5.25},
+                {"x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"F13", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"F13", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2\"", "x":2, "y":1.25},
+                {"label":"3\u00a3", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'@", "x":11.75, "y":3.25},
+                {"label":"#~", "x":12.75, "y":3.25},
+                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":4.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
                 {"label":"\u2192", "x":17.25, "y":5.25}
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/studiokestra/galatea/rev1/rev1.h b/keyboards/studiokestra/galatea/rev1/rev1.h
index d393711292..55aed02db8 100644
--- a/keyboards/studiokestra/galatea/rev1/rev1.h
+++ b/keyboards/studiokestra/galatea/rev1/rev1.h
@@ -18,32 +18,99 @@
 
 #include "quantum.h"
 
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
+#define ___ KC_NO
+
+/*
+ *              ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+ *              │00 │   │01 │02 │12 │03 │ │13 │04 │14 │05 │ │15 │06 │16 │07 │ │17 │08 │18 │ Standard
+ *              └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+ *              ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐
+ *              │00 ││10 │01 │02 │12 ││03 │13 │04 │14 ││05 │15 │06 │16 ││07 │ │17 │08 │18 │ F13
+ *              └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐      ┌───────┐
+ *              │20 │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │26 │36 │27 │ │37 │28 │38 │      │36     │ 2u Backspace
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤      └─┬─────┤
+ *              │40   │50 │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │46 │47   │ │57 │48 │58 │        │     │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘     ┌──┴┐47  │ ISO Enter
+ *  LShift      │60    │70 │61 │71 │62 │72 │63 │73 │64 │74 │65 │75 │66      │                   │66 │    │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐       ┌─┴───┴────┤
+ * │80      │   │80  │90 │81 │91 │82 │92 │83 │93 │84 │94 │85 │95 │86    │87 │     │88 │       │86        │ 2.75u RShift
+ * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐   └──────────┘
+ *              │A0  │B0  │A1  │A3                      │A5  │B5  │A6  │A7  │ │B7 │A8 │B8 │
+ *              └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+ *              ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+ *              │A0   │B0 │A1   │A3                         │B5   │A6 │A7   │ Tsangan/WKL
+ *              └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ *              ┌────┬────┬───────────────────────────────────────┬────┬────┐
+ *              │A0  │B0  │A3                                     │A6  │A7  │ WK 10u Space
+ *              └────┴────┴───────────────────────────────────────┴────┴────┘
+ *              ┌─────┐   ┌───────────────────────────────────────┐   ┌─────┐
+ *              │A0   │   │A3                                     │   │A7   │ WKL 10u Space
+ *              └─────┘   └───────────────────────────────────────┘   └─────┘
  */
+
 #define LAYOUT_all(\
-    k0000, k0100,        k0001, k0002, k0102, k0003, k0103, k0004, k0104, k0005, k0105, k0006, k0106, k0007,    k0107, k0008, k0108, \
-    k0200, k0300, k0201, k0301, k0202, k0302, k0203, k0303, k0204, k0304, k0205, k0305, k0206, k0306, k0207,    k0307, k0208, k0308, \
-    k0400, k0500, k0401, k0501, k0402, k0502, k0403, k0503, k0404, k0504, k0405, k0505, k0406,        k0407,    k0507, k0408, k0508, \
-    k0600, k0700, k0601, k0701, k0602, k0702, k0603, k0703, k0604, k0704, k0605, k0705, k0606,                                       \
-    k0800, k0900, k0801, k0901, k0802, k0902, k0803, k0903, k0804, k0904, k0805, k0905, k0806,        k0807,           k0808,        \
-    k1000, k1100, k1001,                      k1003,                      k1005, k1105, k1006,        k1007,    k1107, k1008, k1108  \
+    k00, k10,      k01, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07,   k17, k08, k18, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27,   k37, k28, k38, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46,      k47,   k57, k48, k58, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66,                            \
+    k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86,      k87,        k88,      \
+    kA0, kB0, kA1,                kA3,                     kA5, kB5, kA6, kA7,   kB7, kA8, kB8  \
 ) { \
-    { k0000,  k0001,  k0002,  k0003,  k0004,  k0005,  k0006,  k0007,  k0008 }, \
-    { k0100,  KC_NO,  k0102,  k0103,  k0104,  k0105,  k0106,  k0107,  k0108 }, \
-    { k0200,  k0201,  k0202,  k0203,  k0204,  k0205,  k0206,  k0207,  k0208 }, \
-    { k0300,  k0301,  k0302,  k0303,  k0304,  k0305,  k0306,  k0307,  k0308 }, \
-    { k0400,  k0401,  k0402,  k0403,  k0404,  k0405,  k0406,  k0407,  k0408 }, \
-    { k0500,  k0501,  k0502,  k0503,  k0504,  k0505,  KC_NO,  k0507,  k0508 }, \
-    { k0600,  k0601,  k0602,  k0603,  k0604,  k0605,  k0606,  KC_NO,  KC_NO }, \
-    { k0700,  k0701,  k0702,  k0703,  k0704,  k0705,  KC_NO,  KC_NO,  KC_NO }, \
-    { k0800,  k0801,  k0802,  k0803,  k0804,  k0805,  k0806,  k0807,  k0808 }, \
-    { k0900,  k0901,  k0902,  k0903,  k0904,  k0905,  KC_NO,  KC_NO,  KC_NO }, \
-    { k1000,  k1001,  KC_NO,  k1003,  KC_NO,  k1005,  k1006,  k1007,  k1008 }, \
-    { k1100,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  k1105,  KC_NO,  k1107,  k1108 } \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
+    { k10, ___, k12, k13, k14, k15, k16, k17, k18 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
+    { k50, k51, k52, k53, k54, k55, ___, k57, k58 }, \
+    { k60, k61, k62, k63, k64, k65, k66, ___, ___ }, \
+    { k70, k71, k72, k73, k74, k75, ___, ___, ___ }, \
+    { k80, k81, k82, k83, k84, k85, k86, k87, k88 }, \
+    { k90, k91, k92, k93, k94, k95, ___, ___, ___ }, \
+    { kA0, kA1, ___, kA3, ___, kA5, kA6, kA7, kA8 }, \
+    { kB0, ___, ___, ___, ___, kB5, ___, kB7, kB8 }  \
+}
+
+#define LAYOUT_tkl_f13_ansi(\
+    k00, k10, k01, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07,   k17, k08, k18, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,   k37, k28, k38, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k47,   k57, k48, k58, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75,      k66,                  \
+    k80,      k81, k91, k82, k92, k83, k93, k84, k94, k85, k95,      k86,        k88,      \
+    kA0, kB0, kA1,                kA3,                kA5, kB5, kA6, kA7,   kB7, kA8, kB8  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
+    { k10, ___, k12, k13, k14, k15, k16, k17, k18 }, \
+    { k20, k21, k22, k23, k24, k25, k26, ___, k28 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
+    { k50, k51, k52, k53, k54, k55, ___, k57, k58 }, \
+    { k60, k61, k62, k63, k64, k65, k66, ___, ___ }, \
+    { k70, k71, k72, k73, k74, k75, ___, ___, ___ }, \
+    { k80, k81, k82, k83, k84, k85, k86, ___, k88 }, \
+    { ___, k91, k92, k93, k94, k95, ___, ___, ___ }, \
+    { kA0, kA1, ___, kA3, ___, kA5, kA6, kA7, kA8 }, \
+    { kB0, ___, ___, ___, ___, kB5, ___, kB7, kB8 }  \
+}
+
+#define LAYOUT_tkl_f13_iso(\
+    k00, k10, k01, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07,   k17, k08, k18, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,   k37, k28, k38, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46,        k57, k48, k58, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k47, k66,                  \
+    k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95,      k86,        k88,      \
+    kA0, kB0, kA1,                kA3,                kA5, kB5, kA6, kA7,   kB7, kA8, kB8  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
+    { k10, ___, k12, k13, k14, k15, k16, k17, k18 }, \
+    { k20, k21, k22, k23, k24, k25, k26, ___, k28 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
+    { k50, k51, k52, k53, k54, k55, ___, k57, k58 }, \
+    { k60, k61, k62, k63, k64, k65, k66, ___, ___ }, \
+    { k70, k71, k72, k73, k74, k75, ___, ___, ___ }, \
+    { k80, k81, k82, k83, k84, k85, k86, ___, k88 }, \
+    { k90, k91, k92, k93, k94, k95, ___, ___, ___ }, \
+    { kA0, kA1, ___, kA3, ___, kA5, kA6, kA7, kA8 }, \
+    { kB0, ___, ___, ___, ___, kB5, ___, kB7, kB8 }  \
 }
diff --git a/keyboards/studiokestra/galatea/rev2/info.json b/keyboards/studiokestra/galatea/rev2/info.json
index 46e07d7a43..e3f31198fe 100644
--- a/keyboards/studiokestra/galatea/rev2/info.json
+++ b/keyboards/studiokestra/galatea/rev2/info.json
@@ -1,101 +1,308 @@
 {
     "keyboard_name": "Galatea",
     "url": "https://studiokestra.ca/galatea",
-    "maintainer": "Studio Kestra",
+    "maintainer": "studiokestra",
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0}, 
-                {"label":"F1", "x":1.25, "y":0}, 
-                {"label":"F2", "x":2.25, "y":0}, 
-                {"label":"F3", "x":3.25, "y":0}, 
-                {"label":"F4", "x":4.25, "y":0}, 
-                {"label":"F5", "x":5.5, "y":0}, 
-                {"label":"F6", "x":6.5, "y":0}, 
-                {"label":"F7", "x":7.5, "y":0}, 
-                {"label":"F8", "x":8.5, "y":0}, 
-                {"label":"F9", "x":9.75, "y":0}, 
-                {"label":"F10", "x":10.75, "y":0}, 
-                {"label":"F11", "x":11.75, "y":0}, 
-                {"label":"F12", "x":12.75, "y":0}, 
-                {"label":"F13", "x":14, "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":"~", "x":0, "y":1.25}, 
-                {"label":"!", "x":1, "y":1.25}, 
-                {"label":"@", "x":2, "y":1.25}, 
-                {"label":"#", "x":3, "y":1.25}, 
-                {"label":"$", "x":4, "y":1.25}, 
-                {"label":"%", "x":5, "y":1.25}, 
-                {"label":"^", "x":6, "y":1.25}, 
-                {"label":"&", "x":7, "y":1.25}, 
-                {"label":"*", "x":8, "y":1.25}, 
-                {"label":"(", "x":9, "y":1.25}, 
-                {"label":")", "x":10, "y":1.25}, 
-                {"label":"_", "x":11, "y":1.25}, 
-                {"label":"+", "x":12, "y":1.25}, 
-                {"label":"|", "x":13, "y":1.25}, 
-                {"label":"Delete", "x":14, "y":1.25}, 
-                {"label":"Insert", "x":15.25, "y":1.25}, 
-                {"label":"Home", "x":16.25, "y":1.25}, 
-                {"label":"PgUp", "x":17.25, "y":1.25}, 
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5}, 
-                {"label":"Q", "x":1.5, "y":2.25}, 
-                {"label":"W", "x":2.5, "y":2.25}, 
-                {"label":"E", "x":3.5, "y":2.25}, 
-                {"label":"R", "x":4.5, "y":2.25}, 
-                {"label":"T", "x":5.5, "y":2.25}, 
-                {"label":"Y", "x":6.5, "y":2.25}, 
-                {"label":"U", "x":7.5, "y":2.25}, 
-                {"label":"I", "x":8.5, "y":2.25}, 
-                {"label":"O", "x":9.5, "y":2.25}, 
-                {"label":"P", "x":10.5, "y":2.25}, 
-                {"label":"{", "x":11.5, "y":2.25}, 
-                {"label":"}", "x":12.5, "y":2.25}, 
-                {"label":"Backspace", "x":13.5, "y":2.25, "w":1.5}, 
-                {"label":"Delete", "x":15.25, "y":2.25}, 
-                {"label":"End", "x":16.25, "y":2.25}, 
-                {"label":"PgDn", "x":17.25, "y":2.25}, 
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, 
-                {"label":"A", "x":1.75, "y":3.25}, 
-                {"label":"S", "x":2.75, "y":3.25}, 
-                {"label":"D", "x":3.75, "y":3.25}, 
-                {"label":"F", "x":4.75, "y":3.25}, 
-                {"label":"G", "x":5.75, "y":3.25}, 
-                {"label":"H", "x":6.75, "y":3.25}, 
-                {"label":"J", "x":7.75, "y":3.25}, 
-                {"label":"K", "x":8.75, "y":3.25}, 
-                {"label":"L", "x":9.75, "y":3.25}, 
-                {"label":":", "x":10.75, "y":3.25}, 
-                {"label":"\"", "x":11.75, "y":3.25}, 
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, 
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25}, 
-                {"label":"|", "x":1.25, "y":4.25}, 
-                {"label":"Z", "x":2.25, "y":4.25}, 
-                {"label":"X", "x":3.25, "y":4.25}, 
-                {"label":"C", "x":4.25, "y":4.25}, 
-                {"label":"V", "x":5.25, "y":4.25}, 
-                {"label":"B", "x":6.25, "y":4.25}, 
-                {"label":"N", "x":7.25, "y":4.25}, 
-                {"label":"M", "x":8.25, "y":4.25}, 
-                {"label":"<", "x":9.25, "y":4.25}, 
-                {"label":">", "x":10.25, "y":4.25}, 
-                {"label":"?", "x":11.25, "y":4.25}, 
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, 
-                {"label":"\u2191", "x":16.25, "y":4.25}, 
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, 
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, 
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, 
-                {"x":3.75, "y":5.25, "w":6.25}, 
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25}, 
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25}, 
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25}, 
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, 
-                {"label":"\u2190", "x":15.25, "y":5.25}, 
-                {"label":"\u2193", "x":16.25, "y":5.25}, 
+                {"x": 0, "y": 0},
+
+                {"x": 1.25, "y": 0},
+                {"x": 2.25, "y": 0},
+                {"x": 3.25, "y": 0},
+                {"x": 4.25, "y": 0},
+                {"x": 5.5, "y": 0},
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+                {"x": 9.75, "y": 0},
+                {"x": 10.75, "y": 0},
+                {"x": 11.75, "y": 0},
+                {"x": 12.75, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
+
+                {"x": 0, "y": 1.25},
+                {"x": 1, "y": 1.25},
+                {"x": 2, "y": 1.25},
+                {"x": 3, "y": 1.25},
+                {"x": 4, "y": 1.25},
+                {"x": 5, "y": 1.25},
+                {"x": 6, "y": 1.25},
+                {"x": 7, "y": 1.25},
+                {"x": 8, "y": 1.25},
+                {"x": 9, "y": 1.25},
+                {"x": 10, "y": 1.25},
+                {"x": 11, "y": 1.25},
+                {"x": 12, "y": 1.25},
+                {"x": 13, "y": 1.25},
+                {"x": 14, "y": 1.25},
+
+                {"x": 15.25, "y": 1.25},
+                {"x": 16.25, "y": 1.25},
+                {"x": 17.25, "y": 1.25},
+
+                {"x": 0, "y": 2.25, "w": 1.5},
+                {"x": 1.5, "y": 2.25},
+                {"x": 2.5, "y": 2.25},
+                {"x": 3.5, "y": 2.25},
+                {"x": 4.5, "y": 2.25},
+                {"x": 5.5, "y": 2.25},
+                {"x": 6.5, "y": 2.25},
+                {"x": 7.5, "y": 2.25},
+                {"x": 8.5, "y": 2.25},
+                {"x": 9.5, "y": 2.25},
+                {"x": 10.5, "y": 2.25},
+                {"x": 11.5, "y": 2.25},
+                {"x": 12.5, "y": 2.25},
+                {"x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"x": 15.25, "y": 2.25},
+                {"x": 16.25, "y": 2.25},
+                {"x": 17.25, "y": 2.25},
+
+                {"x": 0, "y": 3.25, "w": 1.75},
+                {"x": 1.75, "y": 3.25},
+                {"x": 2.75, "y": 3.25},
+                {"x": 3.75, "y": 3.25},
+                {"x": 4.75, "y": 3.25},
+                {"x": 5.75, "y": 3.25},
+                {"x": 6.75, "y": 3.25},
+                {"x": 7.75, "y": 3.25},
+                {"x": 8.75, "y": 3.25},
+                {"x": 9.75, "y": 3.25},
+                {"x": 10.75, "y": 3.25},
+                {"x": 11.75, "y": 3.25},
+                {"x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"x": 0, "y": 4.25, "w": 1.25},
+                {"x": 1.25, "y": 4.25},
+                {"x": 2.25, "y": 4.25},
+                {"x": 3.25, "y": 4.25},
+                {"x": 4.25, "y": 4.25},
+                {"x": 5.25, "y": 4.25},
+                {"x": 6.25, "y": 4.25},
+                {"x": 7.25, "y": 4.25},
+                {"x": 8.25, "y": 4.25},
+                {"x": 9.25, "y": 4.25},
+                {"x": 10.25, "y": 4.25},
+                {"x": 11.25, "y": 4.25},
+                {"x": 12.25, "y": 4.25, "w": 1.75},
+                {"x": 14, "y": 4.25},
+
+                {"x": 16.25, "y": 4.25},
+
+                {"x": 0, "y": 5.25, "w": 1.25},
+                {"x": 1.25, "y": 5.25, "w": 1.25},
+                {"x": 2.5, "y": 5.25, "w": 1.25},
+                {"x": 3.75, "y": 5.25, "w": 6.25},
+                {"x": 10, "y": 5.25, "w": 1.25},
+                {"x": 11.25, "y": 5.25, "w": 1.25},
+                {"x": 12.5, "y": 5.25, "w": 1.25},
+                {"x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"x": 15.25, "y": 5.25},
+                {"x": 16.25, "y": 5.25},
+                {"x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"F13", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"F13", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2\"", "x":2, "y":1.25},
+                {"label":"3\u00a3", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'@", "x":11.75, "y":3.25},
+                {"label":"#~", "x":12.75, "y":3.25},
+                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":4.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
                 {"label":"\u2192", "x":17.25, "y":5.25}
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/studiokestra/galatea/rev2/rev2.h b/keyboards/studiokestra/galatea/rev2/rev2.h
index d393711292..55aed02db8 100644
--- a/keyboards/studiokestra/galatea/rev2/rev2.h
+++ b/keyboards/studiokestra/galatea/rev2/rev2.h
@@ -18,32 +18,99 @@
 
 #include "quantum.h"
 
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
+#define ___ KC_NO
+
+/*
+ *              ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+ *              │00 │   │01 │02 │12 │03 │ │13 │04 │14 │05 │ │15 │06 │16 │07 │ │17 │08 │18 │ Standard
+ *              └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+ *              ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐
+ *              │00 ││10 │01 │02 │12 ││03 │13 │04 │14 ││05 │15 │06 │16 ││07 │ │17 │08 │18 │ F13
+ *              └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐      ┌───────┐
+ *              │20 │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │26 │36 │27 │ │37 │28 │38 │      │36     │ 2u Backspace
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤      └─┬─────┤
+ *              │40   │50 │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │46 │47   │ │57 │48 │58 │        │     │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘     ┌──┴┐47  │ ISO Enter
+ *  LShift      │60    │70 │61 │71 │62 │72 │63 │73 │64 │74 │65 │75 │66      │                   │66 │    │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐       ┌─┴───┴────┤
+ * │80      │   │80  │90 │81 │91 │82 │92 │83 │93 │84 │94 │85 │95 │86    │87 │     │88 │       │86        │ 2.75u RShift
+ * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐   └──────────┘
+ *              │A0  │B0  │A1  │A3                      │A5  │B5  │A6  │A7  │ │B7 │A8 │B8 │
+ *              └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+ *              ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+ *              │A0   │B0 │A1   │A3                         │B5   │A6 │A7   │ Tsangan/WKL
+ *              └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ *              ┌────┬────┬───────────────────────────────────────┬────┬────┐
+ *              │A0  │B0  │A3                                     │A6  │A7  │ WK 10u Space
+ *              └────┴────┴───────────────────────────────────────┴────┴────┘
+ *              ┌─────┐   ┌───────────────────────────────────────┐   ┌─────┐
+ *              │A0   │   │A3                                     │   │A7   │ WKL 10u Space
+ *              └─────┘   └───────────────────────────────────────┘   └─────┘
  */
+
 #define LAYOUT_all(\
-    k0000, k0100,        k0001, k0002, k0102, k0003, k0103, k0004, k0104, k0005, k0105, k0006, k0106, k0007,    k0107, k0008, k0108, \
-    k0200, k0300, k0201, k0301, k0202, k0302, k0203, k0303, k0204, k0304, k0205, k0305, k0206, k0306, k0207,    k0307, k0208, k0308, \
-    k0400, k0500, k0401, k0501, k0402, k0502, k0403, k0503, k0404, k0504, k0405, k0505, k0406,        k0407,    k0507, k0408, k0508, \
-    k0600, k0700, k0601, k0701, k0602, k0702, k0603, k0703, k0604, k0704, k0605, k0705, k0606,                                       \
-    k0800, k0900, k0801, k0901, k0802, k0902, k0803, k0903, k0804, k0904, k0805, k0905, k0806,        k0807,           k0808,        \
-    k1000, k1100, k1001,                      k1003,                      k1005, k1105, k1006,        k1007,    k1107, k1008, k1108  \
+    k00, k10,      k01, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07,   k17, k08, k18, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27,   k37, k28, k38, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46,      k47,   k57, k48, k58, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66,                            \
+    k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86,      k87,        k88,      \
+    kA0, kB0, kA1,                kA3,                     kA5, kB5, kA6, kA7,   kB7, kA8, kB8  \
 ) { \
-    { k0000,  k0001,  k0002,  k0003,  k0004,  k0005,  k0006,  k0007,  k0008 }, \
-    { k0100,  KC_NO,  k0102,  k0103,  k0104,  k0105,  k0106,  k0107,  k0108 }, \
-    { k0200,  k0201,  k0202,  k0203,  k0204,  k0205,  k0206,  k0207,  k0208 }, \
-    { k0300,  k0301,  k0302,  k0303,  k0304,  k0305,  k0306,  k0307,  k0308 }, \
-    { k0400,  k0401,  k0402,  k0403,  k0404,  k0405,  k0406,  k0407,  k0408 }, \
-    { k0500,  k0501,  k0502,  k0503,  k0504,  k0505,  KC_NO,  k0507,  k0508 }, \
-    { k0600,  k0601,  k0602,  k0603,  k0604,  k0605,  k0606,  KC_NO,  KC_NO }, \
-    { k0700,  k0701,  k0702,  k0703,  k0704,  k0705,  KC_NO,  KC_NO,  KC_NO }, \
-    { k0800,  k0801,  k0802,  k0803,  k0804,  k0805,  k0806,  k0807,  k0808 }, \
-    { k0900,  k0901,  k0902,  k0903,  k0904,  k0905,  KC_NO,  KC_NO,  KC_NO }, \
-    { k1000,  k1001,  KC_NO,  k1003,  KC_NO,  k1005,  k1006,  k1007,  k1008 }, \
-    { k1100,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  k1105,  KC_NO,  k1107,  k1108 } \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
+    { k10, ___, k12, k13, k14, k15, k16, k17, k18 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
+    { k50, k51, k52, k53, k54, k55, ___, k57, k58 }, \
+    { k60, k61, k62, k63, k64, k65, k66, ___, ___ }, \
+    { k70, k71, k72, k73, k74, k75, ___, ___, ___ }, \
+    { k80, k81, k82, k83, k84, k85, k86, k87, k88 }, \
+    { k90, k91, k92, k93, k94, k95, ___, ___, ___ }, \
+    { kA0, kA1, ___, kA3, ___, kA5, kA6, kA7, kA8 }, \
+    { kB0, ___, ___, ___, ___, kB5, ___, kB7, kB8 }  \
+}
+
+#define LAYOUT_tkl_f13_ansi(\
+    k00, k10, k01, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07,   k17, k08, k18, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,   k37, k28, k38, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k47,   k57, k48, k58, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75,      k66,                  \
+    k80,      k81, k91, k82, k92, k83, k93, k84, k94, k85, k95,      k86,        k88,      \
+    kA0, kB0, kA1,                kA3,                kA5, kB5, kA6, kA7,   kB7, kA8, kB8  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
+    { k10, ___, k12, k13, k14, k15, k16, k17, k18 }, \
+    { k20, k21, k22, k23, k24, k25, k26, ___, k28 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
+    { k50, k51, k52, k53, k54, k55, ___, k57, k58 }, \
+    { k60, k61, k62, k63, k64, k65, k66, ___, ___ }, \
+    { k70, k71, k72, k73, k74, k75, ___, ___, ___ }, \
+    { k80, k81, k82, k83, k84, k85, k86, ___, k88 }, \
+    { ___, k91, k92, k93, k94, k95, ___, ___, ___ }, \
+    { kA0, kA1, ___, kA3, ___, kA5, kA6, kA7, kA8 }, \
+    { kB0, ___, ___, ___, ___, kB5, ___, kB7, kB8 }  \
+}
+
+#define LAYOUT_tkl_f13_iso(\
+    k00, k10, k01, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07,   k17, k08, k18, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,   k37, k28, k38, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46,        k57, k48, k58, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k47, k66,                  \
+    k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95,      k86,        k88,      \
+    kA0, kB0, kA1,                kA3,                kA5, kB5, kA6, kA7,   kB7, kA8, kB8  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
+    { k10, ___, k12, k13, k14, k15, k16, k17, k18 }, \
+    { k20, k21, k22, k23, k24, k25, k26, ___, k28 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
+    { k50, k51, k52, k53, k54, k55, ___, k57, k58 }, \
+    { k60, k61, k62, k63, k64, k65, k66, ___, ___ }, \
+    { k70, k71, k72, k73, k74, k75, ___, ___, ___ }, \
+    { k80, k81, k82, k83, k84, k85, k86, ___, k88 }, \
+    { k90, k91, k92, k93, k94, k95, ___, ___, ___ }, \
+    { kA0, kA1, ___, kA3, ___, kA5, kA6, kA7, kA8 }, \
+    { kB0, ___, ___, ___, ___, kB5, ___, kB7, kB8 }  \
 }
diff --git a/keyboards/switchplate/southpaw_65/matrix.c b/keyboards/switchplate/southpaw_65/matrix.c
index e701d274f0..5895750f89 100644
--- a/keyboards/switchplate/southpaw_65/matrix.c
+++ b/keyboards/switchplate/southpaw_65/matrix.c
@@ -51,11 +51,14 @@ static void select_row(uint8_t row) {
 
 static uint32_t read_cols(void) {
     //Read column inputs. Pins 13-31 are used. Split across both ICs but they are sequential
-    uint32_t state_1 = pca9555_readPins(IC1, PCA9555_PORT1);
-    uint32_t state_2 = pca9555_readPins(IC2, PCA9555_PORT0);
-    uint32_t state_3 = pca9555_readPins(IC2, PCA9555_PORT1);
+    uint8_t state_1 = 0;
+    uint8_t state_2 = 0;
+    uint8_t state_3 = 0;
+    pca9555_readPins(IC2, PCA9555_PORT0, &state_1);
+    pca9555_readPins(IC2, PCA9555_PORT1, &state_2);
+    pca9555_readPins(IC1, PCA9555_PORT1, &state_3);
 
-    uint32_t state = (((state_3 & 0b01111111) << 12) | (state_2 << 4) | ((state_1 & 0b11110000) >> 4));
+    uint32_t state = ((((uint32_t)state_3 & 0b01111111) << 12) | ((uint32_t)state_2 << 4) | (((uint32_t)state_1 & 0b11110000) >> 4));
     return ~state;
 }
 
diff --git a/keyboards/hecomi/alpha/config.h b/keyboards/takashiski/hecomi/alpha/config.h
similarity index 100%
rename from keyboards/hecomi/alpha/config.h
rename to keyboards/takashiski/hecomi/alpha/config.h
diff --git a/keyboards/hecomi/alpha/info.json b/keyboards/takashiski/hecomi/alpha/info.json
similarity index 100%
rename from keyboards/hecomi/alpha/info.json
rename to keyboards/takashiski/hecomi/alpha/info.json
diff --git a/keyboards/hecomi/alpha/readme.md b/keyboards/takashiski/hecomi/alpha/readme.md
similarity index 100%
rename from keyboards/hecomi/alpha/readme.md
rename to keyboards/takashiski/hecomi/alpha/readme.md
diff --git a/keyboards/hecomi/alpha/rules.mk b/keyboards/takashiski/hecomi/alpha/rules.mk
similarity index 100%
rename from keyboards/hecomi/alpha/rules.mk
rename to keyboards/takashiski/hecomi/alpha/rules.mk
diff --git a/keyboards/hecomi/hecomi.c b/keyboards/takashiski/hecomi/hecomi.c
similarity index 100%
rename from keyboards/hecomi/hecomi.c
rename to keyboards/takashiski/hecomi/hecomi.c
diff --git a/keyboards/hecomi/hecomi.h b/keyboards/takashiski/hecomi/hecomi.h
similarity index 100%
rename from keyboards/hecomi/hecomi.h
rename to keyboards/takashiski/hecomi/hecomi.h
diff --git a/keyboards/hecomi/keymaps/default/keymap.c b/keyboards/takashiski/hecomi/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/hecomi/keymaps/default/keymap.c
rename to keyboards/takashiski/hecomi/keymaps/default/keymap.c
diff --git a/keyboards/hecomi/keymaps/default/readme.md b/keyboards/takashiski/hecomi/keymaps/default/readme.md
similarity index 100%
rename from keyboards/hecomi/keymaps/default/readme.md
rename to keyboards/takashiski/hecomi/keymaps/default/readme.md
diff --git a/keyboards/hecomi/keymaps/kakunpc/config.h b/keyboards/takashiski/hecomi/keymaps/kakunpc/config.h
similarity index 100%
rename from keyboards/hecomi/keymaps/kakunpc/config.h
rename to keyboards/takashiski/hecomi/keymaps/kakunpc/config.h
diff --git a/keyboards/hecomi/keymaps/kakunpc/keymap.c b/keyboards/takashiski/hecomi/keymaps/kakunpc/keymap.c
similarity index 100%
rename from keyboards/hecomi/keymaps/kakunpc/keymap.c
rename to keyboards/takashiski/hecomi/keymaps/kakunpc/keymap.c
diff --git a/keyboards/hecomi/keymaps/kakunpc/readme.md b/keyboards/takashiski/hecomi/keymaps/kakunpc/readme.md
similarity index 100%
rename from keyboards/hecomi/keymaps/kakunpc/readme.md
rename to keyboards/takashiski/hecomi/keymaps/kakunpc/readme.md
diff --git a/keyboards/hecomi/readme.md b/keyboards/takashiski/hecomi/readme.md
similarity index 94%
rename from keyboards/hecomi/readme.md
rename to keyboards/takashiski/hecomi/readme.md
index 79a80f35e5..3d061659d5 100644
--- a/keyboards/hecomi/readme.md
+++ b/keyboards/takashiski/hecomi/readme.md
@@ -12,6 +12,6 @@ Hardware Availability: booth(@skyhigh_works)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make hecomi/alpha:default
+    make takashiski/hecomi/alpha:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/hecomi/rules.mk b/keyboards/takashiski/hecomi/rules.mk
similarity index 94%
rename from keyboards/hecomi/rules.mk
rename to keyboards/takashiski/hecomi/rules.mk
index b570db0d06..c46100f19e 100644
--- a/keyboards/hecomi/rules.mk
+++ b/keyboards/takashiski/hecomi/rules.mk
@@ -18,4 +18,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes
 
-DEFAULT_FOLDER = hecomi/alpha
+DEFAULT_FOLDER = takashiski/hecomi/alpha
diff --git a/keyboards/namecard2x4/.noci b/keyboards/takashiski/namecard2x4/.noci
similarity index 100%
rename from keyboards/namecard2x4/.noci
rename to keyboards/takashiski/namecard2x4/.noci
diff --git a/keyboards/namecard2x4/info.json b/keyboards/takashiski/namecard2x4/info.json
similarity index 100%
rename from keyboards/namecard2x4/info.json
rename to keyboards/takashiski/namecard2x4/info.json
diff --git a/keyboards/namecard2x4/keymaps/brainfuck/config.h b/keyboards/takashiski/namecard2x4/keymaps/brainfuck/config.h
similarity index 100%
rename from keyboards/namecard2x4/keymaps/brainfuck/config.h
rename to keyboards/takashiski/namecard2x4/keymaps/brainfuck/config.h
diff --git a/keyboards/namecard2x4/keymaps/brainfuck/keymap.c b/keyboards/takashiski/namecard2x4/keymaps/brainfuck/keymap.c
similarity index 100%
rename from keyboards/namecard2x4/keymaps/brainfuck/keymap.c
rename to keyboards/takashiski/namecard2x4/keymaps/brainfuck/keymap.c
diff --git a/keyboards/namecard2x4/keymaps/brainfuck/readme.md b/keyboards/takashiski/namecard2x4/keymaps/brainfuck/readme.md
similarity index 100%
rename from keyboards/namecard2x4/keymaps/brainfuck/readme.md
rename to keyboards/takashiski/namecard2x4/keymaps/brainfuck/readme.md
diff --git a/keyboards/namecard2x4/keymaps/default/keymap.c b/keyboards/takashiski/namecard2x4/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/namecard2x4/keymaps/default/keymap.c
rename to keyboards/takashiski/namecard2x4/keymaps/default/keymap.c
diff --git a/keyboards/namecard2x4/keymaps/default/readme.md b/keyboards/takashiski/namecard2x4/keymaps/default/readme.md
similarity index 100%
rename from keyboards/namecard2x4/keymaps/default/readme.md
rename to keyboards/takashiski/namecard2x4/keymaps/default/readme.md
diff --git a/keyboards/namecard2x4/namecard2x4.c b/keyboards/takashiski/namecard2x4/namecard2x4.c
similarity index 100%
rename from keyboards/namecard2x4/namecard2x4.c
rename to keyboards/takashiski/namecard2x4/namecard2x4.c
diff --git a/keyboards/namecard2x4/namecard2x4.h b/keyboards/takashiski/namecard2x4/namecard2x4.h
similarity index 100%
rename from keyboards/namecard2x4/namecard2x4.h
rename to keyboards/takashiski/namecard2x4/namecard2x4.h
diff --git a/keyboards/namecard2x4/readme.md b/keyboards/takashiski/namecard2x4/readme.md
similarity index 95%
rename from keyboards/namecard2x4/readme.md
rename to keyboards/takashiski/namecard2x4/readme.md
index ec98bc6736..165940bceb 100644
--- a/keyboards/namecard2x4/readme.md
+++ b/keyboards/takashiski/namecard2x4/readme.md
@@ -18,7 +18,7 @@ Keyboard Maintainer: [takashiski](https://github.com/takashiski)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make namecard2x4:default
+    make takashiski/namecard2x4:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
diff --git a/keyboards/namecard2x4/rev1/.noci b/keyboards/takashiski/namecard2x4/rev1/.noci
similarity index 100%
rename from keyboards/namecard2x4/rev1/.noci
rename to keyboards/takashiski/namecard2x4/rev1/.noci
diff --git a/keyboards/namecard2x4/rev1/config.h b/keyboards/takashiski/namecard2x4/rev1/config.h
similarity index 100%
rename from keyboards/namecard2x4/rev1/config.h
rename to keyboards/takashiski/namecard2x4/rev1/config.h
diff --git a/keyboards/namecard2x4/rev1/rules.mk b/keyboards/takashiski/namecard2x4/rev1/rules.mk
similarity index 100%
rename from keyboards/namecard2x4/rev1/rules.mk
rename to keyboards/takashiski/namecard2x4/rev1/rules.mk
diff --git a/keyboards/namecard2x4/rev2/config.h b/keyboards/takashiski/namecard2x4/rev2/config.h
similarity index 100%
rename from keyboards/namecard2x4/rev2/config.h
rename to keyboards/takashiski/namecard2x4/rev2/config.h
diff --git a/keyboards/namecard2x4/rev2/rules.mk b/keyboards/takashiski/namecard2x4/rev2/rules.mk
similarity index 100%
rename from keyboards/namecard2x4/rev2/rules.mk
rename to keyboards/takashiski/namecard2x4/rev2/rules.mk
diff --git a/keyboards/namecard2x4/rules.mk b/keyboards/takashiski/namecard2x4/rules.mk
similarity index 93%
rename from keyboards/namecard2x4/rules.mk
rename to keyboards/takashiski/namecard2x4/rules.mk
index b1f04b15ec..e0f4e62f04 100644
--- a/keyboards/namecard2x4/rules.mk
+++ b/keyboards/takashiski/namecard2x4/rules.mk
@@ -18,4 +18,4 @@ AUDIO_ENABLE = no           # Audio output
 
 #RGBLIGHT_ENABLE = yes # uncomment if you want addressable led strips
 
-DEFAULT_FOLDER = namecard2x4/rev2
+DEFAULT_FOLDER = takashiski/namecard2x4/rev2
diff --git a/keyboards/otaku_split/rev0/.noci b/keyboards/takashiski/otaku_split/rev0/.noci
similarity index 100%
rename from keyboards/otaku_split/rev0/.noci
rename to keyboards/takashiski/otaku_split/rev0/.noci
diff --git a/keyboards/otaku_split/rev0/config.h b/keyboards/takashiski/otaku_split/rev0/config.h
similarity index 100%
rename from keyboards/otaku_split/rev0/config.h
rename to keyboards/takashiski/otaku_split/rev0/config.h
diff --git a/keyboards/otaku_split/rev0/info.json b/keyboards/takashiski/otaku_split/rev0/info.json
similarity index 100%
rename from keyboards/otaku_split/rev0/info.json
rename to keyboards/takashiski/otaku_split/rev0/info.json
diff --git a/keyboards/otaku_split/rev0/keymaps/default/keymap.c b/keyboards/takashiski/otaku_split/rev0/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/otaku_split/rev0/keymaps/default/keymap.c
rename to keyboards/takashiski/otaku_split/rev0/keymaps/default/keymap.c
diff --git a/keyboards/otaku_split/rev0/keymaps/default/readme.md b/keyboards/takashiski/otaku_split/rev0/keymaps/default/readme.md
similarity index 100%
rename from keyboards/otaku_split/rev0/keymaps/default/readme.md
rename to keyboards/takashiski/otaku_split/rev0/keymaps/default/readme.md
diff --git a/keyboards/otaku_split/rev0/keymaps/sample/keymap.c b/keyboards/takashiski/otaku_split/rev0/keymaps/sample/keymap.c
similarity index 100%
rename from keyboards/otaku_split/rev0/keymaps/sample/keymap.c
rename to keyboards/takashiski/otaku_split/rev0/keymaps/sample/keymap.c
diff --git a/keyboards/otaku_split/rev0/keymaps/sample/readme.md b/keyboards/takashiski/otaku_split/rev0/keymaps/sample/readme.md
similarity index 100%
rename from keyboards/otaku_split/rev0/keymaps/sample/readme.md
rename to keyboards/takashiski/otaku_split/rev0/keymaps/sample/readme.md
diff --git a/keyboards/otaku_split/rev0/readme.md b/keyboards/takashiski/otaku_split/rev0/readme.md
similarity index 94%
rename from keyboards/otaku_split/rev0/readme.md
rename to keyboards/takashiski/otaku_split/rev0/readme.md
index 9103843d5d..53efbd85f8 100644
--- a/keyboards/otaku_split/rev0/readme.md
+++ b/keyboards/takashiski/otaku_split/rev0/readme.md
@@ -11,6 +11,6 @@ Hardware Availability: https://skyhigh-works.booth.pm/items/1365150
 
 Make example for this keyboard (after setting up your build environment):
 
-    make otaku_split/rev0:default
+    make takashiski/otaku_split/rev0:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/otaku_split/rev0/rev0.c b/keyboards/takashiski/otaku_split/rev0/rev0.c
similarity index 100%
rename from keyboards/otaku_split/rev0/rev0.c
rename to keyboards/takashiski/otaku_split/rev0/rev0.c
diff --git a/keyboards/otaku_split/rev0/rev0.h b/keyboards/takashiski/otaku_split/rev0/rev0.h
similarity index 100%
rename from keyboards/otaku_split/rev0/rev0.h
rename to keyboards/takashiski/otaku_split/rev0/rev0.h
diff --git a/keyboards/otaku_split/rev0/rules.mk b/keyboards/takashiski/otaku_split/rev0/rules.mk
similarity index 100%
rename from keyboards/otaku_split/rev0/rules.mk
rename to keyboards/takashiski/otaku_split/rev0/rules.mk
diff --git a/keyboards/otaku_split/rev1/config.h b/keyboards/takashiski/otaku_split/rev1/config.h
similarity index 100%
rename from keyboards/otaku_split/rev1/config.h
rename to keyboards/takashiski/otaku_split/rev1/config.h
diff --git a/keyboards/otaku_split/rev1/info.json b/keyboards/takashiski/otaku_split/rev1/info.json
similarity index 100%
rename from keyboards/otaku_split/rev1/info.json
rename to keyboards/takashiski/otaku_split/rev1/info.json
diff --git a/keyboards/otaku_split/rev1/keymaps/default/keymap.c b/keyboards/takashiski/otaku_split/rev1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/otaku_split/rev1/keymaps/default/keymap.c
rename to keyboards/takashiski/otaku_split/rev1/keymaps/default/keymap.c
diff --git a/keyboards/otaku_split/rev1/keymaps/default/readme.md b/keyboards/takashiski/otaku_split/rev1/keymaps/default/readme.md
similarity index 100%
rename from keyboards/otaku_split/rev1/keymaps/default/readme.md
rename to keyboards/takashiski/otaku_split/rev1/keymaps/default/readme.md
diff --git a/keyboards/otaku_split/rev1/keymaps/sample/keymap.c b/keyboards/takashiski/otaku_split/rev1/keymaps/sample/keymap.c
similarity index 100%
rename from keyboards/otaku_split/rev1/keymaps/sample/keymap.c
rename to keyboards/takashiski/otaku_split/rev1/keymaps/sample/keymap.c
diff --git a/keyboards/otaku_split/rev1/keymaps/sample/readme.md b/keyboards/takashiski/otaku_split/rev1/keymaps/sample/readme.md
similarity index 100%
rename from keyboards/otaku_split/rev1/keymaps/sample/readme.md
rename to keyboards/takashiski/otaku_split/rev1/keymaps/sample/readme.md
diff --git a/keyboards/otaku_split/rev1/readme.md b/keyboards/takashiski/otaku_split/rev1/readme.md
similarity index 95%
rename from keyboards/otaku_split/rev1/readme.md
rename to keyboards/takashiski/otaku_split/rev1/readme.md
index 592c82641e..1c1ff5656a 100644
--- a/keyboards/otaku_split/rev1/readme.md
+++ b/keyboards/takashiski/otaku_split/rev1/readme.md
@@ -14,6 +14,6 @@ Hardware Availability: https://skyhigh-works.booth.pm/items/1398595
 
 Make example for this keyboard (after setting up your build environment):
 
-    make otaku_split/rev1:default
+    make takashiski/otaku_split/rev1:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/otaku_split/rev1/rev1.c b/keyboards/takashiski/otaku_split/rev1/rev1.c
similarity index 100%
rename from keyboards/otaku_split/rev1/rev1.c
rename to keyboards/takashiski/otaku_split/rev1/rev1.c
diff --git a/keyboards/otaku_split/rev1/rev1.h b/keyboards/takashiski/otaku_split/rev1/rev1.h
similarity index 100%
rename from keyboards/otaku_split/rev1/rev1.h
rename to keyboards/takashiski/otaku_split/rev1/rev1.h
diff --git a/keyboards/otaku_split/rev1/rules.mk b/keyboards/takashiski/otaku_split/rev1/rules.mk
similarity index 100%
rename from keyboards/otaku_split/rev1/rules.mk
rename to keyboards/takashiski/otaku_split/rev1/rules.mk
diff --git a/keyboards/tkc/portico75/config.h b/keyboards/tkc/portico75/config.h
new file mode 100644
index 0000000000..48be10a427
--- /dev/null
+++ b/keyboards/tkc/portico75/config.h
@@ -0,0 +1,179 @@
+/*
+Copyright 2021 Terry Mathews
+
+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"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x544B // TK
+#define PRODUCT_ID      0x0011
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    TKC
+#define PRODUCT         Portico75
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 15
+
+#define MATRIX_ROW_PINS \
+    { B0, E6, F0, F1, D3, D2 }
+#define MATRIX_COL_PINS \
+    { F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, B3, B7 }
+
+/*Rotary Encoder Pins*/
+#define ENCODERS_PAD_A \
+    { B1 }
+#define ENCODERS_PAD_B \
+    { B2 }
+
+/*Sets the number of pulses per increment*/
+#define ENCODER_RESOLUTION 2
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+#ifdef RGB_MATRIX_ENABLE
+#    define RGB_MATRIX_LED_PROCESS_LIMIT 4
+#    define RGB_MATRIX_LED_FLUSH_LIMIT 26
+#    define DEBOUNCE 3
+#    define RGB_DISABLE_AFTER_TIMEOUT 0     // number of ticks to wait until disabling effects
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
+#    define RGB_MATRIX_KEYPRESSES
+
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+// #    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+// #    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+// #    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+// #    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+// #    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+// #    define ENABLE_RGB_MATRIX_SPLASH
+// #    define ENABLE_RGB_MATRIX_MULTISPLASH
+// #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+// #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
+#    define DRIVER_ADDR_1 0b0110000
+#    define DRIVER_COUNT 1
+#    define DRIVER_1_LED_TOTAL 98
+#    define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
+#    define DRIVER_INDICATOR_LED_TOTAL 0
+#else
+// WT_RGB IS31FL3741 driver code
+#    define DRIVER_COUNT 1
+#    define DRIVER_LED_TOTAL 98
+
+#    define RGB_BACKLIGHT_ENABLED 1
+
+// This conditionally compiles the backlight code for Portico75 specifics
+#    define RGB_BACKLIGHT_PORTICO75
+
+// disable backlight when USB suspended (PC sleep/hibernate/shutdown)
+#    define RGB_BACKLIGHT_DISABLE_WHEN_USB_SUSPENDED 1
+
+// disable backlight after timeout in minutes, 0 = no timeout
+#    define RGB_BACKLIGHT_DISABLE_AFTER_TIMEOUT 0
+
+// the default brightness
+#    define RGB_BACKLIGHT_BRIGHTNESS 255
+
+// the default effect (RGB test)
+#    define RGB_BACKLIGHT_EFFECT 255
+
+// the default effect speed (0-3)
+#    define RGB_BACKLIGHT_EFFECT_SPEED 0
+
+// the default color1 and color2
+#    define RGB_BACKLIGHT_COLOR_1 \
+        { .h = 0, .s = 255 }
+#    define RGB_BACKLIGHT_COLOR_2 \
+        { .h = 127, .s = 255 }
+
+#    define RGB_BACKLIGHT_USE_SPLIT_BACKSPACE 0
+#    define RGB_BACKLIGHT_USE_SPLIT_LEFT_SHIFT 0
+#    define RGB_BACKLIGHT_USE_SPLIT_RIGHT_SHIFT 0
+#    define RGB_BACKLIGHT_USE_7U_SPACEBAR 0
+#    define RGB_BACKLIGHT_USE_ISO_ENTER 0
+#    define RGB_BACKLIGHT_DISABLE_HHKB_BLOCKER_LEDS 0
+#    define RGB_BACKLIGHT_CAPS_LOCK_INDICATOR \
+        { .color = {.h = 0, .s = 0}, .index = 255 }
+#    define RGB_BACKLIGHT_LAYER_1_INDICATOR \
+        { .color = {.h = 0, .s = 0}, .index = 255 }
+#    define RGB_BACKLIGHT_LAYER_2_INDICATOR \
+        { .color = {.h = 0, .s = 0}, .index = 255 }
+#    define RGB_BACKLIGHT_LAYER_3_INDICATOR \
+        { .color = {.h = 0, .s = 0}, .index = 255 }
+
+// These define which keys in the matrix are alphas/mods
+// Used for backlight effects so colors are different for
+// alphas vs. mods
+// Each value is for a row, bit 0 is column 0
+// Alpha=0 Mod=1
+#    define RGB_BACKLIGHT_ALPHAS_MODS_ROW_0 0b0110000000000001
+#    define RGB_BACKLIGHT_ALPHAS_MODS_ROW_1 0b0110000000000001
+#    define RGB_BACKLIGHT_ALPHAS_MODS_ROW_2 0b0111000000000001
+#    define RGB_BACKLIGHT_ALPHAS_MODS_ROW_3 0b0111100000000001
+#    define RGB_BACKLIGHT_ALPHAS_MODS_ROW_4 0b1111111111111111
+
+// Backlight config starts after VIA's EEPROM usage,
+// dynamic keymaps start after this.
+#    define VIA_EEPROM_CUSTOM_CONFIG_SIZE 31
+
+// VIA lighting is handled by the keyboard-level code
+#    define VIA_CUSTOM_LIGHTING_ENABLE
+#endif
diff --git a/keyboards/tkc/portico75/info.json b/keyboards/tkc/portico75/info.json
new file mode 100644
index 0000000000..5aaf21ffcc
--- /dev/null
+++ b/keyboards/tkc/portico75/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "TKC Portico75", 
+    "url": "", 
+    "maintainer": "TerryMathews",
+    "layouts": {
+        "LAYOUT_75_ansi": {
+            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"Del", "x":14, "y":0}, {"label":"Mute", "x":15, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"Home", "x":15, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"PgUp", "x":15, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"<i class='kb kb-Arrows-Up'></i>", "x":14.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Fn", "x":10, "y":5.25, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5.25, "w":1.5}, {"label":"<i class='kb kb-Arrows-Left'></i>", "x":13.25, "y":5.5}, {"label":"<i class='kb kb-Arrows-Down'></i>", "x":14.25, "y":5.5}, {"label":"<i class='kb kb-Arrows-Right'></i>", "x":15.25, "y":5.5}]
+        }
+    }
+}
diff --git a/keyboards/tkc/portico75/keymaps/default/keymap.c b/keyboards/tkc/portico75/keymaps/default/keymap.c
new file mode 100644
index 0000000000..9577164891
--- /dev/null
+++ b/keyboards/tkc/portico75/keymaps/default/keymap.c
@@ -0,0 +1,31 @@
+/*
+Copyright 2021 Terry Mathews
+
+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
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_75_ansi(
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_PSCR, KC_MUTE,
+        KC_GRV,     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC, KC_HOME,
+        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_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(1), KC_LEFT, KC_DOWN, KC_RGHT
+    )
+};
diff --git a/keyboards/tkc/portico75/keymaps/via/keymap.c b/keyboards/tkc/portico75/keymaps/via/keymap.c
new file mode 100644
index 0000000000..cee94c4a1d
--- /dev/null
+++ b/keyboards/tkc/portico75/keymaps/via/keymap.c
@@ -0,0 +1,109 @@
+/*
+Copyright 2021 Terry Mathews
+
+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
+
+#define ENCODERS 1
+
+#define ENCODERS_CW_KEY { { 14, 3 }  }
+#define ENCODERS_CCW_KEY  { { 14, 4 } }
+
+static uint8_t  encoder_state[ENCODERS] = {0};
+static keypos_t encoder_cw[ENCODERS]    = ENCODERS_CW_KEY;
+static keypos_t encoder_ccw[ENCODERS]   = ENCODERS_CCW_KEY;
+
+//  WT RGB-specific keys:
+//  EF_INC, EF_DEC,   // next/previous backlight effect
+//  H1_INC, H1_DEC,   // Color 1 hue increase/decrease
+//  S1_INC, S1_DEC,   // Color 1 saturation increase/decrease
+//  H2_INC, H2_DEC,   // Color 2 hue increase/decrease
+//  S2_INC, S2_DEC,   // Color 2 saturation increase/decrease
+//  BR_INC, BR_DEC,   // backlight brightness increase/decrease
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_75_via(
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_PSCR, KC_MUTE,
+        KC_GRV,     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC, KC_HOME,
+        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_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_VOLD,
+        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_VOLU,
+        KC_LCTL, KC_LGUI, KC_LALT,                    KC_SPC,                            KC_RALT,   MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+#ifdef RGB_BACKLIGHT_PORTICO75
+    [1] = LAYOUT_75_via(
+        _______,  EF_INC,  EF_DEC,  H1_INC,  H1_DEC,  S1_INC,  S1_DEC,  H2_INC,  H2_DEC,  S2_INC,  S2_DEC,  BR_INC,  BR_DEC, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                   _______,                            _______,   MO(1), _______, _______, _______
+    ),
+#else
+    [1] = LAYOUT_75_via(
+        _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                   _______,                            _______,   MO(1), _______, _______, _______
+    ),
+#endif
+    [2] = LAYOUT_75_via(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                   _______,                            _______, _______, _______, _______, _______
+    ),
+    [3] = LAYOUT_75_via(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                   _______,                            _______, _______, _______, _______, _______
+    )
+};
+
+void encoder_action_unregister(void) {
+    for (int index = 0; index < ENCODERS; ++index) {
+        if (encoder_state[index]) {
+            keyevent_t encoder_event = (keyevent_t) {
+                .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
+                .pressed = false,
+                .time = (timer_read() | 1)
+            };
+            encoder_state[index] = 0;
+            action_exec(encoder_event);
+        }
+    }
+}
+
+void encoder_action_register(uint8_t index, bool clockwise) {
+    keyevent_t encoder_event = (keyevent_t){.key = clockwise ? encoder_cw[index] : encoder_ccw[index], .pressed = true, .time = (timer_read() | 1)};
+    encoder_state[index]     = (clockwise ^ 1) | (clockwise << 1);
+    action_exec(encoder_event);
+}
+
+void matrix_scan_user(void) { encoder_action_unregister(); }
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    encoder_action_register(index, clockwise);
+    return false;
+};
diff --git a/keyboards/tkc/portico75/keymaps/via/rules.mk b/keyboards/tkc/portico75/keymaps/via/rules.mk
new file mode 100644
index 0000000000..9680dd9373
--- /dev/null
+++ b/keyboards/tkc/portico75/keymaps/via/rules.mk
@@ -0,0 +1,11 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+RGB_MATRIX_ENABLE = no         # Use RGB matrix
+
+# project specific files
+SRC += keyboards/wilba_tech/wt_main.c \
+       keyboards/wilba_tech/wt_rgb_backlight.c \
+       quantum/color.c \
+       drivers/led/issi/is31fl3741.c
+
+QUANTUM_LIB_SRC += i2c_master.c
diff --git a/keyboards/tkc/portico75/portico75.c b/keyboards/tkc/portico75/portico75.c
new file mode 100644
index 0000000000..812345b384
--- /dev/null
+++ b/keyboards/tkc/portico75/portico75.c
@@ -0,0 +1,188 @@
+/*
+Copyright 2021 Terry Mathews
+
+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 "portico75.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+    {0, CS18_SW1, CS17_SW1, CS16_SW1},
+    {0, CS18_SW2, CS17_SW2, CS16_SW2},
+    {0, CS18_SW3, CS17_SW3, CS16_SW3},
+    {0, CS18_SW4, CS17_SW4, CS16_SW4},
+    {0, CS18_SW5, CS17_SW5, CS16_SW5},
+    {0, CS18_SW6, CS17_SW6, CS16_SW6},
+    {0, CS18_SW7, CS17_SW7, CS16_SW7},
+    {0, CS18_SW8, CS17_SW8, CS16_SW8},
+    {0, CS18_SW9, CS17_SW9, CS16_SW9},
+
+    {0, CS21_SW1, CS20_SW1, CS19_SW1},
+    {0, CS21_SW2, CS20_SW2, CS19_SW2},
+    {0, CS21_SW3, CS20_SW3, CS19_SW3},
+    {0, CS21_SW4, CS20_SW4, CS19_SW4},
+    {0, CS21_SW5, CS20_SW5, CS19_SW5},
+    {0, CS21_SW6, CS20_SW6, CS19_SW6}, //Encoder, NO_LED
+
+    {0, CS15_SW1, CS14_SW1, CS13_SW1},
+    {0, CS15_SW2, CS14_SW2, CS13_SW2},
+    {0, CS15_SW3, CS14_SW3, CS13_SW3},
+    {0, CS15_SW4, CS14_SW4, CS13_SW4},
+    {0, CS15_SW5, CS14_SW5, CS13_SW5},
+    {0, CS15_SW6, CS14_SW6, CS13_SW6},
+    {0, CS15_SW7, CS14_SW7, CS13_SW7},
+    {0, CS15_SW8, CS14_SW8, CS13_SW8},
+    {0, CS15_SW9, CS14_SW9, CS13_SW9},
+
+    {0, CS24_SW1, CS23_SW1, CS22_SW1},
+    {0, CS24_SW2, CS23_SW2, CS22_SW2},
+    {0, CS24_SW3, CS23_SW3, CS22_SW3},
+    {0, CS24_SW4, CS23_SW4, CS22_SW4},
+    {0, CS24_SW5, CS23_SW5, CS22_SW5},
+    {0, CS24_SW6, CS23_SW6, CS22_SW6},
+
+    {0, CS12_SW1, CS11_SW1, CS10_SW1},
+    {0, CS12_SW2, CS11_SW2, CS10_SW2},
+    {0, CS12_SW3, CS11_SW3, CS10_SW3},
+    {0, CS12_SW4, CS11_SW4, CS10_SW4},
+    {0, CS12_SW5, CS11_SW5, CS10_SW5},
+    {0, CS12_SW6, CS11_SW6, CS10_SW6},
+    {0, CS12_SW7, CS11_SW7, CS10_SW7},
+    {0, CS12_SW8, CS11_SW8, CS10_SW8},
+    {0, CS12_SW9, CS11_SW9, CS10_SW9},
+
+    {0, CS27_SW1, CS26_SW1, CS25_SW1},
+    {0, CS27_SW2, CS26_SW2, CS25_SW2},
+    {0, CS27_SW3, CS26_SW3, CS25_SW3},
+    {0, CS27_SW4, CS26_SW4, CS25_SW4},
+    {0, CS27_SW5, CS26_SW5, CS25_SW5},
+    {0, CS27_SW6, CS26_SW6, CS25_SW6},
+
+    {0, CS9_SW1, CS8_SW1, CS7_SW1},
+    {0, CS9_SW2, CS8_SW2, CS7_SW2},
+    {0, CS9_SW3, CS8_SW3, CS7_SW3},
+    {0, CS9_SW4, CS8_SW4, CS7_SW4},
+    {0, CS9_SW5, CS8_SW5, CS7_SW5},
+    {0, CS9_SW6, CS8_SW6, CS7_SW6},
+    {0, CS9_SW7, CS8_SW7, CS7_SW7},
+    {0, CS9_SW8, CS8_SW8, CS7_SW8},
+    {0, CS9_SW9, CS8_SW9, CS7_SW9},
+
+    {0, CS30_SW1, CS29_SW1, CS28_SW1},
+    {0, CS30_SW2, CS29_SW2, CS28_SW2},
+    {0, CS30_SW3, CS29_SW3, CS28_SW3},
+    {0, CS30_SW4, CS29_SW4, CS28_SW4},
+
+    {0, CS6_SW1, CS5_SW1, CS4_SW1},
+    {0, CS6_SW2, CS5_SW2, CS4_SW2},
+    {0, CS6_SW3, CS5_SW3, CS4_SW3},
+    {0, CS6_SW4, CS5_SW4, CS4_SW4},
+    {0, CS6_SW5, CS5_SW5, CS4_SW5},
+    {0, CS6_SW6, CS5_SW6, CS4_SW6},
+    {0, CS6_SW7, CS5_SW7, CS4_SW7},
+    {0, CS6_SW8, CS5_SW8, CS4_SW8},
+    {0, CS6_SW9, CS5_SW9, CS4_SW9},
+
+    {0, CS33_SW1, CS32_SW1, CS31_SW1},
+    {0, CS33_SW2, CS32_SW2, CS31_SW2},
+    {0, CS33_SW3, CS32_SW3, CS31_SW3},
+    {0, CS33_SW4, CS32_SW4, CS31_SW4},
+
+    {0, CS3_SW1, CS2_SW1, CS1_SW1},
+    {0, CS3_SW2, CS2_SW2, CS1_SW2},
+    {0, CS3_SW3, CS2_SW3, CS1_SW3},
+    {0, CS3_SW6, CS2_SW6, CS1_SW6},
+    {0, CS3_SW8, CS2_SW8, CS1_SW8},
+    {0, CS3_SW9, CS2_SW9, CS1_SW9},
+
+    {0, CS36_SW1, CS35_SW1, CS34_SW1},
+    {0, CS36_SW2, CS35_SW2, CS34_SW2},
+    {0, CS36_SW3, CS35_SW3, CS34_SW3},
+
+/*UNDERGLOW*/
+    {0, CS39_SW1, CS38_SW1, CS37_SW1},
+    {0, CS39_SW2, CS38_SW2, CS37_SW2},
+    {0, CS39_SW3, CS38_SW3, CS37_SW3},
+    {0, CS39_SW4, CS38_SW4, CS37_SW4},
+    {0, CS39_SW5, CS38_SW5, CS37_SW5},
+    {0, CS39_SW6, CS38_SW6, CS37_SW6},
+    {0, CS39_SW7, CS38_SW7, CS37_SW7},
+    {0, CS39_SW8, CS38_SW8, CS37_SW8},
+    {0, CS39_SW9, CS38_SW9, CS37_SW9},
+
+    {0, CS36_SW4, CS35_SW4, CS34_SW4},
+    {0, CS36_SW5, CS35_SW5, CS34_SW5},
+    {0, CS36_SW6, CS35_SW6, CS34_SW6},
+    {0, CS36_SW7, CS35_SW7, CS34_SW7},
+    {0, CS36_SW8, CS35_SW8, CS34_SW8},
+    {0, CS36_SW9, CS35_SW9, CS34_SW9},
+
+    {0, CS33_SW5, CS32_SW5, CS31_SW5},
+    {0, CS33_SW6, CS32_SW6, CS31_SW6},
+    {0, CS33_SW7, CS32_SW7, CS31_SW7},
+
+};
+led_config_t g_led_config = { {
+    {   0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14},
+    {  15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29},
+    {  30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44},
+    {  45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, NO_LED, NO_LED},
+    {  58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, NO_LED, NO_LED},
+    {  71, 72, 73, NO_LED, NO_LED, 74, NO_LED, NO_LED, NO_LED, 75, 76, 77, 78, 79, NO_LED},
+}, {
+    {0,0},{18,0},{33,0},{48,0},{62,0},{81,0},{96,0},{110,0},{125,0},{143,0},{158,0},{173,0},{187,0},{205,0},{224,0},
+    {0,15},{15,15},{29,15},{44,15},{59,15},{74,15},{88,15},{103,15},{118,15},{132,15},{147,15},{162,15},{176,15},{198,15},{224,15},
+    {4,26},{22,26},{37,26},{51,26},{66,26},{81,26},{96,26},{110,26},{125,26},{140,26},{154,26},{169,26},{183,26},{202,26},{224,26},
+    {5,38},{25,38},{40,38},{54,38},{69,38},{84,38},{98,38},{113,38},{128,38},{143,38},{157,38},{172,38},{197,38},
+    {9,49},{33,49},{48,49},{62,49},{77,49},{92,49},{107,49},{121,49},{136,49},{151,49},{165,49},{186,49},{209,52},
+    {2,61},{20,61},{39,61},{94,61},{151,61},{173,61},{195,64},{209,64},{224,64},
+    {2,0},{46,0},{90,0},{134,0},{178,0},{222,0},{224,2},{224,32},{224,62},{2,64},{46,64},{90,64},{134,64},{178,64},{222,64},{0,2},{0,32},{0,62},
+}, {
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+} };
+
+__attribute__ ((weak))
+void rgb_matrix_indicators_user(void)
+{
+    if (host_keyboard_led_state().caps_lock)
+    {
+        rgb_matrix_set_color(45, 0xFF, 0xFF, 0xFF);
+    }
+}
+#endif
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) {
+        return false;
+    }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code_delay(KC_VOLU, 10);
+        } else {
+            tap_code_delay(KC_VOLD, 10);
+        }
+    }
+    return true;
+}
+#endif
diff --git a/keyboards/tkc/portico75/portico75.h b/keyboards/tkc/portico75/portico75.h
new file mode 100644
index 0000000000..019fb07f75
--- /dev/null
+++ b/keyboards/tkc/portico75/portico75.h
@@ -0,0 +1,60 @@
+/*
+Copyright 2021 Terry Mathews
+
+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"
+
+#ifdef RGB_BACKLIGHT_PORTICO75
+#include "keyboards/wilba_tech/wt_rgb_backlight_keycodes.h"
+#include "via.h"
+#endif
+
+#define XXX KC_NO
+
+#define LAYOUT_75_ansi( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,           \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,           \
+    K50, K51, K52,           K55,                K59, K5A, K5B, K5C, K5D       \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, XXX }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, XXX, XXX }, \
+    { K50, K51, K52, XXX, XXX, K55, XXX, XXX, XXX, K59, K5A, K5B, K5C, K5D, XXX }  \
+}
+
+#define LAYOUT_75_via( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E, \
+    K50, K51, K52,           K55,                K59, K5A, K5B, K5C, K5D       \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, K3E }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, XXX, K4E }, \
+    { K50, K51, K52, XXX, XXX, K55, XXX, XXX, XXX, K59, K5A, K5B, K5C, K5D, XXX }  \
+}
diff --git a/keyboards/tkc/portico75/readme.md b/keyboards/tkc/portico75/readme.md
new file mode 100644
index 0000000000..3bb5ad319f
--- /dev/null
+++ b/keyboards/tkc/portico75/readme.md
@@ -0,0 +1,21 @@
+# TKC Portico75
+
+![TKC Portico75](https://i.imgur.com/Bkd0kYS.jpg)
+
+A 75% keyboard kit with per-key and underglow RGB lighting and an encoder knob.
+
+* Keyboard Maintainer: [TerryMathews](https://github.com/TerryMathews)
+* Hardware Supported: TKC Portico75 (ATmega32U4)
+* Hardware Availability: TBA
+
+Reset board into bootloader by holding down Esc key while plugging in USB-C cable.
+
+Make example for this keyboard (after setting up your build environment):
+
+    make tkc/portico75:default
+
+Flashing example for this keyboard:
+
+    make tkc/portico75:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/tkc/portico75/rules.mk b/keyboards/tkc/portico75/rules.mk
new file mode 100644
index 0000000000..e8a74c9026
--- /dev/null
+++ b/keyboards/tkc/portico75/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes         # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes          # Mouse keys
+EXTRAKEY_ENABLE = yes          # Audio control and System control
+CONSOLE_ENABLE = no            # Console for debug
+COMMAND_ENABLE = yes           # Commands for debug and configuration
+NKRO_ENABLE = yes              # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
+AUDIO_ENABLE = no              # Audio output
+RGB_MATRIX_ENABLE = yes        # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3741
+CIE1931_CURVE = yes
+ENCODER_ENABLE = yes
diff --git a/keyboards/viktus/sp111/rules.mk b/keyboards/viktus/sp111/rules.mk
index b779ef4cb2..fab90d4a88 100644
--- a/keyboards/viktus/sp111/rules.mk
+++ b/keyboards/viktus/sp111/rules.mk
@@ -22,5 +22,6 @@ LTO_ENABLE = yes            # Smaller (and slightly faster) firmware
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
+VPATH += drivers/gpio
 SRC += mcp23018.c matrix.c
 QUANTUM_LIB_SRC += i2c_master.c
diff --git a/keyboards/wheatfield/split75/info.json b/keyboards/wheatfield/split75/info.json
index 72c118d4b1..1d0609a378 100644
--- a/keyboards/wheatfield/split75/info.json
+++ b/keyboards/wheatfield/split75/info.json
@@ -5,6 +5,9 @@
     "layouts": {
         "LAYOUT": {
             "layout": [{"label":"ESC", "x":2.25, "y":0}, {"label":"F1", "x":3.25, "y":0}, {"label":"F2", "x":4.25, "y":0}, {"label":"F3", "x":5.25, "y":0}, {"label":"F4", "x":6.25, "y":0}, {"label":"F5", "x":7.25, "y":0}, {"label":"F6", "x":8.25, "y":0}, {"label":"F7", "x":10.25, "y":0}, {"label":"F8", "x":11.25, "y":0}, {"label":"F9", "x":12.25, "y":0}, {"label":"F10", "x":13.25, "y":0}, {"label":"F11", "x":14.25, "y":0}, {"label":"F12", "x":15.25, "y":0}, {"label":"Prt", "x":16.25, "y":0}, {"label":"Ins", "x":17.25, "y":0}, {"label":"Del", "x":18.25, "y":0}, {"label":"8", "x":0, "y":1}, {"label":"9", "x":1, "y":1}, {"label":"~", "x":2.25, "y":1}, {"label":"!", "x":3.25, "y":1}, {"label":"@", "x":4.25, "y":1}, {"label":"#", "x":5.25, "y":1}, {"label":"$", "x":6.25, "y":1}, {"label":"%", "x":7.25, "y":1}, {"label":"^", "x":8.25, "y":1}, {"label":"&", "x":10.25, "y":1}, {"label":"*", "x":11.25, "y":1}, {"label":"(", "x":12.25, "y":1}, {"label":")", "x":13.25, "y":1}, {"label":"_", "x":14.25, "y":1}, {"label":"+", "x":15.25, "y":1}, {"label":"Backspace", "x":16.25, "y":1, "w":2}, {"label":"Home", "x":18.25, "y":1}, {"label":"6", "x":0, "y":2}, {"label":"7", "x":1, "y":2}, {"label":"Tab", "x":2.25, "y":2, "w":1.5}, {"label":"Q", "x":3.75, "y":2}, {"label":"W", "x":4.75, "y":2}, {"label":"E", "x":5.75, "y":2}, {"label":"R", "x":6.75, "y":2}, {"label":"T", "x":7.75, "y":2}, {"label":"Y", "x":9.75, "y":2}, {"label":"U", "x":10.75, "y":2}, {"label":"I", "x":11.75, "y":2}, {"label":"O", "x":12.75, "y":2}, {"label":"P", "x":13.75, "y":2}, {"label":"{", "x":14.75, "y":2}, {"label":"}", "x":15.75, "y":2}, {"label":"|", "x":16.75, "y":2, "w":1.5}, {"label":"PgUp", "x":18.25, "y":2}, {"label":"4", "x":0, "y":3}, {"label":"5", "x":1, "y":3}, {"label":"Caps Lock", "x":2.25, "y":3, "w":1.75}, {"label":"A", "x":4, "y":3}, {"label":"S", "x":5, "y":3}, {"label":"D", "x":6, "y":3}, {"label":"F", "x":7, "y":3}, {"label":"G", "x":8, "y":3}, {"label":"H", "x":10, "y":3}, {"label":"J", "x":11, "y":3}, {"label":"K", "x":12, "y":3}, {"label":"L", "x":13, "y":3}, {"label":":", "x":14, "y":3}, {"label":"\"", "x":15, "y":3}, {"label":"Enter", "x":16, "y":3, "w":2.25}, {"label":"PgDn", "x":18.25, "y":3}, {"label":"2", "x":0, "y":4}, {"label":"3", "x":1, "y":4}, {"label":"Shift", "x":2.25, "y":4, "w":2.25}, {"label":"Z", "x":4.5, "y":4}, {"label":"X", "x":5.5, "y":4}, {"label":"C", "x":6.5, "y":4}, {"label":"V", "x":7.5, "y":4}, {"label":"B", "x":8.5, "y":4}, {"label":"N", "x":10.5, "y":4}, {"label":"M", "x":11.5, "y":4}, {"label":"<", "x":12.5, "y":4}, {"label":">", "x":13.5, "y":4}, {"label":"?", "x":14.5, "y":4}, {"label":"Shift", "x":15.5, "y":4, "w":1.75}, {"label":"\u2191", "x":17.25, "y":4}, {"label":"End", "x":18.25, "y":4}, {"label":"0", "x":0, "y":5}, {"label":"1", "x":1, "y":5}, {"label":"Ctrl", "x":2.25, "y":5, "w":1.25}, {"label":"Win", "x":3.5, "y":5, "w":1.25}, {"label":"Alt", "x":4.75, "y":5, "w":1.25}, {"x":6, "y":5, "w":2}, {"x":8, "y":5}, {"x":10, "y":5, "w":2.75}, {"label":"Alt", "x":12.75, "y":5, "w":1.25}, {"label":"Fn", "x":14, "y":5}, {"label":"Ctrl", "x":15, "y":5, "w":1.25}, {"label":"\u2190", "x":16.25, "y":5}, {"label":"\u2193", "x":17.25, "y":5}, {"label":"\u2192", "x":18.25, "y":5}]
+        },
+        "LAYOUT_iso": {
+            "layout": [{"label":"ESC", "x":2.25, "y":0}, {"label":"F1", "x":3.25, "y":0}, {"label":"F2", "x":4.25, "y":0}, {"label":"F3", "x":5.25, "y":0}, {"label":"F4", "x":6.25, "y":0}, {"label":"F5", "x":7.25, "y":0}, {"label":"F6", "x":8.25, "y":0}, {"label":"F7", "x":10.25, "y":0}, {"label":"F8", "x":11.25, "y":0}, {"label":"F9", "x":12.25, "y":0}, {"label":"F10", "x":13.25, "y":0}, {"label":"F11", "x":14.25, "y":0}, {"label":"F12", "x":15.25, "y":0}, {"label":"Prt", "x":16.25, "y":0}, {"label":"Ins", "x":17.25, "y":0}, {"label":"Del", "x":18.25, "y":0}, {"label":"8", "x":0, "y":1}, {"label":"9", "x":1, "y":1}, {"label":"~", "x":2.25, "y":1}, {"label":"!", "x":3.25, "y":1}, {"label":"@", "x":4.25, "y":1}, {"label":"#", "x":5.25, "y":1}, {"label":"$", "x":6.25, "y":1}, {"label":"%", "x":7.25, "y":1}, {"label":"^", "x":8.25, "y":1}, {"label":"&", "x":10.25, "y":1}, {"label":"*", "x":11.25, "y":1}, {"label":"(", "x":12.25, "y":1}, {"label":")", "x":13.25, "y":1}, {"label":"_", "x":14.25, "y":1}, {"label":"+", "x":15.25, "y":1}, {"label":"Backspace", "x":16.25, "y":1, "w":2}, {"label":"Home", "x":18.25, "y":1}, {"label":"6", "x":0, "y":2}, {"label":"7", "x":1, "y":2}, {"label":"Tab", "x":2.25, "y":2, "w":1.5}, {"label":"Q", "x":3.75, "y":2}, {"label":"W", "x":4.75, "y":2}, {"label":"E", "x":5.75, "y":2}, {"label":"R", "x":6.75, "y":2}, {"label":"T", "x":7.75, "y":2}, {"label":"Y", "x":9.75, "y":2}, {"label":"U", "x":10.75, "y":2}, {"label":"I", "x":11.75, "y":2}, {"label":"O", "x":12.75, "y":2}, {"label":"P", "x":13.75, "y":2}, {"label":"{", "x":14.75, "y":2}, {"label":"}", "x":15.75, "y":2}, {"label":"PgUp", "x":18.25, "y":2}, {"label":"4", "x":0, "y":3}, {"label":"5", "x":1, "y":3}, {"label":"Caps Lock", "x":2.25, "y":3, "w":1.75}, {"label":"A", "x":4, "y":3}, {"label":"S", "x":5, "y":3}, {"label":"D", "x":6, "y":3}, {"label":"F", "x":7, "y":3}, {"label":"G", "x":8, "y":3}, {"label":"H", "x":10, "y":3}, {"label":"J", "x":11, "y":3}, {"label":"K", "x":12, "y":3}, {"label":"L", "x":13, "y":3}, {"label":":", "x":14, "y":3}, {"label":"\"", "x":15, "y":3},  {"label":"'", "x":16, "y":3}, {"label":"Enter", "x":17, "y":2, "w":1.25, "h":2}, {"label":"PgDn", "x":18.25, "y":3}, {"label":"2", "x":0, "y":4}, {"label":"3", "x":1, "y":4}, {"label":"Shift", "x":2.25, "y":4, "w":1.25}, {"label":"|", "x":3.5, "y":4, "w":1}, {"label":"Z", "x":4.5, "y":4}, {"label":"X", "x":5.5, "y":4}, {"label":"C", "x":6.5, "y":4}, {"label":"V", "x":7.5, "y":4}, {"label":"B", "x":8.5, "y":4}, {"label":"N", "x":10.5, "y":4}, {"label":"M", "x":11.5, "y":4}, {"label":"<", "x":12.5, "y":4}, {"label":">", "x":13.5, "y":4}, {"label":"?", "x":14.5, "y":4}, {"label":"Shift", "x":15.5, "y":4, "w":1.75}, {"label":"\u2191", "x":17.25, "y":4}, {"label":"End", "x":18.25, "y":4}, {"label":"0", "x":0, "y":5}, {"label":"1", "x":1, "y":5}, {"label":"Ctrl", "x":2.25, "y":5, "w":1.25}, {"label":"Win", "x":3.5, "y":5, "w":1.25}, {"label":"Alt", "x":4.75, "y":5, "w":1.25}, {"x":6, "y":5, "w":2}, {"x":8, "y":5}, {"x":10, "y":5, "w":2.75}, {"label":"Alt", "x":12.75, "y":5, "w":1.25}, {"label":"Fn", "x":14, "y":5}, {"label":"Ctrl", "x":15, "y":5, "w":1.25}, {"label":"\u2190", "x":16.25, "y":5}, {"label":"\u2193", "x":17.25, "y":5}, {"label":"\u2192", "x":18.25, "y":5}]
         }
     }
 }
diff --git a/keyboards/wilba_tech/wt_rgb_backlight.c b/keyboards/wilba_tech/wt_rgb_backlight.c
index cc34a90c75..a696fe7ed4 100644
--- a/keyboards/wilba_tech/wt_rgb_backlight.c
+++ b/keyboards/wilba_tech/wt_rgb_backlight.c
@@ -31,6 +31,7 @@
     defined(RGB_BACKLIGHT_U80_A) || \
     defined(RGB_BACKLIGHT_DAWN60) || \
     defined(RGB_BACKLIGHT_PORTICO) || \
+	defined(RGB_BACKLIGHT_PORTICO75) || \
     defined(RGB_BACKLIGHT_WT60_B) || \
     defined(RGB_BACKLIGHT_WT60_BX) || \
     defined(RGB_BACKLIGHT_WT60_C) || \
@@ -89,6 +90,9 @@ LED_TYPE g_ws2812_leds[WS2812_LED_TOTAL];
 #elif defined(RGB_BACKLIGHT_NK87)
 #include "drivers/led/issi/is31fl3733.h"
 #define BACKLIGHT_LED_COUNT 128
+#elif defined(RGB_BACKLIGHT_PORTICO75)
+#include "drivers/led/issi/is31fl3741.h"
+#define BACKLIGHT_LED_COUNT 98
 #else
 #include "drivers/led/issi/is31fl3731.h"
 #if defined(RGB_BACKLIGHT_U80_A)
@@ -701,6 +705,135 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
     { 1, C9_16, C7_15, C6_15 },
     { 1, C8_16, C7_16, C6_16 }
 };
+
+#elif defined(RGB_BACKLIGHT_PORTICO75)
+// This is a 7-bit address, that gets left-shifted and bit 0
+// set to 0 for write, 1 for read (as per I2C protocol)
+#define ISSI_ADDR_1 0x30
+#define ISSI_ADDR_2
+
+const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |   R location
+ *   |   |      G location
+ *   |   |      |      B location
+ *   |   |      |      | */
+    {0, CS18_SW1, CS17_SW1, CS16_SW1},
+    {0, CS18_SW2, CS17_SW2, CS16_SW2},
+    {0, CS18_SW3, CS17_SW3, CS16_SW3},
+    {0, CS18_SW4, CS17_SW4, CS16_SW4},
+    {0, CS18_SW5, CS17_SW5, CS16_SW5},
+    {0, CS18_SW6, CS17_SW6, CS16_SW6},
+    {0, CS18_SW7, CS17_SW7, CS16_SW7},
+    {0, CS18_SW8, CS17_SW8, CS16_SW8},
+    {0, CS18_SW9, CS17_SW9, CS16_SW9},
+
+    {0, CS21_SW1, CS20_SW1, CS19_SW1},
+    {0, CS21_SW2, CS20_SW2, CS19_SW2},
+    {0, CS21_SW3, CS20_SW3, CS19_SW3},
+    {0, CS21_SW4, CS20_SW4, CS19_SW4},
+    {0, CS21_SW5, CS20_SW5, CS19_SW5},
+    {0, CS21_SW6, CS20_SW6, CS19_SW6}, //Encoder, NO_LED
+
+    {0, CS15_SW1, CS14_SW1, CS13_SW1},
+    {0, CS15_SW2, CS14_SW2, CS13_SW2},
+    {0, CS15_SW3, CS14_SW3, CS13_SW3},
+    {0, CS15_SW4, CS14_SW4, CS13_SW4},
+    {0, CS15_SW5, CS14_SW5, CS13_SW5},
+    {0, CS15_SW6, CS14_SW6, CS13_SW6},
+    {0, CS15_SW7, CS14_SW7, CS13_SW7},
+    {0, CS15_SW8, CS14_SW8, CS13_SW8},
+    {0, CS15_SW9, CS14_SW9, CS13_SW9},
+
+    {0, CS24_SW1, CS23_SW1, CS22_SW1},
+    {0, CS24_SW2, CS23_SW2, CS22_SW2},
+    {0, CS24_SW3, CS23_SW3, CS22_SW3},
+    {0, CS24_SW4, CS23_SW4, CS22_SW4},
+    {0, CS24_SW5, CS23_SW5, CS22_SW5},
+    {0, CS24_SW6, CS23_SW6, CS22_SW6},
+
+    {0, CS12_SW1, CS11_SW1, CS10_SW1},
+    {0, CS12_SW2, CS11_SW2, CS10_SW2},
+    {0, CS12_SW3, CS11_SW3, CS10_SW3},
+    {0, CS12_SW4, CS11_SW4, CS10_SW4},
+    {0, CS12_SW5, CS11_SW5, CS10_SW5},
+    {0, CS12_SW6, CS11_SW6, CS10_SW6},
+    {0, CS12_SW7, CS11_SW7, CS10_SW7},
+    {0, CS12_SW8, CS11_SW8, CS10_SW8},
+    {0, CS12_SW9, CS11_SW9, CS10_SW9},
+
+    {0, CS27_SW1, CS26_SW1, CS25_SW1},
+    {0, CS27_SW2, CS26_SW2, CS25_SW2},
+    {0, CS27_SW3, CS26_SW3, CS25_SW3},
+    {0, CS27_SW4, CS26_SW4, CS25_SW4},
+    {0, CS27_SW5, CS26_SW5, CS25_SW5},
+    {0, CS27_SW6, CS26_SW6, CS25_SW6},
+
+    {0, CS9_SW1, CS8_SW1, CS7_SW1},
+    {0, CS9_SW2, CS8_SW2, CS7_SW2},
+    {0, CS9_SW3, CS8_SW3, CS7_SW3},
+    {0, CS9_SW4, CS8_SW4, CS7_SW4},
+    {0, CS9_SW5, CS8_SW5, CS7_SW5},
+    {0, CS9_SW6, CS8_SW6, CS7_SW6},
+    {0, CS9_SW7, CS8_SW7, CS7_SW7},
+    {0, CS9_SW8, CS8_SW8, CS7_SW8},
+    {0, CS9_SW9, CS8_SW9, CS7_SW9},
+
+    {0, CS30_SW1, CS29_SW1, CS28_SW1},
+    {0, CS30_SW2, CS29_SW2, CS28_SW2},
+    {0, CS30_SW3, CS29_SW3, CS28_SW3},
+    {0, CS30_SW4, CS29_SW4, CS28_SW4},
+
+    {0, CS6_SW1, CS5_SW1, CS4_SW1},
+    {0, CS6_SW2, CS5_SW2, CS4_SW2},
+    {0, CS6_SW3, CS5_SW3, CS4_SW3},
+    {0, CS6_SW4, CS5_SW4, CS4_SW4},
+    {0, CS6_SW5, CS5_SW5, CS4_SW5},
+    {0, CS6_SW6, CS5_SW6, CS4_SW6},
+    {0, CS6_SW7, CS5_SW7, CS4_SW7},
+    {0, CS6_SW8, CS5_SW8, CS4_SW8},
+    {0, CS6_SW9, CS5_SW9, CS4_SW9},
+
+    {0, CS33_SW1, CS32_SW1, CS31_SW1},
+    {0, CS33_SW2, CS32_SW2, CS31_SW2},
+    {0, CS33_SW3, CS32_SW3, CS31_SW3},
+    {0, CS33_SW4, CS32_SW4, CS31_SW4},
+
+    {0, CS3_SW1, CS2_SW1, CS1_SW1},
+    {0, CS3_SW2, CS2_SW2, CS1_SW2},
+    {0, CS3_SW3, CS2_SW3, CS1_SW3},
+    {0, CS3_SW6, CS2_SW6, CS1_SW6},
+    {0, CS3_SW8, CS2_SW8, CS1_SW8},
+    {0, CS3_SW9, CS2_SW9, CS1_SW9},
+
+    {0, CS36_SW1, CS35_SW1, CS34_SW1},
+    {0, CS36_SW2, CS35_SW2, CS34_SW2},
+    {0, CS36_SW3, CS35_SW3, CS34_SW3},
+
+/*UNDERGLOW*/
+    {0, CS39_SW1, CS38_SW1, CS37_SW1},
+    {0, CS39_SW2, CS38_SW2, CS37_SW2},
+    {0, CS39_SW3, CS38_SW3, CS37_SW3},
+    {0, CS39_SW4, CS38_SW4, CS37_SW4},
+    {0, CS39_SW5, CS38_SW5, CS37_SW5},
+    {0, CS39_SW6, CS38_SW6, CS37_SW6},
+    {0, CS39_SW7, CS38_SW7, CS37_SW7},
+    {0, CS39_SW8, CS38_SW8, CS37_SW8},
+    {0, CS39_SW9, CS38_SW9, CS37_SW9},
+
+    {0, CS36_SW4, CS35_SW4, CS34_SW4},
+    {0, CS36_SW5, CS35_SW5, CS34_SW5},
+    {0, CS36_SW6, CS35_SW6, CS34_SW6},
+    {0, CS36_SW7, CS35_SW7, CS34_SW7},
+    {0, CS36_SW8, CS35_SW8, CS34_SW8},
+    {0, CS36_SW9, CS35_SW9, CS34_SW9},
+
+    {0, CS33_SW5, CS32_SW5, CS31_SW5},
+    {0, CS33_SW6, CS32_SW6, CS31_SW6},
+    {0, CS33_SW7, CS32_SW7, CS31_SW7}
+};
+
 #elif defined(RGB_BACKLIGHT_M6_B)
     // Driver has fixed mapping of index to the red, green and blue LEDs
 #elif defined(RGB_BACKLIGHT_M10_C)
@@ -865,7 +998,7 @@ const Point g_map_led_to_point[BACKLIGHT_LED_COUNT] PROGMEM = {
     {112,64}, {100,48}, {84,48}, {68,48}, {52,48}, {36,48}, {64,60}, {44,60}, {24,64},
     {108,32}, {92,32}, {76,32}, {60,32}, {44,32}, {28,32}, {255,255}, {10,48}, {4,64},
     // LD0..LD1762
-	
+
     {124,32}, {140,32}, {156,32}, {172,32}, {188,32}, {214,32}, {180,48}, {202,48}, {224,48},
     {116,48}, {132,48}, {148,48}, {164,48}, {255,255}, {160,60}, {180,64}, {208,64}, {255,255}
 };
@@ -1260,6 +1393,25 @@ const Point g_map_led_to_point_polar[BACKLIGHT_LED_COUNT] PROGMEM = {
     { 121, 215 },               { 119, 164 }, { 117, 134 }, { 114, 104 }, { 109,  76 }, {  98,  50 }, {  71,  34 }, {  37,  41 }, {  22,  65 }, {  15,  93 }, {  11, 122 }, {   8, 162 }, {   7, 205 }, {   6, 233 },
     { 116, 236 }, { 113, 199 }, { 110, 164 },                                           {  82,  74 },                                           {  27, 106 }, {  20, 138 }, {  15, 183 }, {  13, 212 }, {  11, 240 }
 };
+#elif defined(RGB_BACKLIGHT_PORTICO75)
+const Point g_map_led_to_point[BACKLIGHT_LED_COUNT] PROGMEM = {
+    {   0,   0 }, {  18,   0 }, {  33,   0 }, {  48,   0 }, {  62,   0 }, {  81,   0 }, {  96,   0 }, { 110,   0 }, { 125,   0 }, { 143,   0 }, { 158,   0 }, { 173,   0 }, { 187,   0 }, { 205,   0 }, { 224,   0 },
+    {   0,  15 }, {  15,  15 }, {  29,  15 }, {  44,  15 }, {  59,  15 }, {  74,  15 }, {  88,  15 }, { 103,  15 }, { 118,  15 }, { 132,  15 }, { 147,  15 }, { 162,  15 }, { 176,  15 }, { 198,  15 }, { 224,  15 },
+    {   4,  26 }, {  22,  26 }, {  37,  26 }, {  51,  26 }, {  66,  26 }, {  81,  26 }, {  96,  26 }, { 110,  26 }, { 125,  26 }, { 140,  26 }, { 154,  26 }, { 169,  26 }, { 183,  26 }, { 202,  26 }, { 224,  26 },
+    {   5,  38 }, {  25,  38 }, {  40,  38 }, {  54,  38 }, {  69,  38 }, {  84,  38 }, {  98,  38 }, { 113,  38 }, { 128,  38 }, { 143,  38 }, { 157,  38 }, { 172,  38 }, { 197,  38 },
+    {   9,  49 }, {  33,  49 }, {  48,  49 }, {  62,  49 }, {  77,  49 }, {  92,  49 }, { 107,  49 }, { 121,  49 }, { 136,  49 }, { 151,  49 }, { 165,  49 }, { 186,  49 }, { 209,  49 },
+    {   2,  61 }, {  20,  61 }, {  39,  61 }, {  94,  61 }, { 151,  61 }, { 173,  61 }, { 195,  64 }, { 209,  64 }, { 224,  64 },
+	{   2,   0 }, {  46,   0 }, {  90,   0 }, { 134,   0 }, { 178,   0 }, { 222,   0 }, { 224,   2 }, { 224,  32 }, { 224,  62 }, {   2,  64 }, {  46,  64 }, {  90,  64 }, { 134,  64 }, { 178,  64 }, { 222,  64 }, {   0,   2 }, {   0,  32 }, {   0,  62 }
+};
+const Point g_map_led_to_point_polar[BACKLIGHT_LED_COUNT] PROGMEM = {
+    { 138, 240 }, { 140, 205 }, { 143, 176 }, { 146, 147 }, { 150, 122 }, { 159,  92 }, { 172,  74 }, { 188,  66 }, { 206,  71 }, { 222,  92 }, { 229, 115 }, { 234, 142 }, { 238, 168 }, { 241, 203 }, { 243, 240 },
+    { 133, 233 }, { 134, 203 }, { 135, 175 }, { 137, 144 }, { 140, 115 }, { 144,  86 }, { 152,  61 }, { 171,  40 }, { 204,  37 }, { 226,  54 }, { 236,  80 }, { 241, 109 }, { 244, 136 }, { 246, 181 }, { 248, 233 },
+    { 129, 223 }, { 130, 186 }, { 130, 155 }, { 131, 126 }, { 132,  96 }, { 135,  65 }, { 142,  35 }, { 177,  13 }, { 237,  30 }, { 245,  59 }, { 248,  87 }, { 250, 118 }, { 251, 147 }, { 251, 186 }, { 252, 231 },
+    { 125, 221 }, { 124, 180 }, { 124, 149 }, { 123, 120 }, { 121,  89 }, { 118,  59 }, { 111,  31 }, {  57,  13 }, {  15,  35 }, {   8,  65 }, {   5,  94 }, {   4, 124 }, {   3, 176 },
+    { 120, 215 }, { 118, 166 }, { 117, 136 }, { 114, 109 }, { 109,  80 }, {  99,  54 }, {  75,  37 }, {  44,  40 }, {  25,  61 }, {  17,  88 }, {  13, 115 }, {   9, 156 }, {   7, 203 },
+    { 117, 234 }, { 115, 199 }, { 112, 162 }, {  86,  70 }, {  26, 100 }, {  18, 139 }, {  15, 183 }, {  13, 210 }, {  11, 240 },
+    { 138, 236 }, { 145, 151 }, { 166,  80 }, { 215,  80 }, { 236, 151 }, { 243, 236 }, { 243, 239 }, {   0, 231 }, {  11, 239 }, { 116, 236 }, { 109, 151 }, { 88,  80 }, {  39,  80 }, {  18, 151 }, {  11, 236 }, { 138, 239 }, { 127, 231 }, { 116, 239 }
+};
 #elif defined(RGB_BACKLIGHT_M50_A)
 const Point g_map_led_to_point[BACKLIGHT_LED_COUNT] PROGMEM = {
     // LA0..LA17
@@ -1303,7 +1455,7 @@ void map_led_to_point( uint8_t index, Point *point )
     point->y = pgm_read_byte(addr+1);
 
 #if defined(RGB_BACKLIGHT_M6_B) || defined(RGB_BACKLIGHT_M10_C) || defined(RGB_BACKLIGHT_HS60) || defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_PORTICO) || \
-    defined(RGB_BACKLIGHT_NK87) || defined(RGB_BACKLIGHT_NEBULA68) || defined(RGB_BACKLIGHT_NEBULA12) || defined(RGB_BACKLIGHT_KW_MEGA)
+    defined(RGB_BACKLIGHT_PORTICO75) || defined(RGB_BACKLIGHT_NK87) || defined(RGB_BACKLIGHT_NEBULA68) || defined(RGB_BACKLIGHT_NEBULA12) || defined(RGB_BACKLIGHT_KW_MEGA)
     return;
 #endif
 
@@ -1586,6 +1738,15 @@ const uint8_t g_map_row_column_to_led[MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
     { 44,    255, 45,     46,     47,     48, 49,     50,     51,     52, 53, 54, 55,     56, 57 },
     { 58,     59, 60,    255,    255,    255, 61,    255,    255,    255, 62, 63, 64,     65, 66 }
 };
+#elif defined(RGB_BACKLIGHT_PORTICO75)
+const uint8_t g_map_row_column_to_led[MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
+    {   0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14 },
+    {  15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29 },
+    {  30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44 },
+    {  45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57, 255, 255 },
+    {  58,  59,  60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  70, 255, 255 },
+    {  71,  72,  73, 255, 255,  74, 255, 255, 255,  75,  76,  77,  78,  79, 255 }
+};
 #elif defined(RGB_BACKLIGHT_M50_A)
 // LA15, LA14, LA13, LA12, LA11, LA10,  LA9,  LB1,  LB2,  LB3,  LB4,  LB5,  LB6
 // LA16,  LA6,  LA5,  LA4,  LA3,  LA2,  LA1,  LB9, LB10, LB11, LB12, LB13, LB14
@@ -1612,6 +1773,9 @@ void backlight_update_pwm_buffers(void)
 {
 #if defined(RGB_BACKLIGHT_M6_B)
     IS31FL3218_update_pwm_buffers();
+#elif defined(RGB_BACKLIGHT_PORTICO75)
+	IS31FL3741_update_pwm_buffers( ISSI_ADDR_1, 0 );
+    IS31FL3741_update_led_control_registers( ISSI_ADDR_1, 0 );
 #elif defined(RGB_BACKLIGHT_M10_C)
     IS31FL3731_update_pwm_buffers( ISSI_ADDR_1, 0 );
     IS31FL3731_update_led_control_registers( ISSI_ADDR_1, 0 );
@@ -1660,6 +1824,8 @@ void backlight_set_color( int index, uint8_t red, uint8_t green, uint8_t blue )
     IS31FL3733_set_color( index, red, green, blue );
 #elif defined (RGB_BACKLIGHT_PORTICO)
     IS31FL3731_set_color( index, red, green, blue );
+#elif defined (RGB_BACKLIGHT_PORTICO75)
+    IS31FL3741_set_color( index, red, green, blue );
 #elif defined(RGB_BACKLIGHT_NK87)
     // This is done to avoid indicator LEDs being set
     if (( index != 63+64-1 ) && ( index != 48+64-1 )) {
@@ -1693,6 +1859,11 @@ void backlight_set_color_all( uint8_t red, uint8_t green, uint8_t blue )
     for (int i = 0; i < BACKLIGHT_LED_COUNT; i++) {
         IS31FL3731_set_color(i, red, green, blue);
     }
+#elif defined (RGB_BACKLIGHT_PORTICO75)
+    // This is done to avoid indicator LEDs being set
+    for (int i = 0; i < BACKLIGHT_LED_COUNT; i++) {
+        IS31FL3741_set_color(i, red, green, blue);
+    }
 #elif defined(RGB_BACKLIGHT_NK87)
     // This is done to avoid indicator LEDs being set
     for (int i = 0; i < BACKLIGHT_LED_COUNT; i++) {
@@ -1933,6 +2104,15 @@ void backlight_effect_alphas_mods(void)
                 {
                     is_alpha = ( column < 16 ) && (( g_config.alphas_mods[row-1] & (1<<column) ) == 0);
                 }
+#elif defined(RGB_BACKLIGHT_PORTICO75)
+                if ( row == 0 )
+                {
+                    is_alpha = ( ( 0b11100000111100001 & (1<<column) ) == 0);
+                }
+                else
+                {
+                    is_alpha = ( column < 16 ) && (( g_config.alphas_mods[row-1] & (1<<column) ) == 0);
+                }
 #else
                 is_alpha = ( g_config.alphas_mods[row] & (1<<column) ) == 0;
 #endif
@@ -2824,6 +3004,15 @@ void backlight_init_drivers(void)
     // This actually updates the LED drivers
     IS31FL3733_update_led_control_registers( ISSI_ADDR_1, 0 );
     IS31FL3733_update_led_control_registers( ISSI_ADDR_2, 1 );
+#elif defined(RGB_BACKLIGHT_PORTICO75)
+    IS31FL3741_init( ISSI_ADDR_1 );
+	bool enabled = true;
+    for ( int index = 0; index < DRIVER_LED_TOTAL; index++ )
+    {
+        IS31FL3741_set_led_control_register( index, enabled, enabled, enabled );
+    }
+    // This actually updates the LED drivers
+    IS31FL3741_update_led_control_registers( ISSI_ADDR_1, 0 );
 #elif defined(RGB_BACKLIGHT_KW_MEGA)
     IS31FL3733_init( ISSI_ADDR_1, 0 );
     IS31FL3733_init( ISSI_ADDR_2, 0 );
diff --git a/keyboards/wolfmarkclub/wm1/rules.mk b/keyboards/wolfmarkclub/wm1/rules.mk
index 2782d497ce..a712747048 100644
--- a/keyboards/wolfmarkclub/wm1/rules.mk
+++ b/keyboards/wolfmarkclub/wm1/rules.mk
@@ -5,6 +5,9 @@ MCU = STM32F103
 MCU_LDSCRIPT = wm1_f103
 BOARD = STM32_F103_STM32DUINO
 
+# Bootloader selection
+BOOTLOADER = custom
+
 PROGRAM_CMD = echo 'CLI flashing not supported' >&2
 
 # Build Options
diff --git a/keyboards/wolfmarkclub/wm1/wm1.c b/keyboards/wolfmarkclub/wm1/wm1.c
index d199546f89..0ad1ade4cc 100644
--- a/keyboards/wolfmarkclub/wm1/wm1.c
+++ b/keyboards/wolfmarkclub/wm1/wm1.c
@@ -1,5 +1,10 @@
 #include "wm1.h"
 
+void bootloader_jump(void) {
+    // This board doesn't use the "standard" stm32duino bootloader, and no information is available regarding how to enter bootloader mode. All we can do here is reset.
+    NVIC_SystemReset();
+}
+
 void matrix_init_kb(void) {
   setPinOutput(B1); // Top Indicator LED
   setPinOutput(B0); // Middle Indicator LED
diff --git a/keyboards/woodkeys/meira/keymaps/cole/rules.mk b/keyboards/woodkeys/meira/keymaps/cole/rules.mk
index 8f8d53e57a..eed6b9c119 100644
--- a/keyboards/woodkeys/meira/keymaps/cole/rules.mk
+++ b/keyboards/woodkeys/meira/keymaps/cole/rules.mk
@@ -1,2 +1,2 @@
 AUDIO_ENABLE = yes           # Audio output on port C6
-EXTRAFLAGS+=-flto # -4-7k
\ No newline at end of file
+LTO_ENABLE = yes # -4-7k
diff --git a/keyboards/woodkeys/meira/keymaps/grahampheath/rules.mk b/keyboards/woodkeys/meira/keymaps/grahampheath/rules.mk
index b3b1980eb1..1c61fe1c12 100644
--- a/keyboards/woodkeys/meira/keymaps/grahampheath/rules.mk
+++ b/keyboards/woodkeys/meira/keymaps/grahampheath/rules.mk
@@ -1,5 +1,5 @@
 AUDIO_ENABLE = yes           # Audio output on port C6
-EXTRAFLAGS+=-flto # -4-7k
+LTO_ENABLE = yes # -4-7k
 MOUSEKEY_ENABLE = no       # Mouse keys(-47kb)
 ISSI_ENABLE = no
 BACKLIGHT_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/work_louder/work_board/work_board.c b/keyboards/work_louder/work_board/work_board.c
index 7a8edc1a9e..d25ea0cdba 100644
--- a/keyboards/work_louder/work_board/work_board.c
+++ b/keyboards/work_louder/work_board/work_board.c
@@ -100,15 +100,15 @@ led_config_t g_led_config = { {
 } };
 // clang-format on
 
+#    ifdef VIA_ENABLE
+bool via_layout_2u = false;
+
+void via_set_layout_options_kb(uint32_t value) { via_layout_2u = (bool)value; }
+#    endif  // VIA_ENABLE
+
 __attribute__((weak)) void rgb_matrix_indicators_user(void) {
 #    ifdef VIA_ENABLE
-    static bool     layout_2u = false;
-    static uint16_t timer = 0;
-    if (timer_elapsed(timer) > 500) {
-        timer     = timer_read();
-        layout_2u = (bool)via_get_layout_options();
-    }
-    if (layout_2u) {
+    if (via_layout_2u) {
         rgb_matrix_set_color(5, 0, 0, 0);
         rgb_matrix_set_color(7, 0, 0, 0);
     } else {
diff --git a/keyboards/wren/info.json b/keyboards/wren/info.json
new file mode 100644
index 0000000000..ef11ffea27
--- /dev/null
+++ b/keyboards/wren/info.json
@@ -0,0 +1,105 @@
+{
+    "keyboard_name": "wren",
+    "maintainer": "vinorodrigues",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"L00","x":0, "y":0.5},
+                {"label":"L01","x":1, "y":0.5},
+                {"label":"L02","x":2, "y":0.5},
+                {"label":"L03","x":3, "y":0.5},
+                {"label":"L04","x":4.5, "y":0.5},
+                {"label":"L05","x":5.5, "y":0.5},
+                {"label":"L06","x":6.5, "y":0.25},
+                {"label":"L07","x":7.5, "y":0},
+                {"label":"L08","x":8.5, "y":0.25},
+                {"label":"L09","x":9.5, "y":0.5},
+                {"label":"R00","x":14, "y":0.5},
+                {"label":"R01","x":15, "y":0.25},
+                {"label":"R02","x":16, "y":0},
+                {"label":"R03","x":17, "y":0.25},
+                {"label":"R04","x":18, "y":0.5},
+                {"label":"R05","x":19, "y":0.5},
+                {"label":"R06","x":20.5, "y":0.5},
+                {"label":"R07","x":21.5, "y":0.5},
+                {"label":"R08","x":22.5, "y":0.5},
+                {"label":"R09","x":23.5, "y":0.5},
+
+                {"label":"L10","x":0, "y":1.5},
+                {"label":"L11","x":1, "y":1.5},
+                {"label":"L12","x":2, "y":1.5},
+                {"label":"L13","x":3, "y":1.5},
+                {"label":"L14","x":4.5, "y":1.5},
+                {"label":"L15","x":5.5, "y":1.5},
+                {"label":"L16","x":6.5, "y":1.25},
+                {"label":"L17","x":7.5, "y":1},
+                {"label":"L18","x":8.5, "y":1.25},
+                {"label":"L19","x":9.5, "y":1.5},
+                {"label":"R10","x":16, "y":1},
+                {"label":"R11","x":15, "y":1.25},
+                {"label":"R12","x":17, "y":1.25},
+                {"label":"R13","x":14, "y":1.5},
+                {"label":"R14","x":18, "y":1.5},
+                {"label":"R15","x":19, "y":1.5},
+                {"label":"R16","x":20.5, "y":1.5},
+                {"label":"R17","x":21.5, "y":1.5},
+                {"label":"R18","x":22.5, "y":1.5},
+                {"label":"R19","x":23.5, "y":1.5},
+                
+                {"label":"L20","x":0, "y":2.5},
+                {"label":"L21","x":1, "y":2.5},
+                {"label":"L22","x":2, "y":2.5},
+                {"label":"L23","x":3, "y":2.5},
+                {"label":"L24","x":4.5, "y":2.5},
+                {"label":"L25","x":5.5, "y":2.5},
+                {"label":"L26","x":6.5, "y":2.25},
+                {"label":"L27","x":7.5, "y":2},
+                {"label":"L28","x":8.5, "y":2.25},
+                {"label":"L29","x":9.5, "y":2.5},
+                {"label":"R20","x":14, "y":2.5},
+                {"label":"R21","x":15, "y":2.25},
+                {"label":"R22","x":16, "y":2},
+                {"label":"R23","x":17, "y":2.25},
+                {"label":"R24","x":18, "y":2.5},
+                {"label":"R25","x":19, "y":2.5},
+                {"label":"R26","x":20.5, "y":2.5},
+                {"label":"R27","x":21.5, "y":2.5},
+                {"label":"R28","x":22.5, "y":2.5},
+                {"label":"R29","x":23.5, "y":2.5},
+
+                {"label":"L30","x":0, "y":3.5},
+                {"label":"L31","x":1, "y":3.5},
+                {"label":"L32","x":2, "y":3.5},
+                {"label":"L33","x":3, "y":3.5},
+                {"label":"L34","x":4.5, "y":3.5},
+                {"label":"L35","x":5.5, "y":3.5},
+                {"label":"L36","x":6.5, "y":3.25},
+                {"label":"L37","x":7.5, "y":3},
+                {"label":"L38","x":8.5, "y":3.25},
+                {"label":"L39","x":9.5, "y":3.5},
+                {"label":"R30","x":14, "y":3.5},
+                {"label":"R31","x":15, "y":3.25},
+                {"label":"R32","x":16, "y":3},
+                {"label":"R33","x":17, "y":3.25},
+                {"label":"R34","x":18, "y":3.5},
+                {"label":"R35","x":19, "y":3.5},
+                {"label":"R36","x":20.5, "y":3.5},
+                {"label":"R37","x":21.5, "y":3.5},
+                {"label":"R38","x":22.5, "y":3.5},
+                {"label":"R39","x":23.5, "y":3.5},
+
+
+                {"label":"LT0","x":6, "y":4.5},
+                {"label":"LT1","x":7, "y":4.5},
+                {"label":"LT2","x":8, "y":4.5},
+                {"label":"LT3","x":9, "y":4.75},
+                {"label":"LT4","x":10.75, "y":4, "h":2},
+                {"label":"RT0","x":12.75, "y":4, "h":2},
+                {"label":"RT1","x":14.5, "y":4.75},
+                {"label":"RT2","x":15.5, "y":4.5},
+                {"label":"RT3","x":16.5, "y":4.5},
+                {"label":"RT4","x":17.5, "y":4.5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/xelus/pachi/rgb/rev2/config.h b/keyboards/xelus/pachi/rgb/rev2/config.h
index b803b2fd2c..a9240da6bb 100644
--- a/keyboards/xelus/pachi/rgb/rev2/config.h
+++ b/keyboards/xelus/pachi/rgb/rev2/config.h
@@ -98,8 +98,8 @@
 #define ENABLE_RGB_MATRIX_HUE_BREATHING
 #define ENABLE_RGB_MATRIX_HUE_PENDULUM
 #define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+// #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// #define ENABLE_RGB_MATRIX_PIXEL_RAIN
 
 #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
 #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
diff --git a/keyboards/xelus/pachi/rgb/rev2/rev2.c b/keyboards/xelus/pachi/rgb/rev2/rev2.c
index b8a7bc2730..f8ca9ec53e 100644
--- a/keyboards/xelus/pachi/rgb/rev2/rev2.c
+++ b/keyboards/xelus/pachi/rgb/rev2/rev2.c
@@ -162,7 +162,7 @@ led_config_t g_led_config = { {
     { NO_LED  , -1+39+3 , -1+65+3 , -1+91+3 , -1+00+1 , -1+26+1 , -1+52+1 , -1+78+1 , NO_LED   },
     { -1+00+4 , -1+26+4 , -1+52+4 , -1+78+4 , -1+104+4, -1+13+2 , -1+39+2 , -1+65+2 , -1+91+2  },
     { -1+13+4 , -1+39+4 , -1+65+4 , -1+91+4 , -1+00+2 , -1+26+2 , -1+52+2 , -1+78+2 , NO_LED   },
-    { -1+00+6 , -1+26+6 , -1+52+6 , -1+78+6 , -1+104+6, -1+13+5 , -1+39+5 , -1+65+5 , -1+91+6  },
+    { -1+00+6 , -1+26+6 , -1+52+6 , -1+78+6 , -1+104+6, -1+13+5 , -1+39+5 , -1+65+5 , -1+91+5  },
     { -1+13+6 , -1+39+6 , -1+65+6 , -1+91+6 , -1+00+5 , -1+26+5 , -1+52+5 , -1+78+5 , NO_LED   },
     { -1+00+8 , -1+26+8 , -1+52+8 , -1+78+8 , -1+104+8, -1+13+7 , NO_LED  , NO_LED  , NO_LED   },
     { -1+13+8 , -1+39+8 , -1+65+8 , -1+91+8 , -1+00+7 , -1+26+7 , -1+52+7 , NO_LED  , NO_LED   },
diff --git a/keyboards/xenon/config.h b/keyboards/xenon/config.h
new file mode 100644
index 0000000000..b14861140c
--- /dev/null
+++ b/keyboards/xenon/config.h
@@ -0,0 +1,65 @@
+/*
+Copyright 2020 Kyrre Havik Eriksen
+
+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"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x3404
+#define DEVICE_VER      0x0001
+#define PRODUCT         Xenon
+
+/* key matrix size */
+/* Rows are doubled up */
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 7
+
+// wiring
+#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
+#define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 }
+
+#define ENCODERS_PAD_A { B6 }
+#define ENCODERS_PAD_B { B5 }
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D2
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+#ifdef OLED_ENABLE
+  #define OLED_DISPLAY_128X32
+#endif
+
+// If you are using an Elite C rev3 on the slave side, uncomment the lines below:
+// #define SPLIT_USB_DETECT
+// #define NO_USB_STARTUP_CHECK
diff --git a/keyboards/xenon/info.json b/keyboards/xenon/info.json
new file mode 100644
index 0000000000..e0b5e95264
--- /dev/null
+++ b/keyboards/xenon/info.json
@@ -0,0 +1,70 @@
+{
+  "keyboard_name": "Xenon",
+  "url": "https://github.com/narinari/xenon-keyboard",
+  "maintainer": "Kyrremann",
+  "manufacturer": "narinari",
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"x":3, "y":0},
+        {"x":11, "y":0},
+        {"x":2, "y":0.25},
+        {"x":4, "y":0.25},
+        {"x":10, "y":0.25},
+        {"x":12, "y":0.25},
+        {"x":5, "y":0.5},
+        {"x":9, "y":0.5},
+        {"x":0, "y":0.75},
+        {"x":1, "y":0.75},
+        {"x":13, "y":0.75},
+        {"x":14, "y":0.75},
+
+        {"x":3, "y":1},
+        {"x":11, "y":1},
+        {"x":2, "y":1.25},
+        {"x":4, "y":1.25},
+        {"x":10, "y":1.25},
+        {"x":12, "y":1.25},
+        {"x":5, "y":1.5},
+        {"x":9, "y":1.5},
+        {"x":0, "y":1.75},
+        {"x":1, "y":1.75},
+        {"x":13, "y":1.75},
+        {"x":14, "y":1.75},
+
+        {"x":3, "y":2},
+        {"x":11, "y":2},
+        {"x":2, "y":2.25},
+        {"x":4, "y":2.25},
+        {"x":10, "y":2.25},
+        {"x":12, "y":2.25},
+        {"x":5, "y":2.5},
+        {"x":9, "y":2.5},
+        {"x":0, "y":2.75},
+        {"x":1, "y":2.75},
+        {"x":13, "y":2.75},
+        {"x":14, "y":2.75},
+
+        {"x":3, "y":3},
+        {"x":11, "y":3},
+        {"x":2, "y":3.25},
+        {"x":4, "y":3.25},
+        {"x":10, "y":3.25},
+        {"x":12, "y":3.25},
+        {"x":5, "y":3.5},
+        {"x":6, "y":3.5},
+        {"x":8, "y":3.5},
+        {"x":9, "y":3.5},
+
+        {"x":3, "y":4},
+        {"x":11, "y":4},
+        {"x":4, "y":4.25},
+        {"x":10, "y":4.25},
+        {"x":5, "y":4.5},
+        {"x":6, "y":4.5},
+        {"x":8, "y":4.5},
+        {"x":9, "y":4.5}
+      ]
+    }
+  }
+}
diff --git a/keyboards/xenon/keymaps/default/keymap.c b/keyboards/xenon/keymaps/default/keymap.c
new file mode 100644
index 0000000000..97d1016647
--- /dev/null
+++ b/keyboards/xenon/keymaps/default/keymap.c
@@ -0,0 +1,64 @@
+/* Copyright 2020 Kyrre Havik Eriksen
+ *
+ * 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
+
+enum layers {
+    _QWERTY = 0,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
+
+#define M_LWR MO(_LOWER)
+#define M_RSE MO(_RAISE)
+#define L(kc) (LSFT(kc))
+#define R(kc) (RALT(kc))
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT(
+      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_LCTL,   KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                          KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+      KC_LSFT,   KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,                          KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, RSFT_T(KC_ENT),
+                         KC_MUTE, KC_RALT, KC_LALT, KC_LGUI, KC_SPC,      KC_ENT,  M_LWR,   KC_BSPC, M_RSE,   KC_MPLY,
+                                  KC_DEL , KC_PGDN, KC_PGUP, KC_ESC,      KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    ),
+    [_LOWER] = LAYOUT(
+      KC_BSLS,   KC_1,   KC_2,    KC_3,    KC_4,   KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+      KC_TRNS,   L(KC_1),L(KC_2), L(KC_3), L(KC_4),L(KC_5),                      L(KC_6), L(KC_7), L(KC_8), L(KC_9), L(KC_0), L(KC_MINS),
+      KC_TRNS,   KC_GRV, KC_TRNS, L(KC_EQL),L(KC_RBRC),L(KC_BSLS),              KC_BSLS, KC_RBRC, KC_EQL,  KC_VOLD, KC_VOLU, KC_TRNS,
+                         KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,       KC_ENT, KC_SPC,  KC_TRNS,  KC_TRNS, KC_RALT,
+                                  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,       KC_ENT, KC_SPC,  KC_TAB,  KC_BSPC
+    ),
+    [_RAISE] = LAYOUT(
+      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_LCTL,   KC_A,   KC_S,    KC_D,   KC_F,   KC_G,                         KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+      KC_LSFT,   KC_Z,   KC_X,    KC_C,   KC_V,   KC_B,                         KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, RSFT_T(KC_ENT),
+                         KC_LGUI, KC_DEL, KC_ENT, KC_SPC, KC_ESC,       KC_ENT, KC_SPC,  KC_TAB,  KC_BSPC, KC_RALT,
+                                  KC_DEL, KC_ENT, KC_SPC, KC_ESC,       KC_ENT, KC_SPC,  KC_TAB,  KC_BSPC
+    )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  // If console is enabled, it will print the matrix position and status of each key pressed
+#ifdef CONSOLE_ENABLE
+  uprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed);
+#endif 
+  return true;
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
diff --git a/keyboards/xenon/readme.md b/keyboards/xenon/readme.md
new file mode 100644
index 0000000000..d3b4464710
--- /dev/null
+++ b/keyboards/xenon/readme.md
@@ -0,0 +1,30 @@
+# Xenon
+
+![Xenon](https://i.imgur.com/QYMDzGFh.jpg)
+
+Xenon is 60% columnar staggered keyboard.
+
+* Cherry MX and Kailh low profile key switch support
+* OLED display
+* Full color LED
+* Prototype board area (behind the promicro)
+
+* Keyboard Maintainer: [Narinari](https://github.com/narinari)
+* Keymap Maintainer: [Kyrremann](https://github.com/Kyrremann)
+* Keyboard files can be found here: https://github.com/narinari/xenon-keyboard
+
+Make example for this keyboard (after setting up your build environment):
+
+    make xenon:default
+
+Example of flashing this keyboard:
+
+    make xenon:default:flash
+
+How to enter bootloader (DFU):
+
+Press the reset button next to the TRRS port on the side you are trying to flash (USB must be connected to the Pro Micro that you are flashing).
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the 
+[make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with
+the [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). 
diff --git a/keyboards/xenon/rules.mk b/keyboards/xenon/rules.mk
new file mode 100644
index 0000000000..aeaa1fd104
--- /dev/null
+++ b/keyboards/xenon/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+SPLIT_KEYBOARD = yes
+OLED_ENABLE = yes
+ENCODER_ENABLE = yes
diff --git a/keyboards/xenon/xenon.c b/keyboards/xenon/xenon.c
new file mode 100644
index 0000000000..9ca5720776
--- /dev/null
+++ b/keyboards/xenon/xenon.c
@@ -0,0 +1,97 @@
+/* Copyright 2020 Kyrre Havik Eriksen
+ *
+ * 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 "xenon.h"
+
+#ifdef OLED_ENABLE
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+  if (!is_keyboard_master()) {
+    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
+  }
+
+  return OLED_ROTATION_270;
+}
+
+static void render_named_logo(void) {
+  static const char PROGMEM raw_logo[] = {
+    12, 60,252,252,252,236,236,140, 12, 28,248,192,  0,192,248,252,252,252,108, 12, 12,140,236, 60, 12,  0,  0,  0,248,252,252,252,236,204,204,204,204,204,204,204,204,204,204,204,204,140, 12,252,248,  0,  0,  0,252,252,252,252,236,236,236,204, 12, 60,240,192,  0,  0,  0,252,252,252,236,236, 12, 12, 12,252,248,  0,  0,192,224, 96, 48, 24, 24,140,140,132,196,196,196,196,132,140,140, 12, 24, 48, 48, 96,192,128,  0,  0,252,252,252,236,236,236,236,140, 28,120,224,128,  0,  0,252,252,252,252,236,236, 12, 12, 12,252,
+    0,  0,  0,  3, 15,255,255,255,254,248,192,195,223,255,255, 63, 15,  1,224,248, 30,  7,  1,  0,  0,  0,  0,  0,255,255,255,255,255,255,  0,  0,  1, 63, 63, 51, 51, 51, 51, 51, 51, 51,243,  3,  1,  0,  0,  0,255,255,255,255,255,  1, 15,127,255,252,240,195, 15, 60,240,255,255,255,255,255,  0,  0,  0,255,255,254,255,255,255,127, 14,  2,195,247, 63, 31, 15, 15, 15, 15, 31, 63,255,255,254,252,248,224,  1,  3, 30,252,255,255,255,255,255,  3, 31,255,254,248,225,135, 30,120,255,255,255,255,255,255,  0,  0,  0,255, 
+    0,  0,128,240,252,255,255,255, 63,  7,  1,227,127,255,255,255,248,224,  1,  7, 62,240,192,  0,  0,  0,  0,  0,255,255,255,255,255,255,  1,  3,  7,255,255,207,207,207,207,207,206,204,207,192,128,  0,  0,  0,255,255,255,255,255,  0,  0,  0,255,255, 15,127,255,252,240,227,143,127,255,255,  0,  0,  0,255,255, 63,255,255,255,254,240,192,131,135, 12, 24, 48, 48, 48, 48, 24, 28, 15,159,255, 63, 31,  7,128,192,120, 31,255,255,255,255,255,  0,  0,  0,255,255, 31,127,255,252,241,199, 31,127,255,255,  0,  0,  0,255,
+    48, 62, 63, 63, 63, 63, 63, 56, 48, 60, 31,  3,  0,  3, 31, 63, 63, 63, 63, 60, 60, 56, 59, 63, 56,  0,  0,  0, 31, 63, 63, 63, 63, 63, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 56, 63, 31,  0,  0,  0, 63, 63, 63, 63, 63, 60, 56, 48, 63, 63,  0,  0,  0,  3, 31, 63, 63, 62, 61, 63, 60, 56, 48, 63, 31,  0,  0,  1,  7,  7, 15, 31, 31, 63, 63, 63, 62, 62, 62, 62, 63, 63, 63, 31, 31, 15, 14,  6,  3,  1,  0,  0, 63, 63, 63, 63, 63, 60, 56, 56, 63, 31,  0,  0,  1,  7, 31, 63, 63, 60, 63, 63, 60, 56, 48, 63
+  };
+  oled_write_raw_P(raw_logo, sizeof(raw_logo));
+}
+
+static void render_status(void) {
+  oled_write_P(PSTR("\n\n\n-----\nXENON\n-----\n\n"), false);
+
+  // Host Keyboard Layer Status
+  switch (get_highest_layer(layer_state)) {
+  case 0:
+    oled_write_P(PSTR("Base \n"), false);
+    break;
+  case 1:
+    oled_write_P(PSTR("Lower\n"), false);
+    break;
+  case 2:
+    oled_write_P(PSTR("Raise\n"), false);
+    break;
+  default:
+    oled_write_P(PSTR("Undef\n"), false);
+  }
+  oled_write_P(PSTR("Layer\n"), false);
+}
+
+bool oled_task_kb(void) {
+	if (!oled_task_user()) {
+		return false;
+	}
+
+  if (is_keyboard_master()) {
+    render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
+  } else {
+    render_named_logo();
+  }
+
+  return true;
+}
+#endif
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+	if (!encoder_update_user(index, clockwise)) {
+		return false;
+	}
+
+	if (index == 0) {
+		// Volume control
+		if (clockwise) {
+			tap_code(KC_VOLD);
+		} else {
+			tap_code(KC_VOLU);
+		}
+	}
+	else if (index == 1) {
+		// Page up/Page down
+		if (clockwise) {
+			tap_code(KC_PGDN);
+		} else {
+			tap_code(KC_PGUP);
+		}
+	}
+	
+  return true;
+}
+#endif
diff --git a/keyboards/xenon/xenon.h b/keyboards/xenon/xenon.h
new file mode 100644
index 0000000000..030d9bcb8c
--- /dev/null
+++ b/keyboards/xenon/xenon.h
@@ -0,0 +1,40 @@
+/* Copyright 2020 Kyrre Havik Eriksen
+ *
+ * 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 XXX KC_NO
+
+#define LAYOUT( \
+    L00, L01, L02, L03, L04, L05,              R06, R07, R08, R09, R10, R11, \
+    L12, L13, L14, L15, L16, L17,              R18, R19, R20, R21, R22, R23, \
+    L24, L25, L26, L27, L28, L29,              R30, R31, R32, R33, R34, R35, \
+              L36, L37, L38, L39, L40,    R41, R42, R43, R44, R45,	     \
+                   L46, L47, L48, L49,    R50, R51, R52, R53		     \
+) \
+{ \
+    { XXX, L05, L04, L03, L02, L01, L00 }, \
+    { XXX, L17, L16, L15, L14, L13, L12 }, \
+    { XXX, L29, L28, L27, L26, L25, L24 }, \
+    { L40, L39, L38, L37, L36, XXX, XXX }, \
+    { L49, L48, L47, L46, XXX, XXX, XXX }, \
+    { XXX, R06, R07, R08, R09, R10, R11 }, \
+    { XXX, R18, R19, R20, R21, R22, R23 }, \
+    { XXX, R30, R31, R32, R33, R34, R35 }, \
+    { R41, R42, R43, R44, R45, XXX, XXX }, \
+    { R50, R51, R52, R53, XXX, XXX, XXX }  \
+}
diff --git a/keyboards/xiaomi/mk02/rules.mk b/keyboards/xiaomi/mk02/rules.mk
index 9d6d62c394..c20d67dd89 100644
--- a/keyboards/xiaomi/mk02/rules.mk
+++ b/keyboards/xiaomi/mk02/rules.mk
@@ -3,6 +3,9 @@ MCU = STM32F072
 BOARD = ST_STM32F072B_DISCOVERY
 MCU_LDSCRIPT = STM32F072_0x2000_bootloader
 
+# Bootloader selection
+BOOTLOADER = custom
+
 DFU_ARGS = -d 0483:df11 -a 0 -s 0x08002000:leave
 DFU_SUFFIX_ARGS = -v 0483 -p DF11
 
diff --git a/keyboards/xiudi/xd002/rules.mk b/keyboards/xiudi/xd002/rules.mk
index 77dd994783..70c620c8f0 100644
--- a/keyboards/xiudi/xd002/rules.mk
+++ b/keyboards/xiudi/xd002/rules.mk
@@ -2,7 +2,7 @@
 MCU = attiny85
 
 # Bootloader selection
-BOOTLOADER = micronucleus
+BOOTLOADER = custom
 OPT_DEFS += -DBOOTLOADER_SIZE=1862
 PROGRAM_CMD = micronucleus --run $(BUILD_DIR)/$(TARGET).hex
 
diff --git a/keyboards/xiudi/xd84/matrix.c b/keyboards/xiudi/xd84/matrix.c
index 92b8ff8546..04128561ee 100644
--- a/keyboards/xiudi/xd84/matrix.c
+++ b/keyboards/xiudi/xd84/matrix.c
@@ -53,7 +53,8 @@ static void select_row(uint8_t row) {
 static uint16_t read_cols(void) {
     // uint16_t state_1 = pca9555_readPins(IC2, PCA9555_PORT0);
     // uint16_t state_2 = pca9555_readPins(IC2, PCA9555_PORT1);
-    uint16_t state = pca9555_readAllPins(IC2);
+    uint16_t state = 0;
+    pca9555_readPins_all(IC2, &state);
 
     // For the XD84 all cols are on the same IC and mapped sequentially
     // while this technically gives 16 column reads,
diff --git a/keyboards/xiudi/xd96/matrix.c b/keyboards/xiudi/xd96/matrix.c
index 8cecc79c26..beef7fae12 100644
--- a/keyboards/xiudi/xd96/matrix.c
+++ b/keyboards/xiudi/xd96/matrix.c
@@ -50,13 +50,16 @@ static void select_row(uint8_t row) {
 }
 
 static uint32_t read_cols(void) {
-  uint32_t state_1 = pca9555_readPins(IC2, PCA9555_PORT0);
-  uint32_t state_2 = pca9555_readPins(IC2, PCA9555_PORT1);
-  uint32_t state_3 = pca9555_readPins(IC1, PCA9555_PORT1);
+  uint8_t state_1 = 0;
+  uint8_t state_2 = 0;
+  uint8_t state_3 = 0;
+  pca9555_readPins(IC2, PCA9555_PORT0, &state_1);
+  pca9555_readPins(IC2, PCA9555_PORT1, &state_2);
+  pca9555_readPins(IC1, PCA9555_PORT1, &state_3);
 
   // For the XD96 the pins are mapped to port expanders as follows:
   //   all 8 pins port 0 IC2, first 6 pins port 1 IC2, first 4 pins port 1 IC1
-  uint32_t state = (((state_3 & 0b00001111) << 14) | ((state_2 & 0b00111111) << 8) | state_1);
+  uint32_t state = ((((uint32_t)state_3 & 0b00001111) << 14) | (((uint32_t)state_2 & 0b00111111) << 8) | (uint32_t)state_1);
   return (~state) & 0b111111111111111111;
 }
 
diff --git a/keyboards/yoichiro/lunakey_mini/keymaps/via/rules.mk b/keyboards/yoichiro/lunakey_mini/keymaps/via/rules.mk
index 8b55a3b731..989d0d173c 100644
--- a/keyboards/yoichiro/lunakey_mini/keymaps/via/rules.mk
+++ b/keyboards/yoichiro/lunakey_mini/keymaps/via/rules.mk
@@ -2,4 +2,4 @@ RGBLIGHT_ENABLE = yes        # Enable keyboard RGB Underglow
 AUDIO_ENABLE = no            # Enable Audio output
 OLED_ENABLE = no      # Enable OLED Display
 VIA_ENABLE = yes             # Enable VIA support
-LTO_ENABLE = yes             # CFLAGS=flto
+LTO_ENABLE = yes             # Reduce firmware size
diff --git a/layouts/default/65_iso_split_bs/default_65_iso_split_bs/keymap.c b/layouts/default/65_iso_split_bs/default_65_iso_split_bs/keymap.c
new file mode 100644
index 0000000000..6fa642b43d
--- /dev/null
+++ b/layouts/default/65_iso_split_bs/default_65_iso_split_bs/keymap.c
@@ -0,0 +1,24 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = |Bsp|Bsp|Hom│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │PgU│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent├───┤
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │PgD│
+     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
+     * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │End│
+     * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+     * │Ctrl│GUI │Alt │                        │Alt│GUI│Ctl│ ← │ ↓ │ → │
+     * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+     */
+    [0] = LAYOUT_65_iso(
+        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_BSPC, KC_HOME,
+        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_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  KC_PGDN,
+        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_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    )
+};
diff --git a/layouts/default/65_iso_split_bs/info.json b/layouts/default/65_iso_split_bs/info.json
new file mode 100644
index 0000000000..5cd5861b35
--- /dev/null
+++ b/layouts/default/65_iso_split_bs/info.json
@@ -0,0 +1,85 @@
+{
+    "keyboard_name": "65% ISO layout with split Backspace",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_65_iso_split_bs": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+                {"x":15, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":15, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
+                {"x":15, "y":2},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4},
+                {"x":15, "y":4}
+            ]
+        }
+    }
+}
diff --git a/layouts/default/65_iso_split_bs/layout.json b/layouts/default/65_iso_split_bs/layout.json
new file mode 100644
index 0000000000..cf13c3a100
--- /dev/null
+++ b/layouts/default/65_iso_split_bs/layout.json
@@ -0,0 +1,5 @@
+[{a:7},"","","","","","","","","","","","","","","",""],
+[{w:1.5},"","","","","","","","","","","","","",{x:0.25,w:1.25,h:2,w2:1.5,h2:1,x2:-0.25},"",""],
+[{w:1.75},"","","","","","","","","","","","","",{x:1.25},""],
+[{w:1.25},"","","","","","","","","","","","",{w:1.75},"","",""],
+[{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:6.25},"","","","","","",""]
diff --git a/layouts/default/65_iso_split_bs/readme.md b/layouts/default/65_iso_split_bs/readme.md
new file mode 100644
index 0000000000..b80f03e68a
--- /dev/null
+++ b/layouts/default/65_iso_split_bs/readme.md
@@ -0,0 +1,3 @@
+# 65_iso_split_bs
+
+    LAYOUT_65_iso_split_bs
diff --git a/layouts/default/readme.md b/layouts/default/readme.md
index 1601b95c0f..648afcd70b 100644
--- a/layouts/default/readme.md
+++ b/layouts/default/readme.md
@@ -321,6 +321,21 @@ LAYOUT_65_iso_blocker_split_bs
 └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
 ```
 
+```
+LAYOUT_65_iso_split_bs
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+│     │   │   │   │   │   │   │   │   │   │   │   │   │     │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    ├───┤
+│      │   │   │   │   │   │   │   │   │   │   │   │   │    │   │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
+│        │   │   │   │   │   │   │   │   │   │   │      │   │   │
+├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+│    │    │    │                        │   │   │   │   │   │   │
+└────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+```
+
 ```
 LAYOUT_66_ansi
 ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┐
diff --git a/lib/python/qmk/cli/generate/develop_pr_list.py b/lib/python/qmk/cli/generate/develop_pr_list.py
index fab0262773..09236a7c42 100755
--- a/lib/python/qmk/cli/generate/develop_pr_list.py
+++ b/lib/python/qmk/cli/generate/develop_pr_list.py
@@ -12,6 +12,14 @@ fix_expr = re.compile(r'fix', flags=re.IGNORECASE)
 clean1_expr = re.compile(r'\[(develop|keyboard|keymap|core|cli|bug|docs|feature)\]', flags=re.IGNORECASE)
 clean2_expr = re.compile(r'^(develop|keyboard|keymap|core|cli|bug|docs|feature):', flags=re.IGNORECASE)
 
+ignored_titles = ["Format code according to conventions"]
+
+
+def _is_ignored(title):
+    for ignore in ignored_titles:
+        if ignore in title:
+            return
+
 
 def _get_pr_info(cache, gh, pr_num):
     pull = cache.get(f'pull:{pr_num}')
@@ -81,7 +89,9 @@ def generate_develop_pr_list(cli):
             else:
                 normal_collection.append(info)
 
-        if "dependencies" in commit_info['pr_labels']:
+        if _is_ignored(commit_info['title']):
+            return
+        elif "dependencies" in commit_info['pr_labels']:
             fix_or_normal(commit_info, pr_list_bugs, pr_list_dependencies)
         elif "core" in commit_info['pr_labels']:
             fix_or_normal(commit_info, pr_list_bugs, pr_list_core)
diff --git a/lib/python/qmk/cli/generate/version_h.py b/lib/python/qmk/cli/generate/version_h.py
index b8e52588c4..69341e36f0 100644
--- a/lib/python/qmk/cli/generate/version_h.py
+++ b/lib/python/qmk/cli/generate/version_h.py
@@ -20,6 +20,9 @@ def generate_version_h(cli):
     version_h = create_version_h(cli.args.skip_git, cli.args.skip_all)
 
     if cli.args.output:
+        cli.args.output.parent.mkdir(parents=True, exist_ok=True)
+        if cli.args.output.exists():
+            cli.args.output.replace(cli.args.output.parent / (cli.args.output.name + '.bak'))
         cli.args.output.write_text(version_h)
 
         if not cli.args.quiet:
diff --git a/lib/python/qmk/cli/multibuild.py b/lib/python/qmk/cli/multibuild.py
index ad059edff3..dff8c88422 100755
--- a/lib/python/qmk/cli/multibuild.py
+++ b/lib/python/qmk/cli/multibuild.py
@@ -69,7 +69,7 @@ def multibuild(cli):
 all: {keyboard_safe}_binary
 {keyboard_safe}_binary:
 	@rm -f "{QMK_FIRMWARE}/.build/failed.log.{keyboard_safe}" || true
-	+@$(MAKE) -C "{QMK_FIRMWARE}" -f "{QMK_FIRMWARE}/build_keyboard.mk" KEYBOARD="{keyboard_name}" KEYMAP="{cli.args.keymap}" REQUIRE_PLATFORM_KEY= COLOR=true SILENT=false {' '.join(cli.args.env)} \\
+	+@$(MAKE) -C "{QMK_FIRMWARE}" -f "{QMK_FIRMWARE}/builddefs/build_keyboard.mk" KEYBOARD="{keyboard_name}" KEYMAP="{cli.args.keymap}" REQUIRE_PLATFORM_KEY= COLOR=true SILENT=false {' '.join(cli.args.env)} \\
 		>>"{QMK_FIRMWARE}/.build/build.log.{os.getpid()}.{keyboard_safe}" 2>&1 \\
 		|| cp "{QMK_FIRMWARE}/.build/build.log.{os.getpid()}.{keyboard_safe}" "{QMK_FIRMWARE}/.build/failed.log.{os.getpid()}.{keyboard_safe}"
 	@{{ grep '\[ERRORS\]' "{QMK_FIRMWARE}/.build/build.log.{os.getpid()}.{keyboard_safe}" >/dev/null 2>&1 && printf "Build %-64s \e[1;31m[ERRORS]\e[0m\\n" "{keyboard_name}:{cli.args.keymap}" ; }} \\
diff --git a/lib/python/qmk/cli/new/keyboard.py b/lib/python/qmk/cli/new/keyboard.py
index 4093b8c90d..59e781a932 100644
--- a/lib/python/qmk/cli/new/keyboard.py
+++ b/lib/python/qmk/cli/new/keyboard.py
@@ -1,15 +1,82 @@
 """This script automates the creation of new keyboard directories using a starter template.
 """
+import re
+import json
+import shutil
 from datetime import date
 from pathlib import Path
-import re
+from dotty_dict import dotty
 
-from qmk.commands import git_get_username
-import qmk.path
 from milc import cli
 from milc.questions import choice, question
 
-KEYBOARD_TYPES = ['avr', 'ps2avrgb']
+from qmk.commands import git_get_username
+from qmk.json_schema import load_jsonschema
+from qmk.path import keyboard
+from qmk.json_encoders import InfoJSONEncoder
+from qmk.json_schema import deep_update
+
+COMMUNITY = Path('layouts/default/')
+TEMPLATE = Path('data/templates/keyboard/')
+
+MCU2BOOTLOADER = {
+    "MKL26Z64": "halfkay",
+    "MK20DX128": "halfkay",
+    "MK20DX256": "halfkay",
+    "MK66FX1M0": "halfkay",
+    "STM32F042": "stm32-dfu",
+    "STM32F072": "stm32-dfu",
+    "STM32F103": "stm32duino",
+    "STM32F303": "stm32-dfu",
+    "STM32F401": "stm32-dfu",
+    "STM32F405": "stm32-dfu",
+    "STM32F407": "stm32-dfu",
+    "STM32F411": "stm32-dfu",
+    "STM32F446": "stm32-dfu",
+    "STM32G431": "stm32-dfu",
+    "STM32G474": "stm32-dfu",
+    "STM32L412": "stm32-dfu",
+    "STM32L422": "stm32-dfu",
+    "STM32L432": "stm32-dfu",
+    "STM32L433": "stm32-dfu",
+    "STM32L442": "stm32-dfu",
+    "STM32L443": "stm32-dfu",
+    "GD32VF103": "gd32v-dfu",
+    "WB32F3G71": "wb32-dfu",
+    "atmega16u2": "atmel-dfu",
+    "atmega32u2": "atmel-dfu",
+    "atmega16u4": "atmel-dfu",
+    "atmega32u4": "atmel-dfu",
+    "at90usb162": "atmel-dfu",
+    "at90usb646": "atmel-dfu",
+    "at90usb647": "atmel-dfu",
+    "at90usb1286": "atmel-dfu",
+    "at90usb1287": "atmel-dfu",
+    "atmega32a": "bootloadhid",
+    "atmega328p": "usbasploader",
+    "atmega328": "usbasploader",
+}
+
+# defaults
+schema = dotty(load_jsonschema('keyboard'))
+mcu_types = sorted(schema["properties.processor.enum"], key=str.casefold)
+available_layouts = sorted([x.name for x in COMMUNITY.iterdir() if x.is_dir()])
+
+
+def mcu_type(mcu):
+    """Callable for argparse validation.
+    """
+    if mcu not in mcu_types:
+        raise ValueError
+    return mcu
+
+
+def layout_type(layout):
+    """Callable for argparse validation.
+    """
+    if layout not in available_layouts:
+        raise ValueError
+    return layout
 
 
 def keyboard_name(name):
@@ -27,8 +94,111 @@ def validate_keyboard_name(name):
     return bool(regex.match(name))
 
 
+def select_default_bootloader(mcu):
+    """Provide sane defaults for bootloader
+    """
+    return MCU2BOOTLOADER.get(mcu, "custom")
+
+
+def replace_placeholders(src, dest, tokens):
+    """Replaces the given placeholders in each template file.
+    """
+    content = src.read_text()
+    for key, value in tokens.items():
+        content = content.replace(f'%{key}%', value)
+
+    dest.write_text(content)
+
+
+def augment_community_info(src, dest):
+    """Splice in any additional data into info.json
+    """
+    info = json.loads(src.read_text())
+    template = json.loads(dest.read_text())
+
+    # merge community with template
+    deep_update(info, template)
+
+    # avoid assumptions on macro name by using the first available
+    first_layout = next(iter(info["layouts"].values()))["layout"]
+
+    # guess at width and height now its optional
+    width, height = (0, 0)
+    for item in first_layout:
+        width = max(width, int(item["x"]) + 1)
+        height = max(height, int(item["y"]) + 1)
+
+    info["matrix_pins"] = {
+        "cols": ["C2"] * width,
+        "rows": ["D1"] * height,
+    }
+
+    # assume a 1:1 mapping on matrix to electrical
+    for item in first_layout:
+        item["matrix"] = [int(item["y"]), int(item["x"])]
+
+    # finally write out the updated info.json
+    dest.write_text(json.dumps(info, cls=InfoJSONEncoder))
+
+
+def prompt_keyboard():
+    prompt = """{fg_yellow}Name Your Keyboard Project{style_reset_all}
+
+For more infomation, see:
+https://docs.qmk.fm/#/hardware_keyboard_guidelines?id=naming-your-keyboardproject
+
+keyboard Name? """
+
+    return question(prompt, validate=lambda x: not keyboard(x).exists())
+
+
+def prompt_user():
+    prompt = """{fg_yellow}Attribution{style_reset_all}
+
+Used for maintainer, copyright, etc
+
+Your GitHub Username? """
+    return question(prompt, default=git_get_username())
+
+
+def prompt_name(def_name):
+    prompt = """{fg_yellow}More Attribution{style_reset_all}
+
+Used for maintainer, copyright, etc
+
+Your Real Name? """
+    return question(prompt, default=def_name)
+
+
+def prompt_layout():
+    prompt = """{fg_yellow}Pick Base Layout{style_reset_all}
+
+As a starting point, one of the common layouts can be used to bootstrap the process
+
+Default Layout? """
+    # avoid overwhelming user - remove some?
+    filtered_layouts = [x for x in available_layouts if not any(xs in x for xs in ['_split', '_blocker', '_tsangan', '_f13'])]
+    filtered_layouts.append("none of the above")
+
+    return choice(prompt, filtered_layouts, default=len(filtered_layouts) - 1)
+
+
+def prompt_mcu():
+    prompt = """{fg_yellow}What Powers Your Project{style_reset_all}
+
+For more infomation, see:
+https://docs.qmk.fm/#/compatible_microcontrollers
+
+MCU? """
+    # remove any options strictly used for compatibility
+    filtered_mcu = [x for x in mcu_types if not any(xs in x for xs in ['cortex', 'unknown'])]
+
+    return choice(prompt, filtered_mcu, default=filtered_mcu.index("atmega32u4"))
+
+
 @cli.argument('-kb', '--keyboard', help='Specify the name for the new keyboard directory', arg_only=True, type=keyboard_name)
-@cli.argument('-t', '--type', help='Specify the keyboard type', arg_only=True, choices=KEYBOARD_TYPES)
+@cli.argument('-l', '--layout', help='Community layout to bootstrap with', arg_only=True, type=layout_type)
+@cli.argument('-t', '--type', help='Specify the keyboard MCU type', arg_only=True, type=mcu_type)
 @cli.argument('-u', '--username', help='Specify your username (default from Git config)', arg_only=True)
 @cli.argument('-n', '--realname', help='Specify your real name if you want to use that. Defaults to username', arg_only=True)
 @cli.subcommand('Creates a new keyboard directory')
@@ -38,102 +208,49 @@ def new_keyboard(cli):
     cli.log.info('{style_bright}Generating a new QMK keyboard directory{style_normal}')
     cli.echo('')
 
-    # Get keyboard name
-    new_keyboard_name = None
-    while not new_keyboard_name:
-        new_keyboard_name = cli.args.keyboard if cli.args.keyboard else question('Keyboard Name:')
-        if not validate_keyboard_name(new_keyboard_name):
-            cli.log.error('Keyboard names must contain only {fg_cyan}lowercase a-z{fg_reset}, {fg_cyan}0-9{fg_reset}, and {fg_cyan}_{fg_reset}! Please choose a different name.')
+    kb_name = cli.args.keyboard if cli.args.keyboard else prompt_keyboard()
+    user_name = cli.args.username if cli.args.username else prompt_user()
+    real_name = cli.args.realname or cli.args.username if cli.args.realname or cli.args.username else prompt_name(user_name)
+    default_layout = cli.args.layout if cli.args.layout else prompt_layout()
+    mcu = cli.args.type if cli.args.type else prompt_mcu()
+    bootloader = select_default_bootloader(mcu)
 
-            # Exit if passed by arg
-            if cli.args.keyboard:
-                return False
+    if not validate_keyboard_name(kb_name):
+        cli.log.error('Keyboard names must contain only {fg_cyan}lowercase a-z{fg_reset}, {fg_cyan}0-9{fg_reset}, and {fg_cyan}_{fg_reset}! Please choose a different name.')
+        return 1
 
-            new_keyboard_name = None
-            continue
+    if keyboard(kb_name).exists():
+        cli.log.error(f'Keyboard {{fg_cyan}}{kb_name}{{fg_reset}} already exists! Please choose a different name.')
+        return 1
 
-        keyboard_path = qmk.path.keyboard(new_keyboard_name)
-        if keyboard_path.exists():
-            cli.log.error(f'Keyboard {{fg_cyan}}{new_keyboard_name}{{fg_reset}} already exists! Please choose a different name.')
+    tokens = {'YEAR': str(date.today().year), 'KEYBOARD': kb_name, 'USER_NAME': user_name, 'REAL_NAME': real_name, 'LAYOUT': default_layout, 'MCU': mcu, 'BOOTLOADER': bootloader}
 
-            # Exit if passed by arg
-            if cli.args.keyboard:
-                return False
+    if cli.config.general.verbose:
+        cli.log.info("Creating keyboard with:")
+        for key, value in tokens.items():
+            cli.echo(f"    {key.ljust(10)}:   {value}")
 
-            new_keyboard_name = None
+    # TODO: detach community layout and rename to just "LAYOUT"
+    if default_layout == 'none of the above':
+        default_layout = "ortho_4x4"
 
-    # Get keyboard type
-    keyboard_type = cli.args.type if cli.args.type else choice('Keyboard Type:', KEYBOARD_TYPES, default=0)
+    # begin with making the deepest folder in the tree
+    keymaps_path = keyboard(kb_name) / 'keymaps/'
+    keymaps_path.mkdir(parents=True)
 
-    # Get username
-    user_name = None
-    while not user_name:
-        user_name = question('Your GitHub User Name:', default=find_user_name())
+    # copy in keymap.c or keymap.json
+    community_keymap = Path(COMMUNITY / f'{default_layout}/default_{default_layout}/')
+    shutil.copytree(community_keymap, keymaps_path / 'default')
 
-        if not user_name:
-            cli.log.error('You didn\'t provide a username, and we couldn\'t find one set in your QMK or Git configs. Please try again.')
+    # process template files
+    for file in list(TEMPLATE.iterdir()):
+        replace_placeholders(file, keyboard(kb_name) / file.name, tokens)
 
-            # Exit if passed by arg
-            if cli.args.username:
-                return False
+    # merge in infos
+    community_info = Path(COMMUNITY / f'{default_layout}/info.json')
+    augment_community_info(community_info, keyboard(kb_name) / community_info.name)
 
-    real_name = None
-    while not real_name:
-        real_name = question('Your real name:', default=user_name)
-
-    keyboard_basename = keyboard_path.name
-    replacements = {
-        "YEAR": str(date.today().year),
-        "KEYBOARD": keyboard_basename,
-        "USER_NAME": user_name,
-        "YOUR_NAME": real_name,
-    }
-
-    template_dir = Path('data/templates')
-    template_tree(template_dir / 'base', keyboard_path, replacements)
-    template_tree(template_dir / keyboard_type, keyboard_path, replacements)
-
-    cli.echo('')
-    cli.log.info(f'{{fg_green}}Created a new keyboard called {{fg_cyan}}{new_keyboard_name}{{fg_green}}.{{fg_reset}}')
-    cli.log.info(f'To start working on things, `cd` into {{fg_cyan}}{keyboard_path}{{fg_reset}},')
+    cli.log.info(f'{{fg_green}}Created a new keyboard called {{fg_cyan}}{kb_name}{{fg_green}}.{{fg_reset}}')
+    cli.log.info(f'To start working on things, `cd` into {{fg_cyan}}keyboards/{kb_name}{{fg_reset}},')
     cli.log.info('or open the directory in your preferred text editor.')
-
-
-def find_user_name():
-    if cli.args.username:
-        return cli.args.username
-    elif cli.config.user.name:
-        return cli.config.user.name
-    else:
-        return git_get_username()
-
-
-def template_tree(src: Path, dst: Path, replacements: dict):
-    """Recursively copy template and replace placeholders
-
-    Args:
-        src (Path)
-            The source folder to copy from
-        dst (Path)
-            The destination folder to copy to
-        replacements (dict)
-            a dictionary with "key":"value" pairs to replace.
-
-    Raises:
-        FileExistsError
-            When trying to overwrite existing files
-    """
-
-    dst.mkdir(parents=True, exist_ok=True)
-
-    for child in src.iterdir():
-        if child.is_dir():
-            template_tree(child, dst / child.name, replacements=replacements)
-
-        if child.is_file():
-            file_name = dst / (child.name % replacements)
-
-            with file_name.open(mode='x') as dst_f:
-                with child.open() as src_f:
-                    template = src_f.read()
-                    dst_f.write(template % replacements)
+    cli.log.info(f"And build with {{fg_yellow}}qmk compile -kb {kb_name} -km default{{fg_reset}}.")
diff --git a/lib/python/qmk/commands.py b/lib/python/qmk/commands.py
index 10bc841079..f43cc6971d 100644
--- a/lib/python/qmk/commands.py
+++ b/lib/python/qmk/commands.py
@@ -216,7 +216,7 @@ def compile_configurator_json(user_keymap, bootloader=None, parallel=1, **env_va
         '-r',
         '-R',
         '-f',
-        'build_keyboard.mk',
+        'builddefs/build_keyboard.mk',
     ])
 
     if bootloader:
diff --git a/lib/python/qmk/path.py b/lib/python/qmk/path.py
index 72bae59273..dfb8371f84 100644
--- a/lib/python/qmk/path.py
+++ b/lib/python/qmk/path.py
@@ -46,7 +46,7 @@ def keymap(keyboard_name):
     """
     keyboard_folder = keyboard(keyboard_name)
 
-    for i in range(MAX_KEYBOARD_SUBFOLDERS):
+    for _ in range(MAX_KEYBOARD_SUBFOLDERS):
         if (keyboard_folder / 'keymaps').exists():
             return (keyboard_folder / 'keymaps').resolve()
 
diff --git a/paths.mk b/paths.mk
index 5a39d00ecd..85ccfa0796 100644
--- a/paths.mk
+++ b/paths.mk
@@ -2,7 +2,9 @@
 TOP_DIR = .
 TMK_DIR = tmk_core
 TMK_PATH = $(TMK_DIR)
-LIB_PATH = lib
+
+LIB_DIR = lib
+LIB_PATH = $(LIB_DIR)
 
 QUANTUM_DIR = quantum
 QUANTUM_PATH = $(QUANTUM_DIR)
diff --git a/platforms/arm_atsam/bootloaders/md_boot.c b/platforms/arm_atsam/bootloaders/md_boot.c
index 9cf16f3597..32cf850448 100644
--- a/platforms/arm_atsam/bootloaders/md_boot.c
+++ b/platforms/arm_atsam/bootloaders/md_boot.c
@@ -26,20 +26,20 @@ extern uint32_t _eram;
 // CTRL keyboards released with bootloader version below must use RAM method. Otherwise use WDT method.
 void bootloader_jump(void) {
 #ifdef KEYBOARD_massdrop_ctrl
-    uint8_t  ver_ram_method[] = "v2.18Jun 22 2018 17:28:08";  // The version to match (NULL terminated by compiler)
-    uint8_t *ver_check        = ver_ram_method;               // Pointer to version match string for traversal
-    uint8_t *ver_rom          = (uint8_t *)0x21A0;            // Pointer to address in ROM where this specific bootloader version would exist
+    uint8_t  ver_ram_method[] = "v2.18Jun 22 2018 17:28:08"; // The version to match (NULL terminated by compiler)
+    uint8_t *ver_check        = ver_ram_method;              // Pointer to version match string for traversal
+    uint8_t *ver_rom          = (uint8_t *)0x21A0;           // Pointer to address in ROM where this specific bootloader version would exist
 
-    while (*ver_check && *ver_rom == *ver_check) {  // While there are check version characters to match and bootloader's version matches check's version
-        ver_check++;                                // Move check version pointer to next character
-        ver_rom++;                                  // Move ROM version pointer to next character
+    while (*ver_check && *ver_rom == *ver_check) { // While there are check version characters to match and bootloader's version matches check's version
+        ver_check++;                               // Move check version pointer to next character
+        ver_rom++;                                 // Move ROM version pointer to next character
     }
 
-    if (!*ver_check) {                   // If check version pointer is NULL, all characters have matched
-        *MAGIC_ADDR = BOOTLOADER_MAGIC;  // Set magic number into RAM
-        NVIC_SystemReset();              // Perform system reset
+    if (!*ver_check) {                  // If check version pointer is NULL, all characters have matched
+        *MAGIC_ADDR = BOOTLOADER_MAGIC; // Set magic number into RAM
+        NVIC_SystemReset();             // Perform system reset
         while (1)
-            ;  // Won't get here
+            ; // Won't get here
     }
 #endif
 
@@ -61,5 +61,5 @@ void bootloader_jump(void) {
     while (!WDT->CTRLA.bit.ENABLE)
         ;
     while (1)
-        ;  // Wait on timeout
+        ; // Wait on timeout
 }
diff --git a/platforms/arm_atsam/eeprom_samd.c b/platforms/arm_atsam/eeprom_samd.c
index beaffeec30..1c1e031e5d 100644
--- a/platforms/arm_atsam/eeprom_samd.c
+++ b/platforms/arm_atsam/eeprom_samd.c
@@ -155,7 +155,9 @@ void eeprom_write_block(const void *buf, void *addr, size_t len) {
     }
 }
 
-void eeprom_update_byte(uint8_t *addr, uint8_t value) { eeprom_write_byte(addr, value); }
+void eeprom_update_byte(uint8_t *addr, uint8_t value) {
+    eeprom_write_byte(addr, value);
+}
 
 void eeprom_update_word(uint16_t *addr, uint16_t value) {
     uint8_t *p = (uint8_t *)addr;
diff --git a/platforms/arm_atsam/eeprom_samd.h b/platforms/arm_atsam/eeprom_samd.h
old mode 100755
new mode 100644
index 7dbff9bfa1..878e72865c
--- a/platforms/arm_atsam/eeprom_samd.h
+++ b/platforms/arm_atsam/eeprom_samd.h
@@ -4,5 +4,5 @@
 
 #ifndef EEPROM_SIZE
 #    include "eeconfig.h"
-#    define EEPROM_SIZE (((EECONFIG_SIZE + 3) / 4) * 4)  // based off eeconfig's current usage, aligned to 4-byte sizes, to deal with LTO
+#    define EEPROM_SIZE (((EECONFIG_SIZE + 3) / 4) * 4) // based off eeconfig's current usage, aligned to 4-byte sizes, to deal with LTO
 #endif
diff --git a/platforms/arm_atsam/suspend.c b/platforms/arm_atsam/suspend.c
index 73bebc4308..242e9c91a2 100644
--- a/platforms/arm_atsam/suspend.c
+++ b/platforms/arm_atsam/suspend.c
@@ -3,54 +3,18 @@
 #include "md_rgb_matrix.h"
 #include "suspend.h"
 
-/** \brief Run user level Power down
- *
- * FIXME: needs doc
- */
-__attribute__((weak)) void suspend_power_down_user(void) {}
-
-/** \brief Run keyboard level Power down
- *
- * FIXME: needs doc
- */
-__attribute__((weak)) void suspend_power_down_kb(void) { suspend_power_down_user(); }
-
 /** \brief Suspend power down
  *
  * FIXME: needs doc
  */
 void suspend_power_down(void) {
 #ifdef RGB_MATRIX_ENABLE
-    I2C3733_Control_Set(0);  // Disable LED driver
+    I2C3733_Control_Set(0); // Disable LED driver
 #endif
 
     suspend_power_down_kb();
 }
 
-__attribute__((weak)) void matrix_power_up(void) {}
-__attribute__((weak)) void matrix_power_down(void) {}
-bool                       suspend_wakeup_condition(void) {
-    matrix_power_up();
-    matrix_scan();
-    matrix_power_down();
-    for (uint8_t r = 0; r < MATRIX_ROWS; r++) {
-        if (matrix_get_row(r)) return true;
-    }
-    return false;
-}
-
-/** \brief run user level code immediately after wakeup
- *
- * FIXME: needs doc
- */
-__attribute__((weak)) void suspend_wakeup_init_user(void) {}
-
-/** \brief run keyboard level code immediately after wakeup
- *
- * FIXME: needs doc
- */
-__attribute__((weak)) void suspend_wakeup_init_kb(void) { suspend_wakeup_init_user(); }
-
 /** \brief run immediately after wakeup
  *
  * FIXME: needs doc
diff --git a/platforms/arm_atsam/timer.c b/platforms/arm_atsam/timer.c
index b835dd5e75..cf01e3625e 100644
--- a/platforms/arm_atsam/timer.c
+++ b/platforms/arm_atsam/timer.c
@@ -2,18 +2,34 @@
 #include "timer.h"
 #include "tmk_core/protocol/arm_atsam/clks.h"
 
-void set_time(uint64_t tset) { ms_clk = tset; }
+void set_time(uint64_t tset) {
+    ms_clk = tset;
+}
 
-void timer_init(void) { timer_clear(); }
+void timer_init(void) {
+    timer_clear();
+}
 
-uint16_t timer_read(void) { return (uint16_t)ms_clk; }
+uint16_t timer_read(void) {
+    return (uint16_t)ms_clk;
+}
 
-uint32_t timer_read32(void) { return (uint32_t)ms_clk; }
+uint32_t timer_read32(void) {
+    return (uint32_t)ms_clk;
+}
 
-uint64_t timer_read64(void) { return ms_clk; }
+uint64_t timer_read64(void) {
+    return ms_clk;
+}
 
-uint16_t timer_elapsed(uint16_t tlast) { return TIMER_DIFF_16(timer_read(), tlast); }
+uint16_t timer_elapsed(uint16_t tlast) {
+    return TIMER_DIFF_16(timer_read(), tlast);
+}
 
-uint32_t timer_elapsed32(uint32_t tlast) { return TIMER_DIFF_32(timer_read32(), tlast); }
+uint32_t timer_elapsed32(uint32_t tlast) {
+    return TIMER_DIFF_32(timer_read32(), tlast);
+}
 
-void timer_clear(void) { set_time(0); }
+void timer_clear(void) {
+    set_time(0);
+}
diff --git a/platforms/avr/bootloaders/none.c b/platforms/avr/bootloaders/custom.c
similarity index 100%
rename from platforms/avr/bootloaders/none.c
rename to platforms/avr/bootloaders/custom.c
diff --git a/platforms/avr/bootloaders/dfu.c b/platforms/avr/bootloaders/dfu.c
index cb42821a93..06b2c8963a 100644
--- a/platforms/avr/bootloaders/dfu.c
+++ b/platforms/avr/bootloaders/dfu.c
@@ -30,9 +30,9 @@ uint32_t reset_key __attribute__((section(".noinit,\"aw\",@nobits;")));
 
 __attribute__((weak)) void bootloader_jump(void) {
     UDCON  = 1;
-    USBCON = (1 << FRZCLK);  // disable USB
+    USBCON = (1 << FRZCLK); // disable USB
     UCSR1B = 0;
-    _delay_ms(5);  // 5 seems to work fine
+    _delay_ms(5); // 5 seems to work fine
 
     // watchdog reset
     reset_key = BOOTLOADER_RESET_KEY;
diff --git a/platforms/avr/bootloaders/halfkay.c b/platforms/avr/bootloaders/halfkay.c
index 6ce2e19114..651696f988 100644
--- a/platforms/avr/bootloaders/halfkay.c
+++ b/platforms/avr/bootloaders/halfkay.c
@@ -27,11 +27,11 @@ __attribute__((weak)) void bootloader_jump(void) {
     // disable all peripherals
     // a shutdown call might make sense here
     UDCON  = 1;
-    USBCON = (1 << FRZCLK);  // disable USB
+    USBCON = (1 << FRZCLK); // disable USB
     UCSR1B = 0;
     _delay_ms(5);
 
-#if defined(__AVR_AT90USB162__)  // Teensy 1.0
+#if defined(__AVR_AT90USB162__) // Teensy 1.0
     EIMSK  = 0;
     PCICR  = 0;
     SPCR   = 0;
@@ -47,7 +47,7 @@ __attribute__((weak)) void bootloader_jump(void) {
     PORTC  = 0;
     PORTD  = 0;
     asm volatile("jmp 0x3E00");
-#elif defined(__AVR_ATmega32U4__)   // Teensy 2.0
+#elif defined(__AVR_ATmega32U4__)  // Teensy 2.0
     EIMSK  = 0;
     PCICR  = 0;
     SPCR   = 0;
@@ -72,7 +72,7 @@ __attribute__((weak)) void bootloader_jump(void) {
     PORTE  = 0;
     PORTF  = 0;
     asm volatile("jmp 0x7E00");
-#elif defined(__AVR_AT90USB646__)   // Teensy++ 1.0
+#elif defined(__AVR_AT90USB646__)  // Teensy++ 1.0
     EIMSK  = 0;
     PCICR  = 0;
     SPCR   = 0;
@@ -98,7 +98,7 @@ __attribute__((weak)) void bootloader_jump(void) {
     PORTE  = 0;
     PORTF  = 0;
     asm volatile("jmp 0xFC00");
-#elif defined(__AVR_AT90USB1286__)  // Teensy++ 2.0
+#elif defined(__AVR_AT90USB1286__) // Teensy++ 2.0
     EIMSK  = 0;
     PCICR  = 0;
     SPCR   = 0;
diff --git a/platforms/avr/drivers/analog.c b/platforms/avr/drivers/analog.c
index 628835ccef..ed4d563609 100644
--- a/platforms/avr/drivers/analog.c
+++ b/platforms/avr/drivers/analog.c
@@ -21,9 +21,13 @@
 
 static uint8_t aref = ADC_REF_POWER;
 
-void analogReference(uint8_t mode) { aref = mode & (_BV(REFS1) | _BV(REFS0)); }
+void analogReference(uint8_t mode) {
+    aref = mode & (_BV(REFS1) | _BV(REFS0));
+}
 
-int16_t analogReadPin(pin_t pin) { return adc_read(pinToMux(pin)); }
+int16_t analogReadPin(pin_t pin) {
+    return adc_read(pinToMux(pin));
+}
 
 uint8_t pinToMux(pin_t pin) {
     switch (pin) {
diff --git a/platforms/avr/drivers/analog.h b/platforms/avr/drivers/analog.h
index fa2fb0d89b..fb13e106ff 100644
--- a/platforms/avr/drivers/analog.h
+++ b/platforms/avr/drivers/analog.h
@@ -32,21 +32,21 @@ int16_t adc_read(uint8_t mux);
 }
 #endif
 
-#define ADC_REF_EXTERNAL 0                          // AREF, Internal Vref turned off
-#define ADC_REF_POWER _BV(REFS0)                    // AVCC with external capacitor on AREF pin
-#define ADC_REF_INTERNAL (_BV(REFS1) | _BV(REFS0))  // Internal 2.56V Voltage Reference with external capacitor on AREF pin (1.1V for 328P)
+#define ADC_REF_EXTERNAL 0                         // AREF, Internal Vref turned off
+#define ADC_REF_POWER _BV(REFS0)                   // AVCC with external capacitor on AREF pin
+#define ADC_REF_INTERNAL (_BV(REFS1) | _BV(REFS0)) // Internal 2.56V Voltage Reference with external capacitor on AREF pin (1.1V for 328P)
 
 // These prescaler values are for high speed mode, ADHSM = 1
 #if F_CPU == 16000000L || F_CPU == 12000000L
-#    define ADC_PRESCALER (_BV(ADPS2) | _BV(ADPS1))  // /64
+#    define ADC_PRESCALER (_BV(ADPS2) | _BV(ADPS1)) // /64
 #elif F_CPU == 8000000L
-#    define ADC_PRESCALER (_BV(ADPS2) | _BV(ADPS0))  // /32
+#    define ADC_PRESCALER (_BV(ADPS2) | _BV(ADPS0)) // /32
 #elif F_CPU == 4000000L
-#    define ADC_PRESCALER (_BV(ADPS2))  // /16
+#    define ADC_PRESCALER (_BV(ADPS2)) // /16
 #elif F_CPU == 2000000L
-#    define ADC_PRESCALER (_BV(ADPS1) | _BV(ADPS0))  // /8
+#    define ADC_PRESCALER (_BV(ADPS1) | _BV(ADPS0)) // /8
 #elif F_CPU == 1000000L
-#    define ADC_PRESCALER _BV(ADPS1)  // /4
+#    define ADC_PRESCALER _BV(ADPS1) // /4
 #else
-#    define ADC_PRESCALER _BV(ADPS0)  // /2
+#    define ADC_PRESCALER _BV(ADPS0) // /2
 #endif
diff --git a/platforms/avr/drivers/audio_pwm_hardware.c b/platforms/avr/drivers/audio_pwm_hardware.c
index df03a4558c..78776ee48a 100644
--- a/platforms/avr/drivers/audio_pwm_hardware.c
+++ b/platforms/avr/drivers/audio_pwm_hardware.c
@@ -152,7 +152,7 @@ extern uint8_t note_timbre;
 #ifdef AUDIO1_PIN_SET
 static float channel_1_frequency = 0.0f;
 void         channel_1_set_frequency(float freq) {
-    if (freq == 0.0f)  // a pause/rest is a valid "note" with freq=0
+    if (freq == 0.0f) // a pause/rest is a valid "note" with freq=0
     {
         // disable the output, but keep the pwm-ISR going (with the previous
         // frequency) so the audio-state keeps getting updated
@@ -160,7 +160,7 @@ void         channel_1_set_frequency(float freq) {
         AUDIO1_TCCRxA &= ~(_BV(AUDIO1_COMxy1) | _BV(AUDIO1_COMxy0));
         return;
     } else {
-        AUDIO1_TCCRxA |= _BV(AUDIO1_COMxy1);  // enable output, PWM mode
+        AUDIO1_TCCRxA |= _BV(AUDIO1_COMxy1); // enable output, PWM mode
     }
 
     channel_1_frequency = freq;
@@ -202,7 +202,9 @@ void         channel_2_set_frequency(float freq) {
     AUDIO2_OCRxy = (uint16_t)((((float)F_CPU) / (freq * CPU_PRESCALER)) * note_timbre / 100);
 }
 
-float channel_2_get_frequency(void) { return channel_2_frequency; }
+float channel_2_get_frequency(void) {
+    return channel_2_frequency;
+}
 
 void channel_2_start(void) {
     AUDIO2_TIMSKx |= _BV(AUDIO2_OCIExy);
diff --git a/platforms/avr/drivers/glcdfont.c b/platforms/avr/drivers/glcdfont.c
index 5e763b054f..57a21965de 100644
--- a/platforms/avr/drivers/glcdfont.c
+++ b/platforms/avr/drivers/glcdfont.c
@@ -10,14 +10,14 @@ static const unsigned char font[] PROGMEM = {
     0x30, 0x38, 0x3E, 0x38, 0x30, 0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, 0x07, 0x00, 0x07, 0x00, 0x14, 0x7F, 0x14, 0x7F, 0x14, 0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x23, 0x13, 0x08, 0x64, 0x62, 0x36, 0x49, 0x56, 0x20, 0x50, 0x00, 0x08, 0x07, 0x03, 0x00, 0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, 0x41, 0x22, 0x1C, 0x00, 0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, 0x80, 0x70, 0x30, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x60, 0x60, 0x00, 0x20, 0x10, 0x08, 0x04, 0x02, 0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00, 0x42, 0x7F, 0x40, 0x00, 0x72, 0x49, 0x49, 0x49, 0x46, 0x21, 0x41, 0x49, 0x4D, 0x33, 0x18, 0x14, 0x12, 0x7F, 0x10, 0x27, 0x45, 0x45, 0x45, 0x39, 0x3C, 0x4A, 0x49, 0x49, 0x31, 0x41, 0x21, 0x11, 0x09, 0x07, 0x36, 0x49, 0x49, 0x49, 0x36, 0x46, 0x49, 0x49, 0x29, 0x1E, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x40, 0x34, 0x00, 0x00,
     0x00, 0x08, 0x14, 0x22, 0x41, 0x14, 0x14, 0x14, 0x14, 0x14, 0x00, 0x41, 0x22, 0x14, 0x08, 0x02, 0x01, 0x59, 0x09, 0x06, 0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x7C, 0x12, 0x11, 0x12, 0x7C, 0x7F, 0x49, 0x49, 0x49, 0x36, 0x3E, 0x41, 0x41, 0x41, 0x22, 0x7F, 0x41, 0x41, 0x41, 0x3E, 0x7F, 0x49, 0x49, 0x49, 0x41, 0x7F, 0x09, 0x09, 0x09, 0x01, 0x3E, 0x41, 0x41, 0x51, 0x73, 0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00, 0x41, 0x7F, 0x41, 0x00, 0x20, 0x40, 0x41, 0x3F, 0x01, 0x7F, 0x08, 0x14, 0x22, 0x41, 0x7F, 0x40, 0x40, 0x40, 0x40, 0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x7F, 0x04, 0x08, 0x10, 0x7F, 0x3E, 0x41, 0x41, 0x41, 0x3E, 0x7F, 0x09, 0x09, 0x09, 0x06, 0x3E, 0x41, 0x51, 0x21, 0x5E, 0x7F, 0x09, 0x19, 0x29, 0x46, 0x26, 0x49, 0x49, 0x49, 0x32, 0x03, 0x01, 0x7F, 0x01, 0x03, 0x3F, 0x40, 0x40, 0x40, 0x3F, 0x1F, 0x20, 0x40, 0x20, 0x1F, 0x3F, 0x40, 0x38, 0x40, 0x3F, 0x63, 0x14, 0x08, 0x14, 0x63, 0x03, 0x04, 0x78, 0x04, 0x03,
     0x61, 0x59, 0x49, 0x4D, 0x43, 0x00, 0x7F, 0x41, 0x41, 0x41, 0x02, 0x04, 0x08, 0x10, 0x20, 0x00, 0x41, 0x41, 0x41, 0x7F, 0x04, 0x02, 0x01, 0x02, 0x04, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 0x03, 0x07, 0x08, 0x00, 0x20, 0x54, 0x54, 0x78, 0x40, 0x7F, 0x28, 0x44, 0x44, 0x38, 0x38, 0x44, 0x44, 0x44, 0x28, 0x38, 0x44, 0x44, 0x28, 0x7F, 0x38, 0x54, 0x54, 0x54, 0x18, 0x00, 0x08, 0x7E, 0x09, 0x02, 0x18, 0xA4, 0xA4, 0x9C, 0x78, 0x7F, 0x08, 0x04, 0x04, 0x78, 0x00, 0x44, 0x7D, 0x40, 0x00, 0x20, 0x40, 0x40, 0x3D, 0x00, 0x7F, 0x10, 0x28, 0x44, 0x00, 0x00, 0x41, 0x7F, 0x40, 0x00, 0x7C, 0x04, 0x78, 0x04, 0x78, 0x7C, 0x08, 0x04, 0x04, 0x78, 0x38, 0x44, 0x44, 0x44, 0x38, 0xFC, 0x18, 0x24, 0x24, 0x18, 0x18, 0x24, 0x24, 0x18, 0xFC, 0x7C, 0x08, 0x04, 0x04, 0x08, 0x48, 0x54, 0x54, 0x54, 0x24, 0x04, 0x04, 0x3F, 0x44, 0x24, 0x3C, 0x40, 0x40, 0x20, 0x7C, 0x1C, 0x20, 0x40, 0x20, 0x1C, 0x3C, 0x40, 0x30, 0x40, 0x3C,
-    0x44, 0x28, 0x10, 0x28, 0x44, 0x4C, 0x90, 0x90, 0x90, 0x7C, 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00, 0x08, 0x36, 0x41, 0x00, 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, 0x41, 0x36, 0x08, 0x00, 0x02, 0x01, 0x02, 0x04, 0x02, 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x1E, 0xA1, 0xA1, 0x61, 0x12, 0x3A, 0x40, 0x40, 0x20, 0x7A, 0x38, 0x54, 0x54, 0x55, 0x59, 0x21, 0x55, 0x55, 0x79, 0x41, 0x22, 0x54, 0x54, 0x78, 0x42,                                                                                                                                                                                                                                                                                                              // a-umlaut
-    0x21, 0x55, 0x54, 0x78, 0x40, 0x20, 0x54, 0x55, 0x79, 0x40, 0x0C, 0x1E, 0x52, 0x72, 0x12, 0x39, 0x55, 0x55, 0x55, 0x59, 0x39, 0x54, 0x54, 0x54, 0x59, 0x39, 0x55, 0x54, 0x54, 0x58, 0x00, 0x00, 0x45, 0x7C, 0x41, 0x00, 0x02, 0x45, 0x7D, 0x42, 0x00, 0x01, 0x45, 0x7C, 0x40, 0x7D, 0x12, 0x11, 0x12, 0x7D,                                                                                                                                                                                                                                                                                                                                                                                                        // A-umlaut
-    0xF0, 0x28, 0x25, 0x28, 0xF0, 0x7C, 0x54, 0x55, 0x45, 0x00, 0x20, 0x54, 0x54, 0x7C, 0x54, 0x7C, 0x0A, 0x09, 0x7F, 0x49, 0x32, 0x49, 0x49, 0x49, 0x32, 0x3A, 0x44, 0x44, 0x44, 0x3A,                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                // o-umlaut
-    0x32, 0x4A, 0x48, 0x48, 0x30, 0x3A, 0x41, 0x41, 0x21, 0x7A, 0x3A, 0x42, 0x40, 0x20, 0x78, 0x00, 0x9D, 0xA0, 0xA0, 0x7D, 0x3D, 0x42, 0x42, 0x42, 0x3D,                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              // O-umlaut
-    0x3D, 0x40, 0x40, 0x40, 0x3D, 0x3C, 0x24, 0xFF, 0x24, 0x24, 0x48, 0x7E, 0x49, 0x43, 0x66, 0x2B, 0x2F, 0xFC, 0x2F, 0x2B, 0xFF, 0x09, 0x29, 0xF6, 0x20, 0xC0, 0x88, 0x7E, 0x09, 0x03, 0x20, 0x54, 0x54, 0x79, 0x41, 0x00, 0x00, 0x44, 0x7D, 0x41, 0x30, 0x48, 0x48, 0x4A, 0x32, 0x38, 0x40, 0x40, 0x22, 0x7A, 0x00, 0x7A, 0x0A, 0x0A, 0x72, 0x7D, 0x0D, 0x19, 0x31, 0x7D, 0x26, 0x29, 0x29, 0x2F, 0x28, 0x26, 0x29, 0x29, 0x29, 0x26, 0x30, 0x48, 0x4D, 0x40, 0x20, 0x38, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x38, 0x2F, 0x10, 0xC8, 0xAC, 0xBA, 0x2F, 0x10, 0x28, 0x34, 0xFA, 0x00, 0x00, 0x7B, 0x00, 0x00, 0x08, 0x14, 0x2A, 0x14, 0x22, 0x22, 0x14, 0x2A, 0x14, 0x08, 0x55, 0x00, 0x55, 0x00, 0x55,  // #176 (25% block) missing in old code
-    0xAA, 0x55, 0xAA, 0x55, 0xAA,                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      // 50% block
-    0xFF, 0x55, 0xFF, 0x55, 0xFF,                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      // 75% block
+    0x44, 0x28, 0x10, 0x28, 0x44, 0x4C, 0x90, 0x90, 0x90, 0x7C, 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00, 0x08, 0x36, 0x41, 0x00, 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, 0x41, 0x36, 0x08, 0x00, 0x02, 0x01, 0x02, 0x04, 0x02, 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x1E, 0xA1, 0xA1, 0x61, 0x12, 0x3A, 0x40, 0x40, 0x20, 0x7A, 0x38, 0x54, 0x54, 0x55, 0x59, 0x21, 0x55, 0x55, 0x79, 0x41, 0x22, 0x54, 0x54, 0x78, 0x42,                                                                                                                                                                                                                                                                                                             // a-umlaut
+    0x21, 0x55, 0x54, 0x78, 0x40, 0x20, 0x54, 0x55, 0x79, 0x40, 0x0C, 0x1E, 0x52, 0x72, 0x12, 0x39, 0x55, 0x55, 0x55, 0x59, 0x39, 0x54, 0x54, 0x54, 0x59, 0x39, 0x55, 0x54, 0x54, 0x58, 0x00, 0x00, 0x45, 0x7C, 0x41, 0x00, 0x02, 0x45, 0x7D, 0x42, 0x00, 0x01, 0x45, 0x7C, 0x40, 0x7D, 0x12, 0x11, 0x12, 0x7D,                                                                                                                                                                                                                                                                                                                                                                                                       // A-umlaut
+    0xF0, 0x28, 0x25, 0x28, 0xF0, 0x7C, 0x54, 0x55, 0x45, 0x00, 0x20, 0x54, 0x54, 0x7C, 0x54, 0x7C, 0x0A, 0x09, 0x7F, 0x49, 0x32, 0x49, 0x49, 0x49, 0x32, 0x3A, 0x44, 0x44, 0x44, 0x3A,                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               // o-umlaut
+    0x32, 0x4A, 0x48, 0x48, 0x30, 0x3A, 0x41, 0x41, 0x21, 0x7A, 0x3A, 0x42, 0x40, 0x20, 0x78, 0x00, 0x9D, 0xA0, 0xA0, 0x7D, 0x3D, 0x42, 0x42, 0x42, 0x3D,                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             // O-umlaut
+    0x3D, 0x40, 0x40, 0x40, 0x3D, 0x3C, 0x24, 0xFF, 0x24, 0x24, 0x48, 0x7E, 0x49, 0x43, 0x66, 0x2B, 0x2F, 0xFC, 0x2F, 0x2B, 0xFF, 0x09, 0x29, 0xF6, 0x20, 0xC0, 0x88, 0x7E, 0x09, 0x03, 0x20, 0x54, 0x54, 0x79, 0x41, 0x00, 0x00, 0x44, 0x7D, 0x41, 0x30, 0x48, 0x48, 0x4A, 0x32, 0x38, 0x40, 0x40, 0x22, 0x7A, 0x00, 0x7A, 0x0A, 0x0A, 0x72, 0x7D, 0x0D, 0x19, 0x31, 0x7D, 0x26, 0x29, 0x29, 0x2F, 0x28, 0x26, 0x29, 0x29, 0x29, 0x26, 0x30, 0x48, 0x4D, 0x40, 0x20, 0x38, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x38, 0x2F, 0x10, 0xC8, 0xAC, 0xBA, 0x2F, 0x10, 0x28, 0x34, 0xFA, 0x00, 0x00, 0x7B, 0x00, 0x00, 0x08, 0x14, 0x2A, 0x14, 0x22, 0x22, 0x14, 0x2A, 0x14, 0x08, 0x55, 0x00, 0x55, 0x00, 0x55, // #176 (25% block) missing in old code
+    0xAA, 0x55, 0xAA, 0x55, 0xAA,                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     // 50% block
+    0xFF, 0x55, 0xFF, 0x55, 0xFF,                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     // 75% block
     0x00, 0x00, 0x00, 0xFF, 0x00, 0x10, 0x10, 0x10, 0xFF, 0x00, 0x14, 0x14, 0x14, 0xFF, 0x00, 0x10, 0x10, 0xFF, 0x00, 0xFF, 0x10, 0x10, 0xF0, 0x10, 0xF0, 0x14, 0x14, 0x14, 0xFC, 0x00, 0x14, 0x14, 0xF7, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0x14, 0x14, 0xF4, 0x04, 0xFC, 0x14, 0x14, 0x17, 0x10, 0x1F, 0x10, 0x10, 0x1F, 0x10, 0x1F, 0x14, 0x14, 0x14, 0x1F, 0x00, 0x10, 0x10, 0x10, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x10, 0x10, 0x10, 0x10, 0x1F, 0x10, 0x10, 0x10, 0x10, 0xF0, 0x10, 0x00, 0x00, 0x00, 0xFF, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0xFF, 0x10, 0x00, 0x00, 0x00, 0xFF, 0x14, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x1F, 0x10, 0x17, 0x00, 0x00, 0xFC, 0x04, 0xF4, 0x14, 0x14, 0x17, 0x10, 0x17, 0x14, 0x14, 0xF4, 0x04, 0xF4, 0x00, 0x00, 0xFF, 0x00, 0xF7, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0xF7, 0x00, 0xF7, 0x14, 0x14, 0x14, 0x17, 0x14, 0x10, 0x10, 0x1F, 0x10, 0x1F,
-    0x14, 0x14, 0x14, 0xF4, 0x14, 0x10, 0x10, 0xF0, 0x10, 0xF0, 0x00, 0x00, 0x1F, 0x10, 0x1F, 0x00, 0x00, 0x00, 0x1F, 0x14, 0x00, 0x00, 0x00, 0xFC, 0x14, 0x00, 0x00, 0xF0, 0x10, 0xF0, 0x10, 0x10, 0xFF, 0x10, 0xFF, 0x14, 0x14, 0x14, 0xFF, 0x14, 0x10, 0x10, 0x10, 0x1F, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x38, 0x44, 0x44, 0x38, 0x44, 0xFC, 0x4A, 0x4A, 0x4A, 0x34,                                                                                                                                                                                                                                                                                                                                                                                                       // sharp-s or beta
-    0x7E, 0x02, 0x02, 0x06, 0x06, 0x02, 0x7E, 0x02, 0x7E, 0x02, 0x63, 0x55, 0x49, 0x41, 0x63, 0x38, 0x44, 0x44, 0x3C, 0x04, 0x40, 0x7E, 0x20, 0x1E, 0x20, 0x06, 0x02, 0x7E, 0x02, 0x02, 0x99, 0xA5, 0xE7, 0xA5, 0x99, 0x1C, 0x2A, 0x49, 0x2A, 0x1C, 0x4C, 0x72, 0x01, 0x72, 0x4C, 0x30, 0x4A, 0x4D, 0x4D, 0x30, 0x30, 0x48, 0x78, 0x48, 0x30, 0xBC, 0x62, 0x5A, 0x46, 0x3D, 0x3E, 0x49, 0x49, 0x49, 0x00, 0x7E, 0x01, 0x01, 0x01, 0x7E, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x44, 0x44, 0x5F, 0x44, 0x44, 0x40, 0x51, 0x4A, 0x44, 0x40, 0x40, 0x44, 0x4A, 0x51, 0x40, 0x00, 0x00, 0xFF, 0x01, 0x03, 0xE0, 0x80, 0xFF, 0x00, 0x00, 0x08, 0x08, 0x6B, 0x6B, 0x08, 0x36, 0x12, 0x36, 0x24, 0x36, 0x06, 0x0F, 0x09, 0x0F, 0x06, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x30, 0x40, 0xFF, 0x01, 0x01, 0x00, 0x1F, 0x01, 0x01, 0x1E, 0x00, 0x19, 0x1D, 0x17, 0x12, 0x00, 0x3C, 0x3C, 0x3C, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00  // #255 NBSP
+    0x14, 0x14, 0x14, 0xF4, 0x14, 0x10, 0x10, 0xF0, 0x10, 0xF0, 0x00, 0x00, 0x1F, 0x10, 0x1F, 0x00, 0x00, 0x00, 0x1F, 0x14, 0x00, 0x00, 0x00, 0xFC, 0x14, 0x00, 0x00, 0xF0, 0x10, 0xF0, 0x10, 0x10, 0xFF, 0x10, 0xFF, 0x14, 0x14, 0x14, 0xFF, 0x14, 0x10, 0x10, 0x10, 0x1F, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x38, 0x44, 0x44, 0x38, 0x44, 0xFC, 0x4A, 0x4A, 0x4A, 0x34,                                                                                                                                                                                                                                                                                                                                                                                                      // sharp-s or beta
+    0x7E, 0x02, 0x02, 0x06, 0x06, 0x02, 0x7E, 0x02, 0x7E, 0x02, 0x63, 0x55, 0x49, 0x41, 0x63, 0x38, 0x44, 0x44, 0x3C, 0x04, 0x40, 0x7E, 0x20, 0x1E, 0x20, 0x06, 0x02, 0x7E, 0x02, 0x02, 0x99, 0xA5, 0xE7, 0xA5, 0x99, 0x1C, 0x2A, 0x49, 0x2A, 0x1C, 0x4C, 0x72, 0x01, 0x72, 0x4C, 0x30, 0x4A, 0x4D, 0x4D, 0x30, 0x30, 0x48, 0x78, 0x48, 0x30, 0xBC, 0x62, 0x5A, 0x46, 0x3D, 0x3E, 0x49, 0x49, 0x49, 0x00, 0x7E, 0x01, 0x01, 0x01, 0x7E, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x44, 0x44, 0x5F, 0x44, 0x44, 0x40, 0x51, 0x4A, 0x44, 0x40, 0x40, 0x44, 0x4A, 0x51, 0x40, 0x00, 0x00, 0xFF, 0x01, 0x03, 0xE0, 0x80, 0xFF, 0x00, 0x00, 0x08, 0x08, 0x6B, 0x6B, 0x08, 0x36, 0x12, 0x36, 0x24, 0x36, 0x06, 0x0F, 0x09, 0x0F, 0x06, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x30, 0x40, 0xFF, 0x01, 0x01, 0x00, 0x1F, 0x01, 0x01, 0x1E, 0x00, 0x19, 0x1D, 0x17, 0x12, 0x00, 0x3C, 0x3C, 0x3C, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00 // #255 NBSP
 };
diff --git a/platforms/avr/drivers/hd44780.c b/platforms/avr/drivers/hd44780.c
index f71069dece..f15d7d0da8 100644
--- a/platforms/avr/drivers/hd44780.c
+++ b/platforms/avr/drivers/hd44780.c
@@ -262,7 +262,7 @@ static uint8_t lcd_waitbusy(void)
     delay(LCD_DELAY_BUSY_FLAG);
 
     /* now read the address counter */
-    return (lcd_read(0));  // return address counter
+    return (lcd_read(0)); // return address counter
 
 } /* lcd_waitbusy */
 
@@ -362,17 +362,23 @@ void lcd_gotoxy(uint8_t x, uint8_t y) {
 
 /*************************************************************************
 *************************************************************************/
-int lcd_getxy(void) { return lcd_waitbusy(); }
+int lcd_getxy(void) {
+    return lcd_waitbusy();
+}
 
 /*************************************************************************
 Clear display and set cursor to home position
 *************************************************************************/
-void lcd_clrscr(void) { lcd_command(1 << LCD_CLR); }
+void lcd_clrscr(void) {
+    lcd_command(1 << LCD_CLR);
+}
 
 /*************************************************************************
 Set cursor to home position
 *************************************************************************/
-void lcd_home(void) { lcd_command(1 << LCD_HOME); }
+void lcd_home(void) {
+    lcd_command(1 << LCD_HOME);
+}
 
 /*************************************************************************
 Display character at current cursor position
@@ -382,7 +388,7 @@ Returns:  none
 void lcd_putc(char c) {
     uint8_t pos;
 
-    pos = lcd_waitbusy();  // read busy-flag and address counter
+    pos = lcd_waitbusy(); // read busy-flag and address counter
     if (c == '\n') {
         lcd_newline(pos);
     } else {
@@ -483,8 +489,8 @@ void lcd_init(uint8_t dispAttr) {
     delay(LCD_DELAY_BOOTUP); /* wait 16ms or more after power-on       */
 
     /* initial write to lcd is 8bit */
-    LCD_DATA1_PORT |= _BV(LCD_DATA1_PIN);  // LCD_FUNCTION>>4;
-    LCD_DATA0_PORT |= _BV(LCD_DATA0_PIN);  // LCD_FUNCTION_8BIT>>4;
+    LCD_DATA1_PORT |= _BV(LCD_DATA1_PIN); // LCD_FUNCTION>>4;
+    LCD_DATA0_PORT |= _BV(LCD_DATA0_PIN); // LCD_FUNCTION_8BIT>>4;
     lcd_e_toggle();
     delay(LCD_DELAY_INIT); /* delay, busy flag can't be checked here */
 
@@ -497,7 +503,7 @@ void lcd_init(uint8_t dispAttr) {
     delay(LCD_DELAY_INIT_REP); /* delay, busy flag can't be checked here */
 
     /* now configure for 4bit mode */
-    LCD_DATA0_PORT &= ~_BV(LCD_DATA0_PIN);  // LCD_FUNCTION_4BIT_1LINE>>4
+    LCD_DATA0_PORT &= ~_BV(LCD_DATA0_PIN); // LCD_FUNCTION_4BIT_1LINE>>4
     lcd_e_toggle();
     delay(LCD_DELAY_INIT_4BIT); /* some displays need this additional delay */
 
diff --git a/platforms/avr/drivers/i2c_master.c b/platforms/avr/drivers/i2c_master.c
index d4024378ca..c1a7b5f72d 100644
--- a/platforms/avr/drivers/i2c_master.c
+++ b/platforms/avr/drivers/i2c_master.c
@@ -25,12 +25,12 @@
 #include "wait.h"
 
 #ifndef F_SCL
-#    define F_SCL 400000UL  // SCL frequency
+#    define F_SCL 400000UL // SCL frequency
 #endif
 
 #ifndef I2C_START_RETRY_COUNT
 #    define I2C_START_RETRY_COUNT 20
-#endif  // I2C_START_RETRY_COUNT
+#endif // I2C_START_RETRY_COUNT
 
 #define I2C_ACTION_READ 0x01
 #define I2C_ACTION_WRITE 0x00
@@ -98,7 +98,7 @@ static i2c_status_t i2c_start_impl(uint8_t address, uint16_t timeout) {
 i2c_status_t i2c_start(uint8_t address, uint16_t timeout) {
     // Retry i2c_start_impl a bunch times in case the remote side has interrupts disabled.
     uint16_t     timeout_timer = timer_read();
-    uint16_t     time_slice    = MAX(1, (timeout == (I2C_TIMEOUT_INFINITE)) ? 5 : (timeout / (I2C_START_RETRY_COUNT)));  // if it's infinite, wait 1ms between attempts, otherwise split up the entire timeout into the number of retries
+    uint16_t     time_slice    = MAX(1, (timeout == (I2C_TIMEOUT_INFINITE)) ? 5 : (timeout / (I2C_START_RETRY_COUNT))); // if it's infinite, wait 1ms between attempts, otherwise split up the entire timeout into the number of retries
     i2c_status_t status;
     do {
         status = i2c_start_impl(address, time_slice);
diff --git a/platforms/avr/drivers/i2c_slave.c b/platforms/avr/drivers/i2c_slave.c
index 2907f164c0..660d271be2 100644
--- a/platforms/avr/drivers/i2c_slave.c
+++ b/platforms/avr/drivers/i2c_slave.c
@@ -29,7 +29,7 @@
 #    include "transactions.h"
 
 static volatile bool is_callback_executor = false;
-#endif  // defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
+#endif // defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
 
 volatile uint8_t i2c_slave_reg[I2C_SLAVE_REG_COUNT];
 
@@ -57,7 +57,7 @@ ISR(TWI_vect) {
             slave_has_register_set = false;
 #if defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
             is_callback_executor = false;
-#endif  // defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
+#endif // defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
             break;
 
         case TW_SR_DATA_ACK:
@@ -66,16 +66,16 @@ ISR(TWI_vect) {
             if (!slave_has_register_set) {
                 buffer_address = TWDR;
 
-                if (buffer_address >= I2C_SLAVE_REG_COUNT) {  // address out of bounds dont ack
+                if (buffer_address >= I2C_SLAVE_REG_COUNT) { // address out of bounds dont ack
                     ack            = 0;
                     buffer_address = 0;
                 }
-                slave_has_register_set = true;  // address has been received now fill in buffer
+                slave_has_register_set = true; // address has been received now fill in buffer
 
 #if defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
                 // Work out if we're attempting to execute a callback
                 is_callback_executor = buffer_address == split_transaction_table[I2C_EXECUTE_CALLBACK].initiator2target_offset;
-#endif  // defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
+#endif // defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
             } else {
                 i2c_slave_reg[buffer_address] = TWDR;
                 buffer_address++;
@@ -88,7 +88,7 @@ ISR(TWI_vect) {
                         trans->slave_callback(trans->initiator2target_buffer_size, split_trans_initiator2target_buffer(trans), trans->target2initiator_buffer_size, split_trans_target2initiator_buffer(trans));
                     }
                 }
-#endif  // defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
+#endif // defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
             }
             break;
 
diff --git a/platforms/avr/drivers/i2c_slave.h b/platforms/avr/drivers/i2c_slave.h
index a8647c9da3..178b6a29df 100644
--- a/platforms/avr/drivers/i2c_slave.h
+++ b/platforms/avr/drivers/i2c_slave.h
@@ -27,11 +27,11 @@
 #    if defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
 #        include "transport.h"
 #        define I2C_SLAVE_REG_COUNT sizeof(split_shared_memory_t)
-#    else  // defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
+#    else // defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
 #        define I2C_SLAVE_REG_COUNT 30
-#    endif  // defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
+#    endif // defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
 
-#endif  // I2C_SLAVE_REG_COUNT
+#endif // I2C_SLAVE_REG_COUNT
 
 _Static_assert(I2C_SLAVE_REG_COUNT < 256, "I2C target registers must be single byte");
 
diff --git a/platforms/avr/drivers/ps2/ps2_io.c b/platforms/avr/drivers/ps2/ps2_io.c
index 7c826fbf1a..b75a1ab0be 100644
--- a/platforms/avr/drivers/ps2/ps2_io.c
+++ b/platforms/avr/drivers/ps2/ps2_io.c
@@ -23,7 +23,9 @@ void clock_lo(void) {
     setPinOutput(PS2_CLOCK_PIN);
 }
 
-void clock_hi(void) { setPinInputHigh(PS2_CLOCK_PIN); }
+void clock_hi(void) {
+    setPinInputHigh(PS2_CLOCK_PIN);
+}
 
 bool clock_in(void) {
     setPinInputHigh(PS2_CLOCK_PIN);
@@ -42,7 +44,9 @@ void data_lo(void) {
     setPinOutput(PS2_DATA_PIN);
 }
 
-void data_hi(void) { setPinInputHigh(PS2_DATA_PIN); }
+void data_hi(void) {
+    setPinInputHigh(PS2_DATA_PIN);
+}
 
 bool data_in(void) {
     setPinInputHigh(PS2_DATA_PIN);
diff --git a/platforms/avr/drivers/ps2/ps2_usart.c b/platforms/avr/drivers/ps2/ps2_usart.c
index 151cfcd68f..39ec930d4a 100644
--- a/platforms/avr/drivers/ps2/ps2_usart.c
+++ b/platforms/avr/drivers/ps2/ps2_usart.c
@@ -76,7 +76,7 @@ static inline bool    pbuf_has_data(void);
 static inline void    pbuf_clear(void);
 
 void ps2_host_init(void) {
-    idle();  // without this many USART errors occur when cable is disconnected
+    idle(); // without this many USART errors occur when cable is disconnected
     PS2_USART_INIT();
     PS2_USART_RX_INT_ON();
     // POR(150-2000ms) plus BAT(300-500ms) may take 2.5sec([3]p.20)
@@ -91,12 +91,12 @@ uint8_t ps2_host_send(uint8_t data) {
 
     /* terminate a transmission if we have */
     inhibit();
-    _delay_us(100);  // [4]p.13
+    _delay_us(100); // [4]p.13
 
     /* 'Request to Send' and Start bit */
     data_lo();
     clock_hi();
-    WAIT(clock_lo, 10000, 10);  // 10ms [5]p.50
+    WAIT(clock_lo, 10000, 10); // 10ms [5]p.50
 
     /* Data bit[2-9] */
     for (uint8_t i = 0; i < 8; i++) {
@@ -165,7 +165,7 @@ uint8_t ps2_host_recv(void) {
 
 ISR(PS2_USART_RX_VECT) {
     // TODO: request RESEND when error occurs?
-    uint8_t error = PS2_USART_ERROR;  // USART error should be read before data
+    uint8_t error = PS2_USART_ERROR; // USART error should be read before data
     uint8_t data  = PS2_USART_RX_DATA;
     if (!error) {
         pbuf_enqueue(data);
diff --git a/platforms/avr/drivers/serial.c b/platforms/avr/drivers/serial.c
index 62908e5875..6a36aa5f7f 100644
--- a/platforms/avr/drivers/serial.c
+++ b/platforms/avr/drivers/serial.c
@@ -156,59 +156,59 @@
 
 #        if SELECT_SOFT_SERIAL_SPEED == 0
 // Very High speed
-#            define SERIAL_DELAY 4  // micro sec
+#            define SERIAL_DELAY 4 // micro sec
 #            if __GNUC__ < 6
-#                define READ_WRITE_START_ADJUST 33  // cycles
-#                define READ_WRITE_WIDTH_ADJUST 3   // cycles
+#                define READ_WRITE_START_ADJUST 33 // cycles
+#                define READ_WRITE_WIDTH_ADJUST 3  // cycles
 #            else
-#                define READ_WRITE_START_ADJUST 34  // cycles
-#                define READ_WRITE_WIDTH_ADJUST 7   // cycles
+#                define READ_WRITE_START_ADJUST 34 // cycles
+#                define READ_WRITE_WIDTH_ADJUST 7  // cycles
 #            endif
 #        elif SELECT_SOFT_SERIAL_SPEED == 1
 // High speed
-#            define SERIAL_DELAY 6  // micro sec
+#            define SERIAL_DELAY 6 // micro sec
 #            if __GNUC__ < 6
-#                define READ_WRITE_START_ADJUST 30  // cycles
-#                define READ_WRITE_WIDTH_ADJUST 3   // cycles
+#                define READ_WRITE_START_ADJUST 30 // cycles
+#                define READ_WRITE_WIDTH_ADJUST 3  // cycles
 #            else
-#                define READ_WRITE_START_ADJUST 33  // cycles
-#                define READ_WRITE_WIDTH_ADJUST 7   // cycles
+#                define READ_WRITE_START_ADJUST 33 // cycles
+#                define READ_WRITE_WIDTH_ADJUST 7  // cycles
 #            endif
 #        elif SELECT_SOFT_SERIAL_SPEED == 2
 // Middle speed
-#            define SERIAL_DELAY 12             // micro sec
-#            define READ_WRITE_START_ADJUST 30  // cycles
+#            define SERIAL_DELAY 12            // micro sec
+#            define READ_WRITE_START_ADJUST 30 // cycles
 #            if __GNUC__ < 6
-#                define READ_WRITE_WIDTH_ADJUST 3  // cycles
+#                define READ_WRITE_WIDTH_ADJUST 3 // cycles
 #            else
-#                define READ_WRITE_WIDTH_ADJUST 7  // cycles
+#                define READ_WRITE_WIDTH_ADJUST 7 // cycles
 #            endif
 #        elif SELECT_SOFT_SERIAL_SPEED == 3
 // Low speed
-#            define SERIAL_DELAY 24             // micro sec
-#            define READ_WRITE_START_ADJUST 30  // cycles
+#            define SERIAL_DELAY 24            // micro sec
+#            define READ_WRITE_START_ADJUST 30 // cycles
 #            if __GNUC__ < 6
-#                define READ_WRITE_WIDTH_ADJUST 3  // cycles
+#                define READ_WRITE_WIDTH_ADJUST 3 // cycles
 #            else
-#                define READ_WRITE_WIDTH_ADJUST 7  // cycles
+#                define READ_WRITE_WIDTH_ADJUST 7 // cycles
 #            endif
 #        elif SELECT_SOFT_SERIAL_SPEED == 4
 // Very Low speed
-#            define SERIAL_DELAY 36             // micro sec
-#            define READ_WRITE_START_ADJUST 30  // cycles
+#            define SERIAL_DELAY 36            // micro sec
+#            define READ_WRITE_START_ADJUST 30 // cycles
 #            if __GNUC__ < 6
-#                define READ_WRITE_WIDTH_ADJUST 3  // cycles
+#                define READ_WRITE_WIDTH_ADJUST 3 // cycles
 #            else
-#                define READ_WRITE_WIDTH_ADJUST 7  // cycles
+#                define READ_WRITE_WIDTH_ADJUST 7 // cycles
 #            endif
 #        elif SELECT_SOFT_SERIAL_SPEED == 5
 // Ultra Low speed
-#            define SERIAL_DELAY 48             // micro sec
-#            define READ_WRITE_START_ADJUST 30  // cycles
+#            define SERIAL_DELAY 48            // micro sec
+#            define READ_WRITE_START_ADJUST 30 // cycles
 #            if __GNUC__ < 6
-#                define READ_WRITE_WIDTH_ADJUST 3  // cycles
+#                define READ_WRITE_WIDTH_ADJUST 3 // cycles
 #            else
-#                define READ_WRITE_WIDTH_ADJUST 7  // cycles
+#                define READ_WRITE_WIDTH_ADJUST 7 // cycles
 #            endif
 #        else
 #            error invalid SELECT_SOFT_SERIAL_SPEED value
@@ -223,29 +223,45 @@
 #    define SLAVE_INT_ACK_WIDTH 4
 
 inline static void serial_delay(void) ALWAYS_INLINE;
-inline static void serial_delay(void) { _delay_us(SERIAL_DELAY); }
+inline static void serial_delay(void) {
+    _delay_us(SERIAL_DELAY);
+}
 
 inline static void serial_delay_half1(void) ALWAYS_INLINE;
-inline static void serial_delay_half1(void) { _delay_us(SERIAL_DELAY_HALF1); }
+inline static void serial_delay_half1(void) {
+    _delay_us(SERIAL_DELAY_HALF1);
+}
 
 inline static void serial_delay_half2(void) ALWAYS_INLINE;
-inline static void serial_delay_half2(void) { _delay_us(SERIAL_DELAY_HALF2); }
+inline static void serial_delay_half2(void) {
+    _delay_us(SERIAL_DELAY_HALF2);
+}
 
 inline static void serial_output(void) ALWAYS_INLINE;
-inline static void serial_output(void) { setPinOutput(SOFT_SERIAL_PIN); }
+inline static void serial_output(void) {
+    setPinOutput(SOFT_SERIAL_PIN);
+}
 
 // make the serial pin an input with pull-up resistor
 inline static void serial_input_with_pullup(void) ALWAYS_INLINE;
-inline static void serial_input_with_pullup(void) { setPinInputHigh(SOFT_SERIAL_PIN); }
+inline static void serial_input_with_pullup(void) {
+    setPinInputHigh(SOFT_SERIAL_PIN);
+}
 
 inline static uint8_t serial_read_pin(void) ALWAYS_INLINE;
-inline static uint8_t serial_read_pin(void) { return !!readPin(SOFT_SERIAL_PIN); }
+inline static uint8_t serial_read_pin(void) {
+    return !!readPin(SOFT_SERIAL_PIN);
+}
 
 inline static void serial_low(void) ALWAYS_INLINE;
-inline static void serial_low(void) { writePinLow(SOFT_SERIAL_PIN); }
+inline static void serial_low(void) {
+    writePinLow(SOFT_SERIAL_PIN);
+}
 
 inline static void serial_high(void) ALWAYS_INLINE;
-inline static void serial_high(void) { writePinHigh(SOFT_SERIAL_PIN); }
+inline static void serial_high(void) {
+    writePinHigh(SOFT_SERIAL_PIN);
+}
 
 void soft_serial_initiator_init(void) {
     serial_output();
@@ -286,7 +302,7 @@ static uint8_t serial_read_chunk(uint8_t *pterrcount, uint8_t bit) {
 
     _delay_sub_us(READ_WRITE_START_ADJUST);
     for (i = 0, byte = 0, p = PARITY; i < bit; i++) {
-        serial_delay_half1();  // read the middle of pulses
+        serial_delay_half1(); // read the middle of pulses
         if (serial_read_pin()) {
             byte = (byte << 1) | 1;
             p ^= 1;
@@ -298,7 +314,7 @@ static uint8_t serial_read_chunk(uint8_t *pterrcount, uint8_t bit) {
         serial_delay_half2();
     }
     /* recive parity bit */
-    serial_delay_half1();  // read the middle of pulses
+    serial_delay_half1(); // read the middle of pulses
     pb = serial_read_pin();
     _delay_sub_us(READ_WRITE_WIDTH_ADJUST);
     serial_delay_half2();
@@ -330,7 +346,7 @@ void serial_write_chunk(uint8_t data, uint8_t bit) {
     }
     serial_delay();
 
-    serial_low();  // sync_send() / senc_recv() need raise edge
+    serial_low(); // sync_send() / senc_recv() need raise edge
 }
 
 static void serial_send_packet(uint8_t *buffer, uint8_t size) NO_INLINE;
@@ -356,19 +372,19 @@ static uint8_t serial_recive_packet(uint8_t *buffer, uint8_t size) {
 }
 
 inline static void change_sender2reciver(void) {
-    sync_send();                 // 0
-    serial_delay_half1();        // 1
-    serial_low();                // 2
-    serial_input_with_pullup();  // 2
-    serial_delay_half1();        // 3
+    sync_send();                // 0
+    serial_delay_half1();       // 1
+    serial_low();               // 2
+    serial_input_with_pullup(); // 2
+    serial_delay_half1();       // 3
 }
 
 inline static void change_reciver2sender(void) {
-    sync_recv();           // 0
-    serial_delay();        // 1
-    serial_low();          // 3
-    serial_output();       // 3
-    serial_delay_half1();  // 4
+    sync_recv();          // 0
+    serial_delay();       // 1
+    serial_low();         // 3
+    serial_output();      // 3
+    serial_delay_half1(); // 4
 }
 
 static inline uint8_t nibble_bits_count(uint8_t bits) {
@@ -391,11 +407,11 @@ ISR(SERIAL_PIN_INTERRUPT) {
     }
     serial_delay_half1();
 
-    serial_high();  // response step1 low->high
+    serial_high(); // response step1 low->high
     serial_output();
     _delay_sub_us(SLAVE_INT_ACK_WIDTH_UNIT * SLAVE_INT_ACK_WIDTH);
     split_transaction_desc_t *trans = &split_transaction_table[tid];
-    serial_low();  // response step2 ack high->low
+    serial_low(); // response step2 ack high->low
 
     // If the transaction has a callback, we can execute it now
     if (trans->slave_callback) {
@@ -412,7 +428,7 @@ ISR(SERIAL_PIN_INTERRUPT) {
         serial_recive_packet((uint8_t *)split_trans_initiator2target_buffer(trans), trans->initiator2target_buffer_size);
     }
 
-    sync_recv();  // weit initiator output to high
+    sync_recv(); // weit initiator output to high
 }
 
 /////////
diff --git a/platforms/avr/drivers/spi_master.c b/platforms/avr/drivers/spi_master.c
index 4e8fd3bcdf..ae9df03c02 100644
--- a/platforms/avr/drivers/spi_master.c
+++ b/platforms/avr/drivers/spi_master.c
@@ -125,7 +125,7 @@ spi_status_t spi_write(uint8_t data) {
 }
 
 spi_status_t spi_read() {
-    SPDR = 0x00;  // Dummy
+    SPDR = 0x00; // Dummy
 
     uint16_t timeout_timer = timer_read();
     while (!(SPSR & _BV(SPIF))) {
diff --git a/platforms/avr/drivers/ssd1306.c b/platforms/avr/drivers/ssd1306.c
index 1a09a2bcb7..7afbc09f00 100644
--- a/platforms/avr/drivers/ssd1306.c
+++ b/platforms/avr/drivers/ssd1306.c
@@ -161,7 +161,7 @@ bool iota_gfx_init(void) {
     send_cmd1(DeActivateScroll);
     send_cmd1(DisplayOn);
 
-    send_cmd2(SetContrast, 0);  // Dim
+    send_cmd2(SetContrast, 0); // Dim
 
     clear_display();
 
@@ -226,7 +226,9 @@ void matrix_write_char(struct CharacterMatrix *matrix, uint8_t c) {
     matrix_write_char_inner(matrix, c);
 }
 
-void iota_gfx_write_char(uint8_t c) { matrix_write_char(&display, c); }
+void iota_gfx_write_char(uint8_t c) {
+    matrix_write_char(&display, c);
+}
 
 void matrix_write(struct CharacterMatrix *matrix, const char *data) {
     const char *end = data + strlen(data);
@@ -236,7 +238,9 @@ void matrix_write(struct CharacterMatrix *matrix, const char *data) {
     }
 }
 
-void iota_gfx_write(const char *data) { matrix_write(&display, data); }
+void iota_gfx_write(const char *data) {
+    matrix_write(&display, data);
+}
 
 void matrix_write_P(struct CharacterMatrix *matrix, const char *data) {
     while (true) {
@@ -249,7 +253,9 @@ void matrix_write_P(struct CharacterMatrix *matrix, const char *data) {
     }
 }
 
-void iota_gfx_write_P(const char *data) { matrix_write_P(&display, data); }
+void iota_gfx_write_P(const char *data) {
+    matrix_write_P(&display, data);
+}
 
 void matrix_clear(struct CharacterMatrix *matrix) {
     memset(matrix->display, ' ', sizeof(matrix->display));
@@ -257,7 +263,9 @@ void matrix_clear(struct CharacterMatrix *matrix) {
     matrix->dirty  = true;
 }
 
-void iota_gfx_clear_screen(void) { matrix_clear(&display); }
+void iota_gfx_clear_screen(void) {
+    matrix_clear(&display);
+}
 
 void matrix_render(struct CharacterMatrix *matrix) {
     last_flush = timer_read();
@@ -301,7 +309,9 @@ done:
 #    endif
 }
 
-void iota_gfx_flush(void) { matrix_render(&display); }
+void iota_gfx_flush(void) {
+    matrix_render(&display);
+}
 
 __attribute__((weak)) void iota_gfx_task_user(void) {}
 
diff --git a/platforms/avr/drivers/uart.c b/platforms/avr/drivers/uart.c
index 01cf6b1fb8..fd5caf9a78 100644
--- a/platforms/avr/drivers/uart.c
+++ b/platforms/avr/drivers/uart.c
@@ -108,7 +108,7 @@ void uart_write(uint8_t data) {
     // return immediately to avoid deadlock when interrupt is disabled(called from ISR)
     if (tx_buffer_tail == i && (SREG & (1 << SREG_I)) == 0) return;
     while (tx_buffer_tail == i)
-        ;  // wait until space in buffer
+        ; // wait until space in buffer
     // cli();
     tx_buffer[i]   = data;
     tx_buffer_head = i;
@@ -121,7 +121,7 @@ uint8_t uart_read(void) {
     uint8_t data, i;
 
     while (rx_buffer_head == rx_buffer_tail)
-        ;  // wait for character
+        ; // wait for character
     i = rx_buffer_tail + 1;
     if (i >= RX_BUFFER_SIZE) i = 0;
     data           = rx_buffer[i];
diff --git a/platforms/avr/drivers/ws2812.c b/platforms/avr/drivers/ws2812.c
index 9150b3c520..c461ab3ba7 100644
--- a/platforms/avr/drivers/ws2812.c
+++ b/platforms/avr/drivers/ws2812.c
@@ -110,7 +110,7 @@ static inline void ws2812_sendarray_mask(uint8_t *data, uint16_t datlen, uint8_t
 
         asm volatile("       ldi   %0,8  \n\t"
                      "loop%=:            \n\t"
-                     "       out   %2,%3 \n\t"  //  '1' [01] '0' [01] - re
+                     "       out   %2,%3 \n\t" //  '1' [01] '0' [01] - re
 #if (w1_nops & 1)
                      w_nop1
 #endif
@@ -126,9 +126,9 @@ static inline void ws2812_sendarray_mask(uint8_t *data, uint16_t datlen, uint8_t
 #if (w1_nops & 16)
                                      w_nop16
 #endif
-                     "       sbrs  %1,7  \n\t"  //  '1' [03] '0' [02]
-                     "       out   %2,%4 \n\t"  //  '1' [--] '0' [03] - fe-low
-                     "       lsl   %1    \n\t"  //  '1' [04] '0' [04]
+                     "       sbrs  %1,7  \n\t" //  '1' [03] '0' [02]
+                     "       out   %2,%4 \n\t" //  '1' [--] '0' [03] - fe-low
+                     "       lsl   %1    \n\t" //  '1' [04] '0' [04]
 #if (w2_nops & 1)
                      w_nop1
 #endif
@@ -144,7 +144,7 @@ static inline void ws2812_sendarray_mask(uint8_t *data, uint16_t datlen, uint8_t
 #if (w2_nops & 16)
                                      w_nop16
 #endif
-                     "       out   %2,%4 \n\t"  //  '1' [+1] '0' [+1] - fe-high
+                     "       out   %2,%4 \n\t" //  '1' [+1] '0' [+1] - fe-high
 #if (w3_nops & 1)
                      w_nop1
 #endif
@@ -161,8 +161,8 @@ static inline void ws2812_sendarray_mask(uint8_t *data, uint16_t datlen, uint8_t
                                      w_nop16
 #endif
 
-                     "       dec   %0    \n\t"  //  '1' [+2] '0' [+2]
-                     "       brne  loop%=\n\t"  //  '1' [+3] '0' [+4]
+                     "       dec   %0    \n\t" //  '1' [+2] '0' [+2]
+                     "       brne  loop%=\n\t" //  '1' [+3] '0' [+4]
                      : "=&d"(ctr)
                      : "r"(curbyte), "I"(_SFR_IO_ADDR(PORTx_ADDRESS(RGB_DI_PIN))), "r"(maskhi), "r"(masklo));
     }
diff --git a/platforms/avr/drivers/ws2812_i2c.c b/platforms/avr/drivers/ws2812_i2c.c
index 1c332e24b6..709f382254 100644
--- a/platforms/avr/drivers/ws2812_i2c.c
+++ b/platforms/avr/drivers/ws2812_i2c.c
@@ -13,7 +13,9 @@
 #    define WS2812_TIMEOUT 100
 #endif
 
-void ws2812_init(void) { i2c_init(); }
+void ws2812_init(void) {
+    i2c_init();
+}
 
 // Setleds for standard RGB
 void ws2812_setleds(LED_TYPE *ledarray, uint16_t leds) {
diff --git a/platforms/avr/pin_defs.h b/platforms/avr/pin_defs.h
index 23d948041d..3889704a87 100644
--- a/platforms/avr/pin_defs.h
+++ b/platforms/avr/pin_defs.h
@@ -17,7 +17,7 @@
 
 #include <avr/io.h>
 
-#define PORT_SHIFTER 4  // this may be 4 for all AVR chips
+#define PORT_SHIFTER 4 // this may be 4 for all AVR chips
 
 // If you want to add more to this list, reference the PINx definitions in these header
 // files: https://github.com/vancegroup-mirrors/avr-libc/tree/master/avr-libc/include/avr
diff --git a/platforms/avr/platform.mk b/platforms/avr/platform.mk
index b45108736f..4d9cafaeef 100644
--- a/platforms/avr/platform.mk
+++ b/platforms/avr/platform.mk
@@ -159,7 +159,7 @@ endif
 
 bootloader:
 ifeq ($(strip $(QMK_BOOTLOADER_TYPE)),)
-	$(error Please set BOOTLOADER to "qmk-dfu" or "qmk-hid" first!)
+	$(call CATASTROPHIC_ERROR,Invalid BOOTLOADER,Please set BOOTLOADER to "qmk-dfu" or "qmk-hid" first!)
 else
 	make -C lib/lufa/Bootloaders/$(QMK_BOOTLOADER_TYPE)/ clean
 	$(QMK_BIN) generate-dfu-header --quiet --keyboard $(KEYBOARD) --output lib/lufa/Bootloaders/$(QMK_BOOTLOADER_TYPE)/Keyboard.h
diff --git a/platforms/avr/printf.c b/platforms/avr/printf.c
index 9ad7a38693..062f70fa0b 100644
--- a/platforms/avr/printf.c
+++ b/platforms/avr/printf.c
@@ -17,4 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "xprintf.h"
 #include "sendchar.h"
 
-void print_set_sendchar(sendchar_func_t func) { xdev_out(func); }
+void print_set_sendchar(sendchar_func_t func) {
+    xdev_out(func);
+}
diff --git a/platforms/avr/sleep_led.c b/platforms/avr/sleep_led.c
index 9a3b52abe5..b05431633b 100644
--- a/platforms/avr/sleep_led.c
+++ b/platforms/avr/sleep_led.c
@@ -12,7 +12,7 @@
 #if SLEEP_LED_TIMER == 1
 #    define TCCRxB TCCR1B
 #    define TIMERx_COMPA_vect TIMER1_COMPA_vect
-#    if defined(__AVR_ATmega32A__)  // This MCU has only one TIMSK register
+#    if defined(__AVR_ATmega32A__) // This MCU has only one TIMSK register
 #        define TIMSKx TIMSK
 #    else
 #        define TIMSKx TIMSK1
diff --git a/platforms/avr/suspend.c b/platforms/avr/suspend.c
index 7b164a34b1..1a7cd3b4ab 100644
--- a/platforms/avr/suspend.c
+++ b/platforms/avr/suspend.c
@@ -2,12 +2,9 @@
 #include <avr/sleep.h>
 #include <avr/wdt.h>
 #include <avr/interrupt.h>
-#include "matrix.h"
-#include "action.h"
 #include "suspend.h"
+#include "action.h"
 #include "timer.h"
-#include "led.h"
-#include "host.h"
 
 #ifdef PROTOCOL_LUFA
 #    include "lufa.h"
@@ -78,6 +75,18 @@ static void power_down(uint8_t wdto) {
     // Disable watchdog after sleep
     wdt_disable();
 }
+
+/* watchdog timeout */
+ISR(WDT_vect) {
+    // compensate timer for sleep
+    switch (wdt_timeout) {
+        case WDTO_15MS:
+            timer_count += 15 + 2; // WDTO_15MS + 2(from observation)
+            break;
+        default:;
+    }
+}
+
 #endif
 
 /** \brief Suspend power down
@@ -102,18 +111,6 @@ void suspend_power_down(void) {
 #endif
 }
 
-__attribute__((weak)) void matrix_power_up(void) {}
-__attribute__((weak)) void matrix_power_down(void) {}
-bool                       suspend_wakeup_condition(void) {
-    matrix_power_up();
-    matrix_scan();
-    matrix_power_down();
-    for (uint8_t r = 0; r < MATRIX_ROWS; r++) {
-        if (matrix_get_row(r)) return true;
-    }
-    return false;
-}
-
 /** \brief run immediately after wakeup
  *
  * FIXME: needs doc
@@ -124,16 +121,3 @@ void suspend_wakeup_init(void) {
 
     suspend_wakeup_init_quantum();
 }
-
-#if !defined(NO_SUSPEND_POWER_DOWN) && defined(WDT_vect)
-/* watchdog timeout */
-ISR(WDT_vect) {
-    // compensate timer for sleep
-    switch (wdt_timeout) {
-        case WDTO_15MS:
-            timer_count += 15 + 2;  // WDTO_15MS + 2(from observation)
-            break;
-        default:;
-    }
-}
-#endif
diff --git a/platforms/avr/timer.c b/platforms/avr/timer.c
index c2e6c6e081..9fb671ae8d 100644
--- a/platforms/avr/timer.c
+++ b/platforms/avr/timer.c
@@ -73,7 +73,9 @@ void timer_init(void) {
  * FIXME: needs doc
  */
 inline void timer_clear(void) {
-    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { timer_count = 0; }
+    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
+        timer_count = 0;
+    }
 }
 
 /** \brief timer read
@@ -83,7 +85,9 @@ inline void timer_clear(void) {
 inline uint16_t timer_read(void) {
     uint32_t t;
 
-    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { t = timer_count; }
+    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
+        t = timer_count;
+    }
 
     return (t & 0xFFFF);
 }
@@ -95,7 +99,9 @@ inline uint16_t timer_read(void) {
 inline uint32_t timer_read32(void) {
     uint32_t t;
 
-    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { t = timer_count; }
+    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
+        t = timer_count;
+    }
 
     return t;
 }
@@ -107,7 +113,9 @@ inline uint32_t timer_read32(void) {
 inline uint16_t timer_elapsed(uint16_t last) {
     uint32_t t;
 
-    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { t = timer_count; }
+    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
+        t = timer_count;
+    }
 
     return TIMER_DIFF_16((t & 0xFFFF), last);
 }
@@ -119,7 +127,9 @@ inline uint16_t timer_elapsed(uint16_t last) {
 inline uint32_t timer_elapsed32(uint32_t last) {
     uint32_t t;
 
-    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { t = timer_count; }
+    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
+        t = timer_count;
+    }
 
     return TIMER_DIFF_32(t, last);
 }
@@ -130,4 +140,6 @@ inline uint32_t timer_elapsed32(uint32_t last) {
 #else
 #    define TIMER_INTERRUPT_VECTOR TIMER0_COMP_vect
 #endif
-ISR(TIMER_INTERRUPT_VECTOR, ISR_NOBLOCK) { timer_count++; }
+ISR(TIMER_INTERRUPT_VECTOR, ISR_NOBLOCK) {
+    timer_count++;
+}
diff --git a/platforms/chibios/bootloaders/none.c b/platforms/chibios/bootloaders/custom.c
similarity index 88%
rename from platforms/chibios/bootloaders/none.c
rename to platforms/chibios/bootloaders/custom.c
index 8379d35abf..bba9fc4637 100644
--- a/platforms/chibios/bootloaders/none.c
+++ b/platforms/chibios/bootloaders/custom.c
@@ -16,8 +16,6 @@
 
 #include "bootloader.h"
 
-#pragma message "Unknown bootloader set, you may not be able to enter bootloader using software reset"
-
 __attribute__((weak)) void bootloader_jump(void) {}
 
 __attribute__((weak)) void enter_bootloader_mode_if_requested(void) {}
diff --git a/platforms/chibios/bootloaders/stm32_dfu.c b/platforms/chibios/bootloaders/stm32_dfu.c
index 0a113570f7..0e74111367 100644
--- a/platforms/chibios/bootloaders/stm32_dfu.c
+++ b/platforms/chibios/bootloaders/stm32_dfu.c
@@ -72,7 +72,7 @@ void enter_bootloader_mode_if_requested(void) {}
 #    define MAGIC_ADDR (unsigned long *)(SYMVAL(__ram0_end__) - 4)
 
 __attribute__((weak)) void bootloader_jump(void) {
-    *MAGIC_ADDR = BOOTLOADER_MAGIC;  // set magic flag => reset handler will jump into boot loader
+    *MAGIC_ADDR = BOOTLOADER_MAGIC; // set magic flag => reset handler will jump into boot loader
     NVIC_SystemReset();
 }
 
diff --git a/platforms/chibios/bootloaders/stm32duino.c b/platforms/chibios/bootloaders/stm32duino.c
index dd1d551fa9..53d3ba0adb 100644
--- a/platforms/chibios/bootloaders/stm32duino.c
+++ b/platforms/chibios/bootloaders/stm32duino.c
@@ -18,4 +18,6 @@
 
 #include <ch.h>
 
-__attribute__((weak)) void bootloader_jump(void) { NVIC_SystemReset(); }
+__attribute__((weak)) void bootloader_jump(void) {
+    NVIC_SystemReset();
+}
diff --git a/platforms/chibios/chibios_config.h b/platforms/chibios/chibios_config.h
index 4e35736606..67d7541ba2 100644
--- a/platforms/chibios/chibios_config.h
+++ b/platforms/chibios/chibios_config.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #ifndef USB_VBUS_PIN
-#    define SPLIT_USB_DETECT  // Force this on when dedicated pin is not used
+#    define SPLIT_USB_DETECT // Force this on when dedicated pin is not used
 #endif
 
 // STM32 compatibility
@@ -76,7 +76,7 @@
 
 #    if defined(K20x) || defined(KL2x)
 #        define USE_I2CV1
-#        define USE_I2CV1_CONTRIB  // for some reason a bunch of ChibiOS-Contrib boards only have clock_speed
+#        define USE_I2CV1_CONTRIB // for some reason a bunch of ChibiOS-Contrib boards only have clock_speed
 #        define USE_GPIOV1
 #    endif
 #endif
diff --git a/platforms/chibios/drivers/analog.c b/platforms/chibios/drivers/analog.c
index eb437665f1..48a59fd290 100644
--- a/platforms/chibios/drivers/analog.c
+++ b/platforms/chibios/drivers/analog.c
@@ -101,9 +101,9 @@
 
 // Options are 12, 10, 8, and 6 bit.
 #ifndef ADC_RESOLUTION
-#    ifdef ADC_CFGR_RES_10BITS  // ADCv3, ADCv4
+#    ifdef ADC_CFGR_RES_10BITS // ADCv3, ADCv4
 #        define ADC_RESOLUTION ADC_CFGR_RES_10BITS
-#    else  // ADCv1, ADCv5, or the bodge for ADCv2 above
+#    else // ADCv1, ADCv5, or the bodge for ADCv2 above
 #        define ADC_RESOLUTION ADC_CFGR1_RES_10BIT
 #    endif
 #endif
@@ -123,7 +123,7 @@ static ADCConversionGroup adcConversionGroup = {
     .smpr  = ADC_SAMPLING_RATE,
 #elif defined(USE_ADCV2)
 #    if !defined(STM32F1XX) && !defined(GD32VF103)
-    .cr2   = ADC_CR2_SWSTART,  // F103 seem very unhappy with, F401 seems very unhappy without...
+    .cr2   = ADC_CR2_SWSTART, // F103 seem very unhappy with, F401 seems very unhappy without...
 #    endif
     .smpr2 = ADC_SMPR2_SMP_AN0(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN1(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN2(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN3(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN4(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN5(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN6(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN7(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN8(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN9(ADC_SAMPLING_RATE),
     .smpr1 = ADC_SMPR1_SMP_AN10(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN11(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN12(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN13(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN14(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN15(ADC_SAMPLING_RATE),
diff --git a/platforms/chibios/drivers/analog.h b/platforms/chibios/drivers/analog.h
index e61c394265..8a821719e3 100644
--- a/platforms/chibios/drivers/analog.h
+++ b/platforms/chibios/drivers/analog.h
@@ -28,7 +28,9 @@ typedef struct {
     uint8_t  adc;
 } adc_mux;
 #define TO_MUX(i, a) \
-    (adc_mux) { i, a }
+    (adc_mux) {      \
+        i, a         \
+    }
 
 int16_t analogReadPin(pin_t pin);
 int16_t analogReadPinAdc(pin_t pin, uint8_t adc);
diff --git a/platforms/chibios/drivers/audio_dac_additive.c b/platforms/chibios/drivers/audio_dac_additive.c
index db304adb87..db07c4b393 100644
--- a/platforms/chibios/drivers/audio_dac_additive.c
+++ b/platforms/chibios/drivers/audio_dac_additive.c
@@ -52,19 +52,19 @@ static const dacsample_t dac_buffer_sine[AUDIO_DAC_BUFFER_SIZE] = {
     // 256 values, max 4095
     0x0,   0x1,   0x2,   0x6,   0xa,   0xf,   0x16,  0x1e,  0x27,  0x32,  0x3d,  0x4a,  0x58,  0x67,  0x78,  0x89,  0x9c,  0xb0,  0xc5,  0xdb,  0xf2,  0x10a, 0x123, 0x13e, 0x159, 0x175, 0x193, 0x1b1, 0x1d1, 0x1f1, 0x212, 0x235, 0x258, 0x27c, 0x2a0, 0x2c6, 0x2ed, 0x314, 0x33c, 0x365, 0x38e, 0x3b8, 0x3e3, 0x40e, 0x43a, 0x467, 0x494, 0x4c2, 0x4f0, 0x51f, 0x54e, 0x57d, 0x5ad, 0x5dd, 0x60e, 0x63f, 0x670, 0x6a1, 0x6d3, 0x705, 0x737, 0x769, 0x79b, 0x7cd, 0x800, 0x832, 0x864, 0x896, 0x8c8, 0x8fa, 0x92c, 0x95e, 0x98f, 0x9c0, 0x9f1, 0xa22, 0xa52, 0xa82, 0xab1, 0xae0, 0xb0f, 0xb3d, 0xb6b, 0xb98, 0xbc5, 0xbf1, 0xc1c, 0xc47, 0xc71, 0xc9a, 0xcc3, 0xceb, 0xd12, 0xd39, 0xd5f, 0xd83, 0xda7, 0xdca, 0xded, 0xe0e, 0xe2e, 0xe4e, 0xe6c, 0xe8a, 0xea6, 0xec1, 0xedc, 0xef5, 0xf0d, 0xf24, 0xf3a, 0xf4f, 0xf63, 0xf76, 0xf87, 0xf98, 0xfa7, 0xfb5, 0xfc2, 0xfcd, 0xfd8, 0xfe1, 0xfe9, 0xff0, 0xff5, 0xff9, 0xffd, 0xffe,
     0xfff, 0xffe, 0xffd, 0xff9, 0xff5, 0xff0, 0xfe9, 0xfe1, 0xfd8, 0xfcd, 0xfc2, 0xfb5, 0xfa7, 0xf98, 0xf87, 0xf76, 0xf63, 0xf4f, 0xf3a, 0xf24, 0xf0d, 0xef5, 0xedc, 0xec1, 0xea6, 0xe8a, 0xe6c, 0xe4e, 0xe2e, 0xe0e, 0xded, 0xdca, 0xda7, 0xd83, 0xd5f, 0xd39, 0xd12, 0xceb, 0xcc3, 0xc9a, 0xc71, 0xc47, 0xc1c, 0xbf1, 0xbc5, 0xb98, 0xb6b, 0xb3d, 0xb0f, 0xae0, 0xab1, 0xa82, 0xa52, 0xa22, 0x9f1, 0x9c0, 0x98f, 0x95e, 0x92c, 0x8fa, 0x8c8, 0x896, 0x864, 0x832, 0x800, 0x7cd, 0x79b, 0x769, 0x737, 0x705, 0x6d3, 0x6a1, 0x670, 0x63f, 0x60e, 0x5dd, 0x5ad, 0x57d, 0x54e, 0x51f, 0x4f0, 0x4c2, 0x494, 0x467, 0x43a, 0x40e, 0x3e3, 0x3b8, 0x38e, 0x365, 0x33c, 0x314, 0x2ed, 0x2c6, 0x2a0, 0x27c, 0x258, 0x235, 0x212, 0x1f1, 0x1d1, 0x1b1, 0x193, 0x175, 0x159, 0x13e, 0x123, 0x10a, 0xf2,  0xdb,  0xc5,  0xb0,  0x9c,  0x89,  0x78,  0x67,  0x58,  0x4a,  0x3d,  0x32,  0x27,  0x1e,  0x16,  0xf,   0xa,   0x6,   0x2,   0x1};
-#endif  // AUDIO_DAC_SAMPLE_WAVEFORM_SINE
+#endif // AUDIO_DAC_SAMPLE_WAVEFORM_SINE
 #ifdef AUDIO_DAC_SAMPLE_WAVEFORM_TRIANGLE
 static const dacsample_t dac_buffer_triangle[AUDIO_DAC_BUFFER_SIZE] = {
     // 256 values, max 4095
     0x0,   0x20,  0x40,  0x60,  0x80,  0xa0,  0xc0,  0xe0,  0x100, 0x120, 0x140, 0x160, 0x180, 0x1a0, 0x1c0, 0x1e0, 0x200, 0x220, 0x240, 0x260, 0x280, 0x2a0, 0x2c0, 0x2e0, 0x300, 0x320, 0x340, 0x360, 0x380, 0x3a0, 0x3c0, 0x3e0, 0x400, 0x420, 0x440, 0x460, 0x480, 0x4a0, 0x4c0, 0x4e0, 0x500, 0x520, 0x540, 0x560, 0x580, 0x5a0, 0x5c0, 0x5e0, 0x600, 0x620, 0x640, 0x660, 0x680, 0x6a0, 0x6c0, 0x6e0, 0x700, 0x720, 0x740, 0x760, 0x780, 0x7a0, 0x7c0, 0x7e0, 0x800, 0x81f, 0x83f, 0x85f, 0x87f, 0x89f, 0x8bf, 0x8df, 0x8ff, 0x91f, 0x93f, 0x95f, 0x97f, 0x99f, 0x9bf, 0x9df, 0x9ff, 0xa1f, 0xa3f, 0xa5f, 0xa7f, 0xa9f, 0xabf, 0xadf, 0xaff, 0xb1f, 0xb3f, 0xb5f, 0xb7f, 0xb9f, 0xbbf, 0xbdf, 0xbff, 0xc1f, 0xc3f, 0xc5f, 0xc7f, 0xc9f, 0xcbf, 0xcdf, 0xcff, 0xd1f, 0xd3f, 0xd5f, 0xd7f, 0xd9f, 0xdbf, 0xddf, 0xdff, 0xe1f, 0xe3f, 0xe5f, 0xe7f, 0xe9f, 0xebf, 0xedf, 0xeff, 0xf1f, 0xf3f, 0xf5f, 0xf7f, 0xf9f, 0xfbf, 0xfdf,
     0xfff, 0xfdf, 0xfbf, 0xf9f, 0xf7f, 0xf5f, 0xf3f, 0xf1f, 0xeff, 0xedf, 0xebf, 0xe9f, 0xe7f, 0xe5f, 0xe3f, 0xe1f, 0xdff, 0xddf, 0xdbf, 0xd9f, 0xd7f, 0xd5f, 0xd3f, 0xd1f, 0xcff, 0xcdf, 0xcbf, 0xc9f, 0xc7f, 0xc5f, 0xc3f, 0xc1f, 0xbff, 0xbdf, 0xbbf, 0xb9f, 0xb7f, 0xb5f, 0xb3f, 0xb1f, 0xaff, 0xadf, 0xabf, 0xa9f, 0xa7f, 0xa5f, 0xa3f, 0xa1f, 0x9ff, 0x9df, 0x9bf, 0x99f, 0x97f, 0x95f, 0x93f, 0x91f, 0x8ff, 0x8df, 0x8bf, 0x89f, 0x87f, 0x85f, 0x83f, 0x81f, 0x800, 0x7e0, 0x7c0, 0x7a0, 0x780, 0x760, 0x740, 0x720, 0x700, 0x6e0, 0x6c0, 0x6a0, 0x680, 0x660, 0x640, 0x620, 0x600, 0x5e0, 0x5c0, 0x5a0, 0x580, 0x560, 0x540, 0x520, 0x500, 0x4e0, 0x4c0, 0x4a0, 0x480, 0x460, 0x440, 0x420, 0x400, 0x3e0, 0x3c0, 0x3a0, 0x380, 0x360, 0x340, 0x320, 0x300, 0x2e0, 0x2c0, 0x2a0, 0x280, 0x260, 0x240, 0x220, 0x200, 0x1e0, 0x1c0, 0x1a0, 0x180, 0x160, 0x140, 0x120, 0x100, 0xe0,  0xc0,  0xa0,  0x80,  0x60,  0x40,  0x20};
-#endif  // AUDIO_DAC_SAMPLE_WAVEFORM_TRIANGLE
+#endif // AUDIO_DAC_SAMPLE_WAVEFORM_TRIANGLE
 #ifdef AUDIO_DAC_SAMPLE_WAVEFORM_SQUARE
 static const dacsample_t dac_buffer_square[AUDIO_DAC_BUFFER_SIZE] = {
-    [0 ... AUDIO_DAC_BUFFER_SIZE / 2 - 1]                     = 0,                     // first and
-    [AUDIO_DAC_BUFFER_SIZE / 2 ... AUDIO_DAC_BUFFER_SIZE - 1] = AUDIO_DAC_SAMPLE_MAX,  // second half
+    [0 ... AUDIO_DAC_BUFFER_SIZE / 2 - 1]                     = 0,                    // first and
+    [AUDIO_DAC_BUFFER_SIZE / 2 ... AUDIO_DAC_BUFFER_SIZE - 1] = AUDIO_DAC_SAMPLE_MAX, // second half
 };
-#endif  // AUDIO_DAC_SAMPLE_WAVEFORM_SQUARE
+#endif // AUDIO_DAC_SAMPLE_WAVEFORM_SQUARE
 /*
 // four steps: 0, 1/3, 2/3 and 1
 static const dacsample_t dac_buffer_staircase[AUDIO_DAC_BUFFER_SIZE] = {
@@ -77,7 +77,7 @@ static const dacsample_t dac_buffer_staircase[AUDIO_DAC_BUFFER_SIZE] = {
 #ifdef AUDIO_DAC_SAMPLE_WAVEFORM_TRAPEZOID
 static const dacsample_t dac_buffer_trapezoid[AUDIO_DAC_BUFFER_SIZE] = {0x0,   0x1f,  0x7f,  0xdf,  0x13f, 0x19f, 0x1ff, 0x25f, 0x2bf, 0x31f, 0x37f, 0x3df, 0x43f, 0x49f, 0x4ff, 0x55f, 0x5bf, 0x61f, 0x67f, 0x6df, 0x73f, 0x79f, 0x7ff, 0x85f, 0x8bf, 0x91f, 0x97f, 0x9df, 0xa3f, 0xa9f, 0xaff, 0xb5f, 0xbbf, 0xc1f, 0xc7f, 0xcdf, 0xd3f, 0xd9f, 0xdff, 0xe5f, 0xebf, 0xf1f, 0xf7f, 0xfdf, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
                                                                         0xfff, 0xfdf, 0xf7f, 0xf1f, 0xebf, 0xe5f, 0xdff, 0xd9f, 0xd3f, 0xcdf, 0xc7f, 0xc1f, 0xbbf, 0xb5f, 0xaff, 0xa9f, 0xa3f, 0x9df, 0x97f, 0x91f, 0x8bf, 0x85f, 0x7ff, 0x79f, 0x73f, 0x6df, 0x67f, 0x61f, 0x5bf, 0x55f, 0x4ff, 0x49f, 0x43f, 0x3df, 0x37f, 0x31f, 0x2bf, 0x25f, 0x1ff, 0x19f, 0x13f, 0xdf,  0x7f,  0x1f,  0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0};
-#endif  // AUDIO_DAC_SAMPLE_WAVEFORM_TRAPEZOID
+#endif // AUDIO_DAC_SAMPLE_WAVEFORM_TRAPEZOID
 
 static dacsample_t dac_buffer_empty[AUDIO_DAC_BUFFER_SIZE] = {AUDIO_DAC_OFF_VALUE};
 
@@ -98,7 +98,7 @@ typedef enum {
     OUTPUT_REACHED_ZERO_BEFORE_OFF,
     OUTPUT_OFF,
     OUTPUT_OFF_1,
-    OUTPUT_OFF_2,  // trailing off: giving the DAC two more conversion cycles until the AUDIO_DAC_OFF_VALUE reaches the output, then turn the timer off, which leaves the output at that level
+    OUTPUT_OFF_2, // trailing off: giving the DAC two more conversion cycles until the AUDIO_DAC_OFF_VALUE reaches the output, then turn the timer off, which leaves the output at that level
     number_of_output_states
 } output_states_t;
 output_states_t state = OUTPUT_OFF_2;
@@ -171,7 +171,7 @@ static void dac_end(DACDriver *dacp) {
 
     // work on the other half of the buffer
     if (dacIsBufferComplete(dacp)) {
-        sample_p += AUDIO_DAC_BUFFER_SIZE / 2;  // 'half_index'
+        sample_p += AUDIO_DAC_BUFFER_SIZE / 2; // 'half_index'
     }
 
     for (uint8_t s = 0; s < AUDIO_DAC_BUFFER_SIZE / 2; s++) {
@@ -196,8 +196,8 @@ static void dac_end(DACDriver *dacp) {
          *   *       *
          * =====*=*================================================= 0x0
          */
-        if (((sample_p[s] + (AUDIO_DAC_SAMPLE_MAX / 100)) > AUDIO_DAC_OFF_VALUE) &&  // value approaches from below
-            (sample_p[s] < (AUDIO_DAC_OFF_VALUE + (AUDIO_DAC_SAMPLE_MAX / 100)))     // or above
+        if (((sample_p[s] + (AUDIO_DAC_SAMPLE_MAX / 100)) > AUDIO_DAC_OFF_VALUE) && // value approaches from below
+            (sample_p[s] < (AUDIO_DAC_OFF_VALUE + (AUDIO_DAC_SAMPLE_MAX / 100)))    // or above
         ) {
             if ((OUTPUT_SHOULD_START == state) && (active_tones_snapshot_length > 0)) {
                 state = OUTPUT_RUN_NORMALLY;
@@ -220,7 +220,7 @@ static void dac_end(DACDriver *dacp) {
             // -> saves cpu cycles (?)
             for (uint8_t i = 0; i < active_tones; i++) {
                 float freq = audio_get_processed_frequency(i);
-                if (freq > 0) {  // disregard 'rest' notes, with valid frequency 0.0f; which would only lower the resulting waveform volume during the additive synthesis step
+                if (freq > 0) { // disregard 'rest' notes, with valid frequency 0.0f; which would only lower the resulting waveform volume during the additive synthesis step
                     active_tones_snapshot[active_tones_snapshot_length++] = freq;
                 }
             }
@@ -321,7 +321,9 @@ void audio_driver_initialize() {
     gptStart(&GPTD6, &gpt6cfg1);
 }
 
-void audio_driver_stop(void) { state = OUTPUT_SHOULD_STOP; }
+void audio_driver_stop(void) {
+    state = OUTPUT_SHOULD_STOP;
+}
 
 void audio_driver_start(void) {
     gptStartContinuous(&GPTD6, 2U);
diff --git a/platforms/chibios/drivers/audio_dac_basic.c b/platforms/chibios/drivers/audio_dac_basic.c
index fac6513506..64439a1e3c 100644
--- a/platforms/chibios/drivers/audio_dac_basic.c
+++ b/platforms/chibios/drivers/audio_dac_basic.c
@@ -115,13 +115,15 @@ void         channel_1_set_frequency(float freq) {
     channel_1_frequency = freq;
 
     channel_1_stop();
-    if (freq <= 0.0)  // a pause/rest has freq=0
+    if (freq <= 0.0) // a pause/rest has freq=0
         return;
 
     gpt6cfg1.frequency = 2 * freq * AUDIO_DAC_BUFFER_SIZE;
     channel_1_start();
 }
-float channel_1_get_frequency(void) { return channel_1_frequency; }
+float channel_1_get_frequency(void) {
+    return channel_1_frequency;
+}
 
 void channel_2_start(void) {
     gptStart(&GPTD7, &gpt7cfg1);
@@ -140,13 +142,15 @@ void         channel_2_set_frequency(float freq) {
     channel_2_frequency = freq;
 
     channel_2_stop();
-    if (freq <= 0.0)  // a pause/rest has freq=0
+    if (freq <= 0.0) // a pause/rest has freq=0
         return;
 
     gpt7cfg1.frequency = 2 * freq * AUDIO_DAC_BUFFER_SIZE;
     channel_2_start();
 }
-float channel_2_get_frequency(void) { return channel_2_frequency; }
+float channel_2_get_frequency(void) {
+    return channel_2_frequency;
+}
 
 static void gpt_audio_state_cb(GPTDriver *gptp) {
     if (audio_update_state()) {
@@ -155,8 +159,8 @@ static void gpt_audio_state_cb(GPTDriver *gptp) {
         channel_1_set_frequency(audio_get_processed_frequency(0));
         channel_2_set_frequency(audio_get_processed_frequency(0));
 
-#else  // two separate audio outputs/speakers
-       // primary speaker on A4, optional secondary on A5
+#else // two separate audio outputs/speakers
+      // primary speaker on A4, optional secondary on A5
         if (AUDIO_PIN == A4) {
             channel_1_set_frequency(audio_get_processed_frequency(0));
             if (AUDIO_PIN_ALT == A5) {
diff --git a/platforms/chibios/drivers/audio_pwm_hardware.c b/platforms/chibios/drivers/audio_pwm_hardware.c
index cd40019ee7..710f397609 100644
--- a/platforms/chibios/drivers/audio_pwm_hardware.c
+++ b/platforms/chibios/drivers/audio_pwm_hardware.c
@@ -72,7 +72,7 @@ static float channel_1_frequency = 0.0f;
 void         channel_1_set_frequency(float freq) {
     channel_1_frequency = freq;
 
-    if (freq <= 0.0)  // a pause/rest has freq=0
+    if (freq <= 0.0) // a pause/rest has freq=0
         return;
 
     pwmcnt_t period = (pwmCFG.frequency / freq);
@@ -82,14 +82,18 @@ void         channel_1_set_frequency(float freq) {
                      PWM_PERCENTAGE_TO_WIDTH(&AUDIO_PWM_DRIVER, (100 - note_timbre) * 100));
 }
 
-float channel_1_get_frequency(void) { return channel_1_frequency; }
+float channel_1_get_frequency(void) {
+    return channel_1_frequency;
+}
 
 void channel_1_start(void) {
     pwmStop(&AUDIO_PWM_DRIVER);
     pwmStart(&AUDIO_PWM_DRIVER, &pwmCFG);
 }
 
-void channel_1_stop(void) { pwmStop(&AUDIO_PWM_DRIVER); }
+void channel_1_stop(void) {
+    pwmStop(&AUDIO_PWM_DRIVER);
+}
 
 static void gpt_callback(GPTDriver *gptp);
 GPTConfig   gptCFG = {
@@ -108,9 +112,9 @@ void audio_driver_initialize(void) {
     pwmStart(&AUDIO_PWM_DRIVER, &pwmCFG);
 
     // connect the AUDIO_PIN to the PWM hardware
-#if defined(USE_GPIOV1)  // STM32F103C8
+#if defined(USE_GPIOV1) // STM32F103C8
     palSetLineMode(AUDIO_PIN, PAL_MODE_ALTERNATE_PUSHPULL);
-#else  // GPIOv2 (or GPIOv3 for f4xx, which is the same/compatible at this command)
+#else // GPIOv2 (or GPIOv3 for f4xx, which is the same/compatible at this command)
     palSetLineMode(AUDIO_PIN, PAL_MODE_ALTERNATE(AUDIO_PWM_PAL_MODE));
 #endif
 
@@ -135,10 +139,10 @@ void audio_driver_stop(void) {
  * and updates the pwm to output that frequency
  */
 static void gpt_callback(GPTDriver *gptp) {
-    float freq;  // TODO: freq_alt
+    float freq; // TODO: freq_alt
 
     if (audio_update_state()) {
-        freq = audio_get_processed_frequency(0);  // freq_alt would be index=1
+        freq = audio_get_processed_frequency(0); // freq_alt would be index=1
         channel_1_set_frequency(freq);
     }
 }
diff --git a/platforms/chibios/drivers/audio_pwm_software.c b/platforms/chibios/drivers/audio_pwm_software.c
index 15c3e98b6a..e01f86ea52 100644
--- a/platforms/chibios/drivers/audio_pwm_software.c
+++ b/platforms/chibios/drivers/audio_pwm_software.c
@@ -57,7 +57,7 @@ static float channel_1_frequency = 0.0f;
 void         channel_1_set_frequency(float freq) {
     channel_1_frequency = freq;
 
-    if (freq <= 0.0)  // a pause/rest has freq=0
+    if (freq <= 0.0) // a pause/rest has freq=0
         return;
 
     pwmcnt_t period = (pwmCFG.frequency / freq);
@@ -68,7 +68,9 @@ void         channel_1_set_frequency(float freq) {
                      PWM_PERCENTAGE_TO_WIDTH(&AUDIO_PWM_DRIVER, (100 - note_timbre) * 100));
 }
 
-float channel_1_get_frequency(void) { return channel_1_frequency; }
+float channel_1_get_frequency(void) {
+    return channel_1_frequency;
+}
 
 void channel_1_start(void) {
     pwmStop(&AUDIO_PWM_DRIVER);
@@ -81,10 +83,10 @@ void channel_1_start(void) {
 void channel_1_stop(void) {
     pwmStop(&AUDIO_PWM_DRIVER);
 
-    palClearLine(AUDIO_PIN);  // leave the line low, after last note was played
+    palClearLine(AUDIO_PIN); // leave the line low, after last note was played
 
 #if defined(AUDIO_PIN_ALT) && defined(AUDIO_PIN_ALT_AS_NEGATIVE)
-    palClearLine(AUDIO_PIN_ALT);  // leave the line low, after last note was played
+    palClearLine(AUDIO_PIN_ALT); // leave the line low, after last note was played
 #endif
 }
 
@@ -100,7 +102,7 @@ static void pwm_audio_period_callback(PWMDriver *pwmp) {
 static void pwm_audio_channel_interrupt_callback(PWMDriver *pwmp) {
     (void)pwmp;
     if (channel_1_frequency > 0) {
-        palSetLine(AUDIO_PIN);  // generate a PWM signal on any pin, not necessarily the one connected to the timer
+        palSetLine(AUDIO_PIN); // generate a PWM signal on any pin, not necessarily the one connected to the timer
 #if defined(AUDIO_PIN_ALT) && defined(AUDIO_PIN_ALT_AS_NEGATIVE)
         palClearLine(AUDIO_PIN_ALT);
 #endif
@@ -131,7 +133,7 @@ void audio_driver_initialize(void) {
     palClearLine(AUDIO_PIN_ALT);
 #endif
 
-    pwmEnablePeriodicNotification(&AUDIO_PWM_DRIVER);  // enable pwm callbacks
+    pwmEnablePeriodicNotification(&AUDIO_PWM_DRIVER); // enable pwm callbacks
     pwmEnableChannelNotification(&AUDIO_PWM_DRIVER, AUDIO_PWM_CHANNEL - 1);
 
     gptStart(&AUDIO_STATE_TIMER, &gptCFG);
@@ -155,10 +157,10 @@ void audio_driver_stop(void) {
  * and updates the pwm to output that frequency
  */
 static void gpt_callback(GPTDriver *gptp) {
-    float freq;  // TODO: freq_alt
+    float freq; // TODO: freq_alt
 
     if (audio_update_state()) {
-        freq = audio_get_processed_frequency(0);  // freq_alt would be index=1
+        freq = audio_get_processed_frequency(0); // freq_alt would be index=1
         channel_1_set_frequency(freq);
     }
 }
diff --git a/platforms/chibios/drivers/eeprom/eeprom_stm32_L0_L1.h b/platforms/chibios/drivers/eeprom/eeprom_stm32_L0_L1.h
index a35defca8b..616d7ccbee 100644
--- a/platforms/chibios/drivers/eeprom/eeprom_stm32_L0_L1.h
+++ b/platforms/chibios/drivers/eeprom/eeprom_stm32_L0_L1.h
@@ -24,7 +24,7 @@
 #        define STM32_ONBOARD_EEPROM_SIZE 1024
 #    else
 #        include "eeconfig.h"
-#        define STM32_ONBOARD_EEPROM_SIZE (((EECONFIG_SIZE + 3) / 4) * 4)  // based off eeconfig's current usage, aligned to 4-byte sizes, to deal with LTO and EEPROM page sizing
+#        define STM32_ONBOARD_EEPROM_SIZE (((EECONFIG_SIZE + 3) / 4) * 4) // based off eeconfig's current usage, aligned to 4-byte sizes, to deal with LTO and EEPROM page sizing
 #    endif
 #endif
 
diff --git a/platforms/chibios/drivers/i2c_master.c b/platforms/chibios/drivers/i2c_master.c
index 4a5d4760d0..d10bdbabc1 100644
--- a/platforms/chibios/drivers/i2c_master.c
+++ b/platforms/chibios/drivers/i2c_master.c
@@ -203,4 +203,6 @@ i2c_status_t i2c_readReg16(uint8_t devaddr, uint16_t regaddr, uint8_t* data, uin
     return chibios_to_qmk(&status);
 }
 
-void i2c_stop(void) { i2cStop(&I2C_DRIVER); }
+void i2c_stop(void) {
+    i2cStop(&I2C_DRIVER);
+}
diff --git a/platforms/chibios/drivers/serial.c b/platforms/chibios/drivers/serial.c
index 17d0b32be8..6db5d85250 100644
--- a/platforms/chibios/drivers/serial.c
+++ b/platforms/chibios/drivers/serial.c
@@ -50,14 +50,30 @@
 #    error invalid SELECT_SOFT_SERIAL_SPEED value
 #endif
 
-inline static void serial_delay(void) { wait_us(SERIAL_DELAY); }
-inline static void serial_delay_half(void) { wait_us(SERIAL_DELAY / 2); }
-inline static void serial_delay_blip(void) { wait_us(1); }
-inline static void serial_output(void) { setPinOutput(SOFT_SERIAL_PIN); }
-inline static void serial_input(void) { setPinInputHigh(SOFT_SERIAL_PIN); }
-inline static bool serial_read_pin(void) { return !!readPin(SOFT_SERIAL_PIN); }
-inline static void serial_low(void) { writePinLow(SOFT_SERIAL_PIN); }
-inline static void serial_high(void) { writePinHigh(SOFT_SERIAL_PIN); }
+inline static void serial_delay(void) {
+    wait_us(SERIAL_DELAY);
+}
+inline static void serial_delay_half(void) {
+    wait_us(SERIAL_DELAY / 2);
+}
+inline static void serial_delay_blip(void) {
+    wait_us(1);
+}
+inline static void serial_output(void) {
+    setPinOutput(SOFT_SERIAL_PIN);
+}
+inline static void serial_input(void) {
+    setPinInputHigh(SOFT_SERIAL_PIN);
+}
+inline static bool serial_read_pin(void) {
+    return !!readPin(SOFT_SERIAL_PIN);
+}
+inline static void serial_low(void) {
+    writePinLow(SOFT_SERIAL_PIN);
+}
+inline static void serial_high(void) {
+    writePinHigh(SOFT_SERIAL_PIN);
+}
 
 void interrupt_handler(void *arg);
 
@@ -226,7 +242,7 @@ bool soft_serial_transaction(int sstd_index) {
 
     uint8_t checksum = 0;
     // send data to the slave
-    serial_write_byte(sstd_index);  // first chunk is transaction id
+    serial_write_byte(sstd_index); // first chunk is transaction id
     sync_recv();
 
     for (int i = 0; i < trans->initiator2target_buffer_size; ++i) {
@@ -238,7 +254,7 @@ bool soft_serial_transaction(int sstd_index) {
     sync_recv();
 
     serial_delay();
-    serial_delay();  // read mid pulses
+    serial_delay(); // read mid pulses
 
     // receive data from the slave
     uint8_t checksum_computed = 0;
diff --git a/platforms/chibios/drivers/serial_usart.c b/platforms/chibios/drivers/serial_usart.c
index 42c476a374..85c64214d1 100644
--- a/platforms/chibios/drivers/serial_usart.c
+++ b/platforms/chibios/drivers/serial_usart.c
@@ -238,7 +238,7 @@ void soft_serial_initiator_init(void) {
     usart_master_init(&serial_driver);
 
 #if defined(MCU_STM32) && defined(SERIAL_USART_PIN_SWAP)
-    serial_config.cr2 |= USART_CR2_SWAP;  // master has swapped TX/RX pins
+    serial_config.cr2 |= USART_CR2_SWAP; // master has swapped TX/RX pins
 #endif
 
     sdStart(serial_driver, &serial_config);
diff --git a/platforms/chibios/drivers/serial_usart.h b/platforms/chibios/drivers/serial_usart.h
index 7b135b31e0..81fe9e0113 100644
--- a/platforms/chibios/drivers/serial_usart.h
+++ b/platforms/chibios/drivers/serial_usart.h
@@ -50,15 +50,15 @@
 #endif
 
 #if !defined(USART_CR1_M0)
-#    define USART_CR1_M0 USART_CR1_M  // some platforms (f1xx) dont have this so
+#    define USART_CR1_M0 USART_CR1_M // some platforms (f1xx) dont have this so
 #endif
 
 #if !defined(SERIAL_USART_CR1)
-#    define SERIAL_USART_CR1 (USART_CR1_PCE | USART_CR1_PS | USART_CR1_M0)  // parity enable, odd parity, 9 bit length
+#    define SERIAL_USART_CR1 (USART_CR1_PCE | USART_CR1_PS | USART_CR1_M0) // parity enable, odd parity, 9 bit length
 #endif
 
 #if !defined(SERIAL_USART_CR2)
-#    define SERIAL_USART_CR2 (USART_CR2_STOP_1)  // 2 stop bits
+#    define SERIAL_USART_CR2 (USART_CR2_STOP_1) // 2 stop bits
 #endif
 
 #if !defined(SERIAL_USART_CR3)
diff --git a/platforms/chibios/drivers/spi_master.c b/platforms/chibios/drivers/spi_master.c
index dde0bb0597..998bace550 100644
--- a/platforms/chibios/drivers/spi_master.c
+++ b/platforms/chibios/drivers/spi_master.c
@@ -115,7 +115,7 @@ bool spi_start(pin_t slavePin, bool lsbFirst, uint8_t mode, uint16_t divisor) {
 
 #elif defined(HT32)
     spiConfig.cr0 = SPI_CR0_SELOEN;
-    spiConfig.cr1 = SPI_CR1_MODE | 8;  // 8 bits and in master mode
+    spiConfig.cr1 = SPI_CR1_MODE | 8; // 8 bits and in master mode
 
     if (lsbFirst) {
         spiConfig.cr1 |= SPI_CR1_FIRSTBIT;
diff --git a/platforms/chibios/drivers/uart.c b/platforms/chibios/drivers/uart.c
index d2ea5d6415..4884d7024f 100644
--- a/platforms/chibios/drivers/uart.c
+++ b/platforms/chibios/drivers/uart.c
@@ -43,7 +43,9 @@ void uart_init(uint32_t baud) {
     }
 }
 
-void uart_write(uint8_t data) { sdPut(&SERIAL_DRIVER, c); }
+void uart_write(uint8_t data) {
+    sdPut(&SERIAL_DRIVER, data);
+}
 
 uint8_t uart_read(void) {
     msg_t res = sdGet(&SERIAL_DRIVER);
@@ -51,8 +53,14 @@ uint8_t uart_read(void) {
     return (uint8_t)res;
 }
 
-void uart_transmit(const uint8_t *data, uint16_t length) { sdWrite(&SERIAL_DRIVER, data, length); }
+void uart_transmit(const uint8_t *data, uint16_t length) {
+    sdWrite(&SERIAL_DRIVER, data, length);
+}
 
-void uart_receive(uint8_t *data, uint16_t length) { sdRead(&SERIAL_DRIVER, data, length); }
+void uart_receive(uint8_t *data, uint16_t length) {
+    sdRead(&SERIAL_DRIVER, data, length);
+}
 
-bool uart_available(void) { return !sdGetWouldBlock(&SERIAL_DRIVER); }
+bool uart_available(void) {
+    return !sdGetWouldBlock(&SERIAL_DRIVER);
+}
diff --git a/platforms/chibios/drivers/usbpd_stm32g4.c b/platforms/chibios/drivers/usbpd_stm32g4.c
index f16ca8aeae..0096f22f07 100644
--- a/platforms/chibios/drivers/usbpd_stm32g4.c
+++ b/platforms/chibios/drivers/usbpd_stm32g4.c
@@ -18,7 +18,7 @@
 
 #ifndef USBPD_UCPD1_CFG1
 #    define USBPD_UCPD1_CFG1 (UCPD_CFG1_PSC_UCPDCLK_0 | UCPD_CFG1_TRANSWIN_3 | UCPD_CFG1_IFRGAP_4 | UCPD_CFG1_HBITCLKDIV_4)
-#endif  // USBPD_UCPD1_CFG1
+#endif // USBPD_UCPD1_CFG1
 
 // Initialises the USBPD subsystem
 __attribute__((weak)) void usbpd_init(void) {
@@ -64,7 +64,7 @@ __attribute__((weak)) usbpd_allowance_t usbpd_get_allowance(void) {
         switch (vstate_max) {
             case 0:
             case 1:
-                return USBPD_500MA;  // Note that this is 500mA (i.e. max USB 2.0), not 900mA, as we're not using USB 3.1 as a sink device.
+                return USBPD_500MA; // Note that this is 500mA (i.e. max USB 2.0), not 900mA, as we're not using USB 3.1 as a sink device.
             case 2:
                 return USBPD_1500MA;
             case 3:
diff --git a/platforms/chibios/drivers/ws2812.c b/platforms/chibios/drivers/ws2812.c
index 7e870661de..1b3bb59842 100644
--- a/platforms/chibios/drivers/ws2812.c
+++ b/platforms/chibios/drivers/ws2812.c
@@ -10,7 +10,7 @@
 #        define NOP_FUDGE 0.4
 #    else
 #        error("NOP_FUDGE configuration required")
-#        define NOP_FUDGE 1  // this just pleases the compile so the above error is easier to spot
+#        define NOP_FUDGE 1 // this just pleases the compile so the above error is easier to spot
 #    endif
 #endif
 
@@ -25,12 +25,12 @@
 // The reset gap can be 6000 ns, but depending on the LED strip it may have to be increased
 // to values like 600000 ns. If it is too small, the pixels will show nothing most of the time.
 #ifndef WS2812_RES
-#    define WS2812_RES (1000 * WS2812_TRST_US)  // Width of the low gap between bits to cause a frame to latch
+#    define WS2812_RES (1000 * WS2812_TRST_US) // Width of the low gap between bits to cause a frame to latch
 #endif
 
 #define NUMBER_NOPS 6
 #define CYCLES_PER_SEC (CPU_CLOCK / NUMBER_NOPS * NOP_FUDGE)
-#define NS_PER_SEC (1000000000L)  // Note that this has to be SIGNED since we want to be able to check for negative values of derivatives
+#define NS_PER_SEC (1000000000L) // Note that this has to be SIGNED since we want to be able to check for negative values of derivatives
 #define NS_PER_CYCLE (NS_PER_SEC / CYCLES_PER_SEC)
 #define NS_TO_CYCLES(n) ((n) / NS_PER_CYCLE)
 
@@ -67,7 +67,9 @@ void sendByte(uint8_t byte) {
     }
 }
 
-void ws2812_init(void) { palSetLineMode(RGB_DI_PIN, WS2812_OUTPUT_MODE); }
+void ws2812_init(void) {
+    palSetLineMode(RGB_DI_PIN, WS2812_OUTPUT_MODE);
+}
 
 // Setleds for standard RGB
 void ws2812_setleds(LED_TYPE *ledarray, uint16_t leds) {
diff --git a/platforms/chibios/drivers/ws2812_pwm.c b/platforms/chibios/drivers/ws2812_pwm.c
index 19ea3cfe8a..57187676d7 100644
--- a/platforms/chibios/drivers/ws2812_pwm.c
+++ b/platforms/chibios/drivers/ws2812_pwm.c
@@ -11,19 +11,19 @@
 #endif
 
 #ifndef WS2812_PWM_DRIVER
-#    define WS2812_PWM_DRIVER PWMD2  // TIMx
+#    define WS2812_PWM_DRIVER PWMD2 // TIMx
 #endif
 #ifndef WS2812_PWM_CHANNEL
-#    define WS2812_PWM_CHANNEL 2  // Channel
+#    define WS2812_PWM_CHANNEL 2 // Channel
 #endif
 #ifndef WS2812_PWM_PAL_MODE
-#    define WS2812_PWM_PAL_MODE 2  // DI Pin's alternate function value
+#    define WS2812_PWM_PAL_MODE 2 // DI Pin's alternate function value
 #endif
 #ifndef WS2812_DMA_STREAM
-#    define WS2812_DMA_STREAM STM32_DMA1_STREAM2  // DMA Stream for TIMx_UP
+#    define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP
 #endif
 #ifndef WS2812_DMA_CHANNEL
-#    define WS2812_DMA_CHANNEL 2  // DMA Channel for TIMx_UP
+#    define WS2812_DMA_CHANNEL 2 // DMA Channel for TIMx_UP
 #endif
 #if (STM32_DMA_SUPPORTS_DMAMUX == TRUE) && !defined(WS2812_DMAMUX_ID)
 #    error "please consult your MCU's datasheet and specify in your config.h: #define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM?_UP"
@@ -56,7 +56,7 @@
 
 #ifndef WS2812_PWM_TARGET_PERIOD
 //#    define WS2812_PWM_TARGET_PERIOD 800000 // Original code is 800k...?
-#    define WS2812_PWM_TARGET_PERIOD 80000  // TODO: work out why 10x less on f303/f4x1
+#    define WS2812_PWM_TARGET_PERIOD 80000 // TODO: work out why 10x less on f303/f4x1
 #endif
 
 /* --- PRIVATE CONSTANTS ---------------------------------------------------- */
@@ -259,8 +259,10 @@ write/read to/from the other buffer).
 void ws2812_init(void) {
     // Initialize led frame buffer
     uint32_t i;
-    for (i = 0; i < WS2812_COLOR_BIT_N; i++) ws2812_frame_buffer[i] = WS2812_DUTYCYCLE_0;      // All color bits are zero duty cycle
-    for (i = 0; i < WS2812_RESET_BIT_N; i++) ws2812_frame_buffer[i + WS2812_COLOR_BIT_N] = 0;  // All reset bits are zero
+    for (i = 0; i < WS2812_COLOR_BIT_N; i++)
+        ws2812_frame_buffer[i] = WS2812_DUTYCYCLE_0; // All color bits are zero duty cycle
+    for (i = 0; i < WS2812_RESET_BIT_N; i++)
+        ws2812_frame_buffer[i + WS2812_COLOR_BIT_N] = 0; // All reset bits are zero
 
     palSetLineMode(RGB_DI_PIN, WS2812_OUTPUT_MODE);
 
@@ -268,22 +270,22 @@ void ws2812_init(void) {
     //#pragma GCC diagnostic ignored "-Woverride-init"  // Turn off override-init warning for this struct. We use the overriding ability to set a "default" channel config
     static const PWMConfig ws2812_pwm_config = {
         .frequency = WS2812_PWM_FREQUENCY,
-        .period    = WS2812_PWM_PERIOD,  // Mit dieser Periode wird UDE-Event erzeugt und ein neuer Wert (Länge WS2812_BIT_N) vom DMA ins CCR geschrieben
+        .period    = WS2812_PWM_PERIOD, // Mit dieser Periode wird UDE-Event erzeugt und ein neuer Wert (Länge WS2812_BIT_N) vom DMA ins CCR geschrieben
         .callback  = NULL,
         .channels =
             {
-                [0 ... 3]                = {.mode = PWM_OUTPUT_DISABLED, .callback = NULL},     // Channels default to disabled
-                [WS2812_PWM_CHANNEL - 1] = {.mode = WS2812_PWM_OUTPUT_MODE, .callback = NULL},  // Turn on the channel we care about
+                [0 ... 3]                = {.mode = PWM_OUTPUT_DISABLED, .callback = NULL},    // Channels default to disabled
+                [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
+        .dier = TIM_DIER_UDE, // DMA on update event for next period
     };
     //#pragma GCC diagnostic pop  // Restore command-line warning options
 
     // Configure DMA
     // dmaInit(); // Joe added this
     dmaStreamAlloc(WS2812_DMA_STREAM - STM32_DMA_STREAM(0), 10, NULL, NULL);
-    dmaStreamSetPeripheral(WS2812_DMA_STREAM, &(WS2812_PWM_DRIVER.tim->CCR[WS2812_PWM_CHANNEL - 1]));  // Ziel ist der An-Zeit im Cap-Comp-Register
+    dmaStreamSetPeripheral(WS2812_DMA_STREAM, &(WS2812_PWM_DRIVER.tim->CCR[WS2812_PWM_CHANNEL - 1])); // Ziel ist der An-Zeit im Cap-Comp-Register
     dmaStreamSetMemory0(WS2812_DMA_STREAM, ws2812_frame_buffer);
     dmaStreamSetTransactionSize(WS2812_DMA_STREAM, WS2812_BIT_N);
     dmaStreamSetMode(WS2812_DMA_STREAM, STM32_DMA_CR_CHSEL(WS2812_DMA_CHANNEL) | STM32_DMA_CR_DIR_M2P | STM32_DMA_CR_PSIZE_WORD | STM32_DMA_CR_MSIZE_WORD | STM32_DMA_CR_MINC | STM32_DMA_CR_CIRC | STM32_DMA_CR_PL(3));
@@ -302,7 +304,7 @@ void ws2812_init(void) {
     // ChibiOS driver code, so we don't have to do anything special to the timer. If we did, we'd have to start the timer,
     // disable counting, enable the channel, and then make whatever configuration changes we need.
     pwmStart(&WS2812_PWM_DRIVER, &ws2812_pwm_config);
-    pwmEnableChannel(&WS2812_PWM_DRIVER, WS2812_PWM_CHANNEL - 1, 0);  // Initial period is 0; output will be low until first duty cycle is DMA'd in
+    pwmEnableChannel(&WS2812_PWM_DRIVER, WS2812_PWM_CHANNEL - 1, 0); // Initial period is 0; output will be low until first duty cycle is DMA'd in
 }
 
 void ws2812_write_led(uint16_t led_number, uint8_t r, uint8_t g, uint8_t b) {
diff --git a/platforms/chibios/drivers/ws2812_spi.c b/platforms/chibios/drivers/ws2812_spi.c
index ba471e0b8e..76191db165 100644
--- a/platforms/chibios/drivers/ws2812_spi.c
+++ b/platforms/chibios/drivers/ws2812_spi.c
@@ -42,7 +42,7 @@
 #    define WS2812_SPI_DIVISOR_CR1_BR_X (SPI_CR1_BR_0)
 #elif WS2812_SPI_DIVISOR == 8
 #    define WS2812_SPI_DIVISOR_CR1_BR_X (SPI_CR1_BR_1)
-#elif WS2812_SPI_DIVISOR == 16  // same as default
+#elif WS2812_SPI_DIVISOR == 16 // same as default
 #    define WS2812_SPI_DIVISOR_CR1_BR_X (SPI_CR1_BR_1 | SPI_CR1_BR_0)
 #elif WS2812_SPI_DIVISOR == 32
 #    define WS2812_SPI_DIVISOR_CR1_BR_X (SPI_CR1_BR_2)
@@ -53,14 +53,14 @@
 #elif WS2812_SPI_DIVISOR == 256
 #    define WS2812_SPI_DIVISOR_CR1_BR_X (SPI_CR1_BR_2 | SPI_CR1_BR_1 | SPI_CR1_BR_0)
 #else
-#    define WS2812_SPI_DIVISOR_CR1_BR_X (SPI_CR1_BR_1 | SPI_CR1_BR_0)  // default
+#    define WS2812_SPI_DIVISOR_CR1_BR_X (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
+#    define WS2812_SPI_BUFFER_MODE 1 // circular buffer
 #else
-#    define WS2812_SPI_BUFFER_MODE 0  // normal buffer
+#    define WS2812_SPI_BUFFER_MODE 0 // normal buffer
 #endif
 
 #if defined(USE_GPIOV1)
@@ -104,20 +104,30 @@ static void set_led_color_rgb(LED_TYPE color, int pos) {
     uint8_t* tx_start = &txbuf[PREAMBLE_SIZE];
 
 #if (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_GRB)
-    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + j] = get_protocol_eq(color.g, j);
-    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE + j] = get_protocol_eq(color.r, j);
-    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE * 2 + j] = get_protocol_eq(color.b, j);
+    for (int j = 0; j < 4; j++)
+        tx_start[BYTES_FOR_LED * pos + j] = get_protocol_eq(color.g, j);
+    for (int j = 0; j < 4; j++)
+        tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE + j] = get_protocol_eq(color.r, j);
+    for (int j = 0; j < 4; j++)
+        tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE * 2 + j] = get_protocol_eq(color.b, j);
 #elif (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_RGB)
-    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + j] = get_protocol_eq(color.r, j);
-    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE + j] = get_protocol_eq(color.g, j);
-    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE * 2 + j] = get_protocol_eq(color.b, j);
+    for (int j = 0; j < 4; j++)
+        tx_start[BYTES_FOR_LED * pos + j] = get_protocol_eq(color.r, j);
+    for (int j = 0; j < 4; j++)
+        tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE + j] = get_protocol_eq(color.g, j);
+    for (int j = 0; j < 4; j++)
+        tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE * 2 + j] = get_protocol_eq(color.b, j);
 #elif (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_BGR)
-    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + j] = get_protocol_eq(color.b, j);
-    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE + j] = get_protocol_eq(color.g, j);
-    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE * 2 + j] = get_protocol_eq(color.r, j);
+    for (int j = 0; j < 4; j++)
+        tx_start[BYTES_FOR_LED * pos + j] = get_protocol_eq(color.b, j);
+    for (int j = 0; j < 4; j++)
+        tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE + j] = get_protocol_eq(color.g, j);
+    for (int j = 0; j < 4; j++)
+        tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE * 2 + j] = get_protocol_eq(color.r, j);
 #endif
 #ifdef RGBW
-    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE * 4 + j] = get_protocol_eq(color.w, j);
+    for (int j = 0; j < 4; j++)
+        tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE * 4 + j] = get_protocol_eq(color.w, j);
 #endif
 }
 
@@ -126,7 +136,7 @@ void ws2812_init(void) {
 
 #ifdef WS2812_SPI_SCK_PIN
     palSetLineMode(WS2812_SPI_SCK_PIN, WS2812_SCK_OUTPUT_MODE);
-#endif  // WS2812_SPI_SCK_PIN
+#endif // WS2812_SPI_SCK_PIN
 
     // TODO: more dynamic baudrate
     static const SPIConfig spicfg = {WS2812_SPI_BUFFER_MODE, NULL, PAL_PORT(RGB_DI_PIN), PAL_PAD(RGB_DI_PIN), WS2812_SPI_DIVISOR_CR1_BR_X};
diff --git a/platforms/chibios/eeprom_stm32.c b/platforms/chibios/eeprom_stm32.c
index 8bf0b19c3d..a15bfe09ed 100644
--- a/platforms/chibios/eeprom_stm32.c
+++ b/platforms/chibios/eeprom_stm32.c
@@ -560,9 +560,13 @@ uint16_t EEPROM_ReadDataWord(uint16_t Address) {
 /*****************************************************************************
  *  Bind to eeprom_driver.c
  *******************************************************************************/
-void eeprom_driver_init(void) { EEPROM_Init(); }
+void eeprom_driver_init(void) {
+    EEPROM_Init();
+}
 
-void eeprom_driver_erase(void) { EEPROM_Erase(); }
+void eeprom_driver_erase(void) {
+    EEPROM_Erase();
+}
 
 void eeprom_read_block(void *buf, const void *addr, size_t len) {
     const uint8_t *src  = (const uint8_t *)addr;
diff --git a/platforms/chibios/eeprom_stm32_defs.h b/platforms/chibios/eeprom_stm32_defs.h
index 581434eb5e..a6ceb41355 100644
--- a/platforms/chibios/eeprom_stm32_defs.h
+++ b/platforms/chibios/eeprom_stm32_defs.h
@@ -20,41 +20,41 @@
 #if !defined(FEE_PAGE_SIZE) || !defined(FEE_PAGE_COUNT)
 #    if defined(STM32F103xB) || defined(STM32F042x6) || defined(GD32VF103C8) || defined(GD32VF103CB)
 #        ifndef FEE_PAGE_SIZE
-#            define FEE_PAGE_SIZE 0x400  // Page size = 1KByte
+#            define FEE_PAGE_SIZE 0x400 // Page size = 1KByte
 #        endif
 #        ifndef FEE_PAGE_COUNT
-#            define FEE_PAGE_COUNT 2  // How many pages are used
+#            define FEE_PAGE_COUNT 2 // How many pages are used
 #        endif
 #    elif defined(STM32F103xE) || defined(STM32F303xC) || defined(STM32F072xB) || defined(STM32F070xB)
 #        ifndef FEE_PAGE_SIZE
-#            define FEE_PAGE_SIZE 0x800  // Page size = 2KByte
+#            define FEE_PAGE_SIZE 0x800 // Page size = 2KByte
 #        endif
 #        ifndef FEE_PAGE_COUNT
-#            define FEE_PAGE_COUNT 4  // How many pages are used
+#            define FEE_PAGE_COUNT 4 // How many pages are used
 #        endif
 #    elif defined(STM32F401xC) || defined(STM32F401xE) || defined(STM32F405xG) || defined(STM32F411xE)
 #        ifndef FEE_PAGE_SIZE
-#            define FEE_PAGE_SIZE 0x4000  // Page size = 16KByte
+#            define FEE_PAGE_SIZE 0x4000 // Page size = 16KByte
 #        endif
 #        ifndef FEE_PAGE_COUNT
-#            define FEE_PAGE_COUNT 1  // How many pages are used
+#            define FEE_PAGE_COUNT 1 // How many pages are used
 #        endif
 #    endif
 #endif
 
 #if !defined(FEE_MCU_FLASH_SIZE)
 #    if defined(STM32F042x6)
-#        define FEE_MCU_FLASH_SIZE 32  // Size in Kb
+#        define FEE_MCU_FLASH_SIZE 32 // Size in Kb
 #    elif defined(GD32VF103C8)
-#        define FEE_MCU_FLASH_SIZE 64  // Size in Kb
+#        define FEE_MCU_FLASH_SIZE 64 // Size in Kb
 #    elif defined(STM32F103xB) || defined(STM32F072xB) || defined(STM32F070xB) || defined(GD32VF103CB)
-#        define FEE_MCU_FLASH_SIZE 128  // Size in Kb
+#        define FEE_MCU_FLASH_SIZE 128 // Size in Kb
 #    elif defined(STM32F303xC) || defined(STM32F401xC)
-#        define FEE_MCU_FLASH_SIZE 256  // Size in Kb
+#        define FEE_MCU_FLASH_SIZE 256 // Size in Kb
 #    elif defined(STM32F103xE) || defined(STM32F401xE) || defined(STM32F411xE)
-#        define FEE_MCU_FLASH_SIZE 512  // Size in Kb
+#        define FEE_MCU_FLASH_SIZE 512 // Size in Kb
 #    elif defined(STM32F405xG)
-#        define FEE_MCU_FLASH_SIZE 1024  // Size in Kb
+#        define FEE_MCU_FLASH_SIZE 1024 // Size in Kb
 #    endif
 #endif
 
@@ -62,7 +62,7 @@
 #if !defined(FEE_PAGE_BASE_ADDRESS)
 #    if defined(STM32F401xC) || defined(STM32F401xE) || defined(STM32F405xG) || defined(STM32F411xE)
 #        ifndef FEE_PAGE_BASE_ADDRESS
-#            define FEE_PAGE_BASE_ADDRESS 0x08004000  // bodge to force 2nd 16k page
+#            define FEE_PAGE_BASE_ADDRESS 0x08004000 // bodge to force 2nd 16k page
 #        endif
 #    else
 #        ifndef FEE_FLASH_BASE
diff --git a/platforms/chibios/eeprom_teensy.c b/platforms/chibios/eeprom_teensy.c
index 575f51526e..c8777febde 100644
--- a/platforms/chibios/eeprom_teensy.c
+++ b/platforms/chibios/eeprom_teensy.c
@@ -60,19 +60,19 @@
 
 // Minimum EEPROM Endurance
 // ------------------------
-#    if (EEPROM_SIZE == 2048)  // 35000 writes/byte or 70000 writes/word
+#    if (EEPROM_SIZE == 2048) // 35000 writes/byte or 70000 writes/word
 #        define EEESIZE 0x33
-#    elif (EEPROM_SIZE == 1024)  // 75000 writes/byte or 150000 writes/word
+#    elif (EEPROM_SIZE == 1024) // 75000 writes/byte or 150000 writes/word
 #        define EEESIZE 0x34
-#    elif (EEPROM_SIZE == 512)  // 155000 writes/byte or 310000 writes/word
+#    elif (EEPROM_SIZE == 512) // 155000 writes/byte or 310000 writes/word
 #        define EEESIZE 0x35
-#    elif (EEPROM_SIZE == 256)  // 315000 writes/byte or 630000 writes/word
+#    elif (EEPROM_SIZE == 256) // 315000 writes/byte or 630000 writes/word
 #        define EEESIZE 0x36
-#    elif (EEPROM_SIZE == 128)  // 635000 writes/byte or 1270000 writes/word
+#    elif (EEPROM_SIZE == 128) // 635000 writes/byte or 1270000 writes/word
 #        define EEESIZE 0x37
-#    elif (EEPROM_SIZE == 64)  // 1275000 writes/byte or 2550000 writes/word
+#    elif (EEPROM_SIZE == 64) // 1275000 writes/byte or 2550000 writes/word
 #        define EEESIZE 0x38
-#    elif (EEPROM_SIZE == 32)  // 2555000 writes/byte or 5110000 writes/word
+#    elif (EEPROM_SIZE == 32) // 2555000 writes/byte or 5110000 writes/word
 #        define EEESIZE 0x39
 #    endif
 
@@ -88,9 +88,9 @@ void eeprom_initialize(void) {
     if (FTFL->FCNFG & FTFL_FCNFG_RAMRDY) {
         // FlexRAM is configured as traditional RAM
         // We need to reconfigure for EEPROM usage
-        FTFL->FCCOB0 = 0x80;     // PGMPART = Program Partition Command
-        FTFL->FCCOB4 = EEESIZE;  // EEPROM Size
-        FTFL->FCCOB5 = 0x03;     // 0K for Dataflash, 32K for EEPROM backup
+        FTFL->FCCOB0 = 0x80;    // PGMPART = Program Partition Command
+        FTFL->FCCOB4 = EEESIZE; // EEPROM Size
+        FTFL->FCCOB5 = 0x03;    // 0K for Dataflash, 32K for EEPROM backup
         __disable_irq();
         // do_flash_cmd() must execute from RAM.  Luckily the C syntax is simple...
         (*((void (*)(volatile uint8_t *))((uint32_t)do_flash_cmd | 1)))(&(FTFL->FSTAT));
@@ -98,7 +98,7 @@ void eeprom_initialize(void) {
         status = FTFL->FSTAT;
         if (status & (FTFL_FSTAT_RDCOLERR | FTFL_FSTAT_ACCERR | FTFL_FSTAT_FPVIOL)) {
             FTFL->FSTAT = (status & (FTFL_FSTAT_RDCOLERR | FTFL_FSTAT_ACCERR | FTFL_FSTAT_FPVIOL));
-            return;  // error
+            return; // error
         }
     }
     // wait for eeprom to become ready (is this really necessary?)
@@ -162,7 +162,9 @@ void eeprom_read_block(void *buf, const void *addr, uint32_t len) {
  *
  * FIXME: needs doc
  */
-int eeprom_is_ready(void) { return (FTFL->FCNFG & FTFL_FCNFG_EEERDY) ? 1 : 0; }
+int eeprom_is_ready(void) {
+    return (FTFL->FCNFG & FTFL_FCNFG_EEERDY) ? 1 : 0;
+}
 
 /** \brief flexram wait
  *
@@ -486,7 +488,9 @@ void eeprom_read_block(void *buf, const void *addr, uint32_t len) {
     }
 }
 
-int eeprom_is_ready(void) { return 1; }
+int eeprom_is_ready(void) {
+    return 1;
+}
 
 void eeprom_write_word(uint16_t *addr, uint16_t value) {
     uint8_t *p = (uint8_t *)addr;
@@ -515,7 +519,9 @@ void eeprom_write_block(const void *buf, void *addr, uint32_t len) {
 #endif /* chip selection */
 // The update functions just calls write for now, but could probably be optimized
 
-void eeprom_update_byte(uint8_t *addr, uint8_t value) { eeprom_write_byte(addr, value); }
+void eeprom_update_byte(uint8_t *addr, uint8_t value) {
+    eeprom_write_byte(addr, value);
+}
 
 void eeprom_update_word(uint16_t *addr, uint16_t value) {
     uint8_t *p = (uint8_t *)addr;
diff --git a/platforms/chibios/gd32v_compatibility.h b/platforms/chibios/gd32v_compatibility.h
index f4dcfd8c55..a3148fb6d2 100644
--- a/platforms/chibios/gd32v_compatibility.h
+++ b/platforms/chibios/gd32v_compatibility.h
@@ -97,10 +97,10 @@
 /* Serial USART redefines. */
 #if HAL_USE_SERIAL
 #    if !defined(SERIAL_USART_CR1)
-#        define SERIAL_USART_CR1 (USART_CTL0_PCEN | USART_CTL0_PM | USART_CTL0_WL)  // parity enable, odd parity, 9 bit length
+#        define SERIAL_USART_CR1 (USART_CTL0_PCEN | USART_CTL0_PM | USART_CTL0_WL) // parity enable, odd parity, 9 bit length
 #    endif
 #    if !defined(SERIAL_USART_CR2)
-#        define SERIAL_USART_CR2 (USART_CTL1_STB_1)  // 2 stop bits
+#        define SERIAL_USART_CR2 (USART_CTL1_STB_1) // 2 stop bits
 #    endif
 #    if !defined(SERIAL_USART_CR3)
 #        define SERIAL_USART_CR3 0x0
diff --git a/platforms/chibios/platform.mk b/platforms/chibios/platform.mk
index 45e3377882..6fd1fd83f5 100644
--- a/platforms/chibios/platform.mk
+++ b/platforms/chibios/platform.mk
@@ -344,7 +344,7 @@ ifeq ($(strip $(MCU)), risc-v)
             ifneq ($(shell which riscv64-unknown-elf-gcc 2>/dev/null),)
                 TOOLCHAIN = riscv64-unknown-elf-
             else
-                $(error "No RISC-V toolchain found. Can't find riscv32-unknown-elf-gcc or riscv64-unknown-elf-gcc found in your systems PATH variable. Please install a valid toolchain and make it accessible!")
+                $(call CATASTROPHIC_ERROR,Missing toolchain,No RISC-V toolchain found. Can't find riscv32-unknown-elf-gcc or riscv64-unknown-elf-gcc found in your systems PATH variable. Please install a valid toolchain and make it accessible!)
             endif
         endif
     endif
diff --git a/platforms/chibios/sleep_led.c b/platforms/chibios/sleep_led.c
index 477056a454..a777d60468 100644
--- a/platforms/chibios/sleep_led.c
+++ b/platforms/chibios/sleep_led.c
@@ -93,7 +93,7 @@ void sleep_led_init(void) {
     /* Reset LPTMR settings */
     LPTMR0->CSR = 0;
     /* Set the compare value */
-    LPTMR0->CMR = 0;  // trigger on counter value (i.e. every time)
+    LPTMR0->CMR = 0; // trigger on counter value (i.e. every time)
 
 /* Set up clock source and prescaler */
 /* Software PWM
@@ -118,11 +118,11 @@ void sleep_led_init(void) {
 /* === OPTION 2 === */
 #    if 1
     //  nMHz IRC (n=4 on KL25Z, KL26Z and K20x; n=2 or 8 on KL27Z)
-    MCG->C2 |= MCG_C2_IRCS;  // fast (4MHz) internal ref clock
-#        if defined(KL27)    // divide the 8MHz IRC by 2, to have the same MCGIRCLK speed as others
+    MCG->C2 |= MCG_C2_IRCS; // fast (4MHz) internal ref clock
+#        if defined(KL27)   // divide the 8MHz IRC by 2, to have the same MCGIRCLK speed as others
     MCG->MC |= MCG_MC_LIRC_DIV2_DIV2;
-#        endif                  /* KL27 */
-    MCG->C1 |= MCG_C1_IRCLKEN;  // enable internal ref clock
+#        endif                 /* KL27 */
+    MCG->C1 |= MCG_C1_IRCLKEN; // enable internal ref clock
     //  to work in stop mode, also MCG_C1_IREFSTEN
     //  Divide 4MHz by 2^N (N=6) => 62500 irqs/sec =>
     //  => approx F=61, R=256, duration = 4
@@ -140,7 +140,7 @@ void sleep_led_init(void) {
     /* === END OPTIONS === */
 
     /* Interrupt on TCF set (compare flag) */
-    nvicEnableVector(LPTMR0_IRQn, 2);  // vector, priority
+    nvicEnableVector(LPTMR0_IRQn, 2); // vector, priority
     LPTMR0->CSR |= LPTMRx_CSR_TIE;
 }
 
@@ -169,21 +169,33 @@ static void gptTimerCallback(GPTDriver *gptp) {
 static const GPTConfig gptcfg = {1000000, gptTimerCallback, 0, 0};
 
 /* Initialise the timer */
-void sleep_led_init(void) { gptStart(&SLEEP_LED_GPT_DRIVER, &gptcfg); }
+void sleep_led_init(void) {
+    gptStart(&SLEEP_LED_GPT_DRIVER, &gptcfg);
+}
 
-void sleep_led_enable(void) { gptStartContinuous(&SLEEP_LED_GPT_DRIVER, gptcfg.frequency / 0xFFFF); }
+void sleep_led_enable(void) {
+    gptStartContinuous(&SLEEP_LED_GPT_DRIVER, gptcfg.frequency / 0xFFFF);
+}
 
-void sleep_led_disable(void) { gptStopTimer(&SLEEP_LED_GPT_DRIVER); }
+void sleep_led_disable(void) {
+    gptStopTimer(&SLEEP_LED_GPT_DRIVER);
+}
 
-void sleep_led_toggle(void) { (SLEEP_LED_GPT_DRIVER.state == GPT_READY) ? sleep_led_enable() : sleep_led_disable(); }
+void sleep_led_toggle(void) {
+    (SLEEP_LED_GPT_DRIVER.state == GPT_READY) ? sleep_led_enable() : sleep_led_disable();
+}
 
 #else /* platform selection: not on familiar chips */
 
 void sleep_led_init(void) {}
 
-void sleep_led_enable(void) { led_set(1 << USB_LED_CAPS_LOCK); }
+void sleep_led_enable(void) {
+    led_set(1 << USB_LED_CAPS_LOCK);
+}
 
-void sleep_led_disable(void) { led_set(0); }
+void sleep_led_disable(void) {
+    led_set(0);
+}
 
 void sleep_led_toggle(void) {
     // not implemented
diff --git a/platforms/chibios/suspend.c b/platforms/chibios/suspend.c
index d10ddf4501..ce03433e3a 100644
--- a/platforms/chibios/suspend.c
+++ b/platforms/chibios/suspend.c
@@ -25,34 +25,6 @@ void suspend_power_down(void) {
     wait_ms(17);
 }
 
-/** \brief suspend wakeup condition
- *
- * FIXME: needs doc
- */
-__attribute__((weak)) void matrix_power_up(void) {}
-__attribute__((weak)) void matrix_power_down(void) {}
-bool                       suspend_wakeup_condition(void) {
-    matrix_power_up();
-    matrix_scan();
-    matrix_power_down();
-    for (uint8_t r = 0; r < MATRIX_ROWS; r++) {
-        if (matrix_get_row(r)) return true;
-    }
-    return false;
-}
-
-/** \brief run user level code immediately after wakeup
- *
- * FIXME: needs doc
- */
-__attribute__((weak)) void suspend_wakeup_init_user(void) {}
-
-/** \brief run keyboard level code immediately after wakeup
- *
- * FIXME: needs doc
- */
-__attribute__((weak)) void suspend_wakeup_init_kb(void) { suspend_wakeup_init_user(); }
-
 /** \brief suspend wakeup condition
  *
  * run immediately after wakeup
diff --git a/platforms/chibios/syscall-fallbacks.c b/platforms/chibios/syscall-fallbacks.c
index 7150a46326..86f7907bfc 100644
--- a/platforms/chibios/syscall-fallbacks.c
+++ b/platforms/chibios/syscall-fallbacks.c
@@ -87,9 +87,13 @@ __attribute__((weak, used)) int _kill(int pid, int sig) {
     return -1;
 }
 
-__attribute__((weak, used)) pid_t _getpid(void) { return 1; }
+__attribute__((weak, used)) pid_t _getpid(void) {
+    return 1;
+}
 
-__attribute__((weak, used)) void _fini(void) { return; }
+__attribute__((weak, used)) void _fini(void) {
+    return;
+}
 
 __attribute__((weak, used, noreturn)) void _exit(int i) {
     while (1)
diff --git a/platforms/chibios/timer.c b/platforms/chibios/timer.c
index 9f664e1f79..e3bdfdcc37 100644
--- a/platforms/chibios/timer.c
+++ b/platforms/chibios/timer.c
@@ -2,46 +2,106 @@
 
 #include "timer.h"
 
-static uint32_t reset_point = 0;
+static uint32_t ticks_offset = 0;
+static uint32_t last_ticks   = 0;
+static uint32_t ms_offset    = 0;
 #if CH_CFG_ST_RESOLUTION < 32
 static uint32_t last_systime = 0;
 static uint32_t overflow     = 0;
 #endif
 
-void timer_init(void) { timer_clear(); }
-
-void timer_clear(void) {
-    reset_point = (uint32_t)chVTGetSystemTime();
-#if CH_CFG_ST_RESOLUTION < 32
-    last_systime = reset_point;
-    overflow     = 0;
-#endif
-}
-
-uint16_t timer_read(void) { return (uint16_t)timer_read32(); }
-
-uint32_t timer_read32(void) {
-    uint32_t systime = (uint32_t)chVTGetSystemTime();
+// Get the current system time in ticks as a 32-bit number.
+// This function must be called from within a system lock zone (so that it can safely use and update the static data).
+static inline uint32_t get_system_time_ticks(void) {
+    uint32_t systime = (uint32_t)chVTGetSystemTimeX();
 
 #if CH_CFG_ST_RESOLUTION < 32
-    // If/when we need to support 64-bit chips, this may need to be modified to match the native bit-ness of the MCU.
-    // At this point, the only SysTick resolution allowed other than 32 is 16 bit.
-    // In the 16-bit case, at:
+    // If the real system timer resolution is less than 32 bits, provide the missing bits by checking for the counter
+    // overflow.  For this to work, this function must be called at least once for every overflow of the system timer.
+    // In the 16-bit case, the corresponding times are:
     //    - CH_CFG_ST_FREQUENCY = 100000, overflow will occur every ~0.65 seconds
     //    - CH_CFG_ST_FREQUENCY = 10000, overflow will occur every ~6.5 seconds
     //    - CH_CFG_ST_FREQUENCY = 1000, overflow will occur every ~65 seconds
-    // With this implementation, as long as we ensure a timer read happens at least once during the overflow period, timing should be accurate.
     if (systime < last_systime) {
         overflow += ((uint32_t)1) << CH_CFG_ST_RESOLUTION;
     }
-
     last_systime = systime;
-    return (uint32_t)TIME_I2MS(systime - reset_point + overflow);
-#else
-    return (uint32_t)TIME_I2MS(systime - reset_point);
+    systime += overflow;
+#endif
+
+    return systime;
+}
+
+#if CH_CFG_ST_RESOLUTION < 32
+static virtual_timer_t update_timer;
+
+// Update the system tick counter every half of the timer overflow period; this should keep the tick counter correct
+// even if something blocks timer interrupts for 1/2 of the timer overflow period.
+#    define UPDATE_INTERVAL (((sysinterval_t)1) << (CH_CFG_ST_RESOLUTION - 1))
+
+// VT callback function to keep the overflow bits of the system tick counter updated.
+static void update_fn(void *arg) {
+    (void)arg;
+    chSysLockFromISR();
+    get_system_time_ticks();
+    chVTSetI(&update_timer, UPDATE_INTERVAL, update_fn, NULL);
+    chSysUnlockFromISR();
+}
+#endif
+
+// The highest multiple of CH_CFG_ST_FREQUENCY that fits into uint32_t.  This number of ticks will necessarily
+// correspond to some integer number of seconds.
+#define OVERFLOW_ADJUST_TICKS ((uint32_t)((UINT32_MAX / CH_CFG_ST_FREQUENCY) * CH_CFG_ST_FREQUENCY))
+
+// The time in milliseconds which corresponds to OVERFLOW_ADJUST_TICKS ticks (this is a precise conversion, because
+// OVERFLOW_ADJUST_TICKS corresponds to an integer number of seconds).
+#define OVERFLOW_ADJUST_MS (TIME_I2MS(OVERFLOW_ADJUST_TICKS))
+
+void timer_init(void) {
+    timer_clear();
+#if CH_CFG_ST_RESOLUTION < 32
+    chVTObjectInit(&update_timer);
+    chVTSet(&update_timer, UPDATE_INTERVAL, update_fn, NULL);
 #endif
 }
 
-uint16_t timer_elapsed(uint16_t last) { return TIMER_DIFF_16(timer_read(), last); }
+void timer_clear(void) {
+    chSysLock();
+    ticks_offset = get_system_time_ticks();
+    last_ticks   = 0;
+    ms_offset    = 0;
+    chSysUnlock();
+}
 
-uint32_t timer_elapsed32(uint32_t last) { return TIMER_DIFF_32(timer_read32(), last); }
+uint16_t timer_read(void) {
+    return (uint16_t)timer_read32();
+}
+
+uint32_t timer_read32(void) {
+    chSysLock();
+    uint32_t ticks = get_system_time_ticks() - ticks_offset;
+    if (ticks < last_ticks) {
+        // The 32-bit tick counter overflowed and wrapped around.  We cannot just extend the counter to 64 bits here,
+        // because TIME_I2MS() may encounter overflows when handling a 64-bit argument; therefore the solution here is
+        // to subtract a reasonably large number of ticks from the tick counter to bring its value below the 32-bit
+        // limit again, and then add the equivalent number of milliseconds to the converted value.  (Adjusting just the
+        // converted value to account for 2**32 ticks is not possible in general, because 2**32 ticks may not correspond
+        // to an integer number of milliseconds).
+        ticks -= OVERFLOW_ADJUST_TICKS;
+        ticks_offset += OVERFLOW_ADJUST_TICKS;
+        ms_offset += OVERFLOW_ADJUST_MS;
+    }
+    last_ticks              = ticks;
+    uint32_t ms_offset_copy = ms_offset; // read while still holding the lock to ensure a consistent value
+    chSysUnlock();
+
+    return (uint32_t)TIME_I2MS(ticks) + ms_offset_copy;
+}
+
+uint16_t timer_elapsed(uint16_t last) {
+    return TIMER_DIFF_16(timer_read(), last);
+}
+
+uint32_t timer_elapsed32(uint32_t last) {
+    return TIMER_DIFF_32(timer_read32(), last);
+}
diff --git a/platforms/common.mk b/platforms/common.mk
index 12ab45f823..2a1fc8d377 100644
--- a/platforms/common.mk
+++ b/platforms/common.mk
@@ -1,6 +1,7 @@
 PLATFORM_COMMON_DIR = $(PLATFORM_PATH)/$(PLATFORM_KEY)
 
 TMK_COMMON_SRC +=	\
+	$(PLATFORM_PATH)/suspend.c \
 	$(PLATFORM_COMMON_DIR)/platform.c \
 	$(PLATFORM_COMMON_DIR)/suspend.c \
 	$(PLATFORM_COMMON_DIR)/timer.c \
diff --git a/platforms/suspend.c b/platforms/suspend.c
new file mode 100644
index 0000000000..fea23cbd02
--- /dev/null
+++ b/platforms/suspend.c
@@ -0,0 +1,51 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "suspend.h"
+#include "matrix.h"
+
+// TODO: Move to more correct location
+__attribute__((weak)) void matrix_power_up(void) {}
+__attribute__((weak)) void matrix_power_down(void) {}
+
+/** \brief Run user level Power down
+ *
+ * FIXME: needs doc
+ */
+__attribute__((weak)) void suspend_power_down_user(void) {}
+
+/** \brief Run keyboard level Power down
+ *
+ * FIXME: needs doc
+ */
+__attribute__((weak)) void suspend_power_down_kb(void) {
+    suspend_power_down_user();
+}
+
+/** \brief run user level code immediately after wakeup
+ *
+ * FIXME: needs doc
+ */
+__attribute__((weak)) void suspend_wakeup_init_user(void) {}
+
+/** \brief run keyboard level code immediately after wakeup
+ *
+ * FIXME: needs doc
+ */
+__attribute__((weak)) void suspend_wakeup_init_kb(void) {
+    suspend_wakeup_init_user();
+}
+
+/** \brief suspend wakeup condition
+ *
+ * FIXME: needs doc
+ */
+bool suspend_wakeup_condition(void) {
+    matrix_power_up();
+    matrix_scan();
+    matrix_power_down();
+    for (uint8_t r = 0; r < MATRIX_ROWS; r++) {
+        if (matrix_get_row(r)) return true;
+    }
+    return false;
+}
diff --git a/platforms/test/eeprom.c b/platforms/test/eeprom.c
index e292faa644..d501745e55 100644
--- a/platforms/test/eeprom.c
+++ b/platforms/test/eeprom.c
@@ -68,7 +68,9 @@ void eeprom_write_block(const void *buf, void *addr, size_t len) {
     }
 }
 
-void eeprom_update_byte(uint8_t *addr, uint8_t value) { eeprom_write_byte(addr, value); }
+void eeprom_update_byte(uint8_t *addr, uint8_t value) {
+    eeprom_write_byte(addr, value);
+}
 
 void eeprom_update_word(uint16_t *addr, uint16_t value) {
     uint8_t *p = (uint8_t *)addr;
diff --git a/platforms/test/eeprom_stm32_tests.cpp b/platforms/test/eeprom_stm32_tests.cpp
index 57f31d634f..d2c41fb77d 100644
--- a/platforms/test/eeprom_stm32_tests.cpp
+++ b/platforms/test/eeprom_stm32_tests.cpp
@@ -60,7 +60,9 @@ class EepromStm32Test : public testing::Test {
     ~EepromStm32Test() {}
 
    protected:
-    void SetUp() override { EEPROM_Erase(); }
+    void SetUp() override {
+        EEPROM_Erase();
+    }
 
     void TearDown() override {
 #ifdef EEPROM_DEBUG
@@ -83,7 +85,7 @@ TEST_F(EepromStm32Test, TestReadGarbage) {
         garbage += i;
         FlashBuf[i] = garbage;
     }
-    EEPROM_Init();  // Just verify we don't crash
+    EEPROM_Init(); // Just verify we don't crash
 }
 
 TEST_F(EepromStm32Test, TestWriteBadAddress) {
@@ -206,11 +208,11 @@ TEST_F(EepromStm32Test, TestReadWord) {
 
 TEST_F(EepromStm32Test, TestWriteWord) {
     /* Direct compacted-area: Address < 0x80 */
-    EEPROM_WriteDataWord(0, 0xdead);  // Aligned
-    EEPROM_WriteDataWord(3, 0xbeef);  // Unaligned
+    EEPROM_WriteDataWord(0, 0xdead); // Aligned
+    EEPROM_WriteDataWord(3, 0xbeef); // Unaligned
     /* Direct compacted-area: Address >= 0x80 */
-    EEPROM_WriteDataWord(200, 0xabcd);  // Aligned
-    EEPROM_WriteDataWord(203, 0x9876);  // Unaligned
+    EEPROM_WriteDataWord(200, 0xabcd); // Aligned
+    EEPROM_WriteDataWord(203, 0x9876); // Unaligned
     EEPROM_WriteDataWord(EEPROM_SIZE - 4, 0x1234);
     EEPROM_WriteDataWord(EEPROM_SIZE - 2, 0x5678);
     /* Write Log word zero-encoded */
@@ -218,10 +220,10 @@ TEST_F(EepromStm32Test, TestWriteWord) {
     /* Write Log word one-encoded */
     EEPROM_WriteDataWord(EEPROM_SIZE - 2, 1);
     /* Write Log word value aligned */
-    EEPROM_WriteDataWord(200, 0x4321);  // Aligned
+    EEPROM_WriteDataWord(200, 0x4321); // Aligned
     /* Write Log word value unaligned */
-    EEPROM_WriteDataByte(202, 0x3c);    // Set neighboring byte
-    EEPROM_WriteDataWord(203, 0xcdef);  // Unaligned
+    EEPROM_WriteDataByte(202, 0x3c);   // Set neighboring byte
+    EEPROM_WriteDataWord(203, 0xcdef); // Unaligned
     /* Check values */
     /* Direct compacted-area */
     EXPECT_EQ(*(uint16_t*)&FlashBuf[EEPROM_BASE], (uint16_t)~0xdead);
@@ -249,11 +251,11 @@ TEST_F(EepromStm32Test, TestWriteWord) {
 
 TEST_F(EepromStm32Test, TestWordRoundTrip) {
     /* Direct compacted-area: Address < 0x80 */
-    EEPROM_WriteDataWord(0, 0xdead);  // Aligned
-    EEPROM_WriteDataWord(3, 0xbeef);  // Unaligned
+    EEPROM_WriteDataWord(0, 0xdead); // Aligned
+    EEPROM_WriteDataWord(3, 0xbeef); // Unaligned
     /* Direct compacted-area: Address >= 0x80 */
-    EEPROM_WriteDataWord(200, 0xabcd);  // Aligned
-    EEPROM_WriteDataWord(203, 0x9876);  // Unaligned
+    EEPROM_WriteDataWord(200, 0xabcd); // Aligned
+    EEPROM_WriteDataWord(203, 0x9876); // Unaligned
     EEPROM_WriteDataWord(EEPROM_SIZE - 4, 0x1234);
     EEPROM_WriteDataWord(EEPROM_SIZE - 2, 0x5678);
     /* Check values */
@@ -270,10 +272,10 @@ TEST_F(EepromStm32Test, TestWordRoundTrip) {
     /* Write Log word one-encoded */
     EEPROM_WriteDataWord(EEPROM_SIZE - 2, 1);
     /* Write Log word value aligned */
-    EEPROM_WriteDataWord(200, 0x4321);  // Aligned
+    EEPROM_WriteDataWord(200, 0x4321); // Aligned
     /* Write Log word value unaligned */
-    EEPROM_WriteDataByte(202, 0x3c);    // Set neighboring byte
-    EEPROM_WriteDataWord(203, 0xcdef);  // Unaligned
+    EEPROM_WriteDataByte(202, 0x3c);   // Set neighboring byte
+    EEPROM_WriteDataWord(203, 0xcdef); // Unaligned
     /* Check values */
     EEPROM_Init();
     EXPECT_EQ(EEPROM_ReadDataWord(200), 0x4321);
@@ -324,34 +326,34 @@ TEST_F(EepromStm32Test, TestByteWordBoundary) {
 
 TEST_F(EepromStm32Test, TestDWordRoundTrip) {
     /* Direct compacted-area: Address < 0x80 */
-    eeprom_write_dword((uint32_t*)0, 0xdeadbeef);  // Aligned
-    eeprom_write_dword((uint32_t*)9, 0x12345678);  // Unaligned
+    eeprom_write_dword((uint32_t*)0, 0xdeadbeef); // Aligned
+    eeprom_write_dword((uint32_t*)9, 0x12345678); // Unaligned
     /* Direct compacted-area: Address >= 0x80 */
     eeprom_write_dword((uint32_t*)200, 0xfacef00d);
-    eeprom_write_dword((uint32_t*)(EEPROM_SIZE - 4), 0xba5eba11);  // Aligned
-    eeprom_write_dword((uint32_t*)(EEPROM_SIZE - 9), 0xcafed00d);  // Unaligned
+    eeprom_write_dword((uint32_t*)(EEPROM_SIZE - 4), 0xba5eba11); // Aligned
+    eeprom_write_dword((uint32_t*)(EEPROM_SIZE - 9), 0xcafed00d); // Unaligned
     /* Check direct values */
     EEPROM_Init();
     EXPECT_EQ(eeprom_read_dword((uint32_t*)0), 0xdeadbeef);
     EXPECT_EQ(eeprom_read_dword((uint32_t*)9), 0x12345678);
     EXPECT_EQ(eeprom_read_dword((uint32_t*)200), 0xfacef00d);
-    EXPECT_EQ(eeprom_read_dword((uint32_t*)(EEPROM_SIZE - 4)), 0xba5eba11);  // Aligned
-    EXPECT_EQ(eeprom_read_dword((uint32_t*)(EEPROM_SIZE - 9)), 0xcafed00d);  // Unaligned
+    EXPECT_EQ(eeprom_read_dword((uint32_t*)(EEPROM_SIZE - 4)), 0xba5eba11); // Aligned
+    EXPECT_EQ(eeprom_read_dword((uint32_t*)(EEPROM_SIZE - 9)), 0xcafed00d); // Unaligned
     /* Write Log byte encoded */
     eeprom_write_dword((uint32_t*)0, 0xdecafbad);
     eeprom_write_dword((uint32_t*)9, 0x87654321);
     /* Write Log word encoded */
     eeprom_write_dword((uint32_t*)200, 1);
     /* Write Log word value aligned */
-    eeprom_write_dword((uint32_t*)(EEPROM_SIZE - 4), 0xdeadc0de);  // Aligned
-    eeprom_write_dword((uint32_t*)(EEPROM_SIZE - 9), 0x6789abcd);  // Unaligned
+    eeprom_write_dword((uint32_t*)(EEPROM_SIZE - 4), 0xdeadc0de); // Aligned
+    eeprom_write_dword((uint32_t*)(EEPROM_SIZE - 9), 0x6789abcd); // Unaligned
     /* Check log values */
     EEPROM_Init();
     EXPECT_EQ(eeprom_read_dword((uint32_t*)0), 0xdecafbad);
     EXPECT_EQ(eeprom_read_dword((uint32_t*)9), 0x87654321);
     EXPECT_EQ(eeprom_read_dword((uint32_t*)200), 1);
-    EXPECT_EQ(eeprom_read_dword((uint32_t*)(EEPROM_SIZE - 4)), 0xdeadc0de);  // Aligned
-    EXPECT_EQ(eeprom_read_dword((uint32_t*)(EEPROM_SIZE - 9)), 0x6789abcd);  // Unaligned
+    EXPECT_EQ(eeprom_read_dword((uint32_t*)(EEPROM_SIZE - 4)), 0xdeadc0de); // Aligned
+    EXPECT_EQ(eeprom_read_dword((uint32_t*)(EEPROM_SIZE - 9)), 0x6789abcd); // Unaligned
 }
 
 TEST_F(EepromStm32Test, TestBlockRoundTrip) {
diff --git a/platforms/test/flash_stm32_mock.c b/platforms/test/flash_stm32_mock.c
index 222a004bc7..b6ab170f95 100644
--- a/platforms/test/flash_stm32_mock.c
+++ b/platforms/test/flash_stm32_mock.c
@@ -44,6 +44,12 @@ FLASH_Status FLASH_ProgramHalfWord(uint32_t Address, uint16_t Data) {
     }
 }
 
-FLASH_Status FLASH_WaitForLastOperation(uint32_t Timeout) { return FLASH_COMPLETE; }
-void         FLASH_Unlock(void) { flash_locked = false; }
-void         FLASH_Lock(void) { flash_locked = true; }
+FLASH_Status FLASH_WaitForLastOperation(uint32_t Timeout) {
+    return FLASH_COMPLETE;
+}
+void FLASH_Unlock(void) {
+    flash_locked = false;
+}
+void FLASH_Lock(void) {
+    flash_locked = true;
+}
diff --git a/platforms/test/timer.c b/platforms/test/timer.c
index 61c3a00201..e0acd1b16d 100644
--- a/platforms/test/timer.c
+++ b/platforms/test/timer.c
@@ -18,16 +18,34 @@
 
 static uint32_t current_time = 0;
 
-void timer_init(void) { current_time = 0; }
+void timer_init(void) {
+    current_time = 0;
+}
 
-void timer_clear(void) { current_time = 0; }
+void timer_clear(void) {
+    current_time = 0;
+}
 
-uint16_t timer_read(void) { return current_time & 0xFFFF; }
-uint32_t timer_read32(void) { return current_time; }
-uint16_t timer_elapsed(uint16_t last) { return TIMER_DIFF_16(timer_read(), last); }
-uint32_t timer_elapsed32(uint32_t last) { return TIMER_DIFF_32(timer_read32(), last); }
+uint16_t timer_read(void) {
+    return current_time & 0xFFFF;
+}
+uint32_t timer_read32(void) {
+    return current_time;
+}
+uint16_t timer_elapsed(uint16_t last) {
+    return TIMER_DIFF_16(timer_read(), last);
+}
+uint32_t timer_elapsed32(uint32_t last) {
+    return TIMER_DIFF_32(timer_read32(), last);
+}
 
-void set_time(uint32_t t) { current_time = t; }
-void advance_time(uint32_t ms) { current_time += ms; }
+void set_time(uint32_t t) {
+    current_time = t;
+}
+void advance_time(uint32_t ms) {
+    current_time += ms;
+}
 
-void wait_ms(uint32_t ms) { advance_time(ms); }
+void wait_ms(uint32_t ms) {
+    advance_time(ms);
+}
diff --git a/platforms/timer.h b/platforms/timer.h
index 02e39e79e7..d55f40f0b0 100644
--- a/platforms/timer.h
+++ b/platforms/timer.h
@@ -52,14 +52,22 @@ uint32_t timer_elapsed32(uint32_t last);
 #    define TIMER_DIFF_FAST(a, b) TIMER_DIFF_16(a, b)
 #    define timer_expired_fast(current, future) timer_expired(current, future)
 typedef uint16_t fast_timer_t;
-fast_timer_t inline timer_read_fast(void) { return timer_read(); }
-fast_timer_t inline timer_elapsed_fast(fast_timer_t last) { return timer_elapsed(last); }
+fast_timer_t inline timer_read_fast(void) {
+    return timer_read();
+}
+fast_timer_t inline timer_elapsed_fast(fast_timer_t last) {
+    return timer_elapsed(last);
+}
 #else
 #    define TIMER_DIFF_FAST(a, b) TIMER_DIFF_32(a, b)
 #    define timer_expired_fast(current, future) timer_expired32(current, future)
 typedef uint32_t fast_timer_t;
-fast_timer_t inline timer_read_fast(void) { return timer_read32(); }
-fast_timer_t inline timer_elapsed_fast(fast_timer_t last) { return timer_elapsed32(last); }
+fast_timer_t inline timer_read_fast(void) {
+    return timer_read32();
+}
+fast_timer_t inline timer_elapsed_fast(fast_timer_t last) {
+    return timer_elapsed32(last);
+}
 #endif
 
 #ifdef __cplusplus
diff --git a/quantum/action.c b/quantum/action.c
index d932c01688..2bb1c34985 100644
--- a/quantum/action.c
+++ b/quantum/action.c
@@ -53,14 +53,20 @@ int retro_tapping_counter = 0;
 #endif
 
 #ifdef IGNORE_MOD_TAP_INTERRUPT_PER_KEY
-__attribute__((weak)) bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { return false; }
+__attribute__((weak)) bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) {
+    return false;
+}
 #endif
 
 #ifdef RETRO_TAPPING_PER_KEY
-__attribute__((weak)) bool get_retro_tapping(uint16_t keycode, keyrecord_t *record) { return false; }
+__attribute__((weak)) bool get_retro_tapping(uint16_t keycode, keyrecord_t *record) {
+    return false;
+}
 #endif
 
-__attribute__((weak)) bool pre_process_record_quantum(keyrecord_t *record) { return true; }
+__attribute__((weak)) bool pre_process_record_quantum(keyrecord_t *record) {
+    return true;
+}
 
 /** \brief Called to execute an action.
  *
@@ -163,10 +169,14 @@ void process_record_nocache(keyrecord_t *record) {
     disable_action_cache = false;
 }
 #else
-void process_record_nocache(keyrecord_t *record) { process_record(record); }
+void process_record_nocache(keyrecord_t *record) {
+    process_record(record);
+}
 #endif
 
-__attribute__((weak)) bool process_record_quantum(keyrecord_t *record) { return true; }
+__attribute__((weak)) bool process_record_quantum(keyrecord_t *record) {
+    return true;
+}
 
 __attribute__((weak)) void post_process_record_quantum(keyrecord_t *record) {}
 
@@ -688,7 +698,7 @@ void process_action(keyrecord_t *record, action_t action) {
                     /* tap key */
                     if (tap_count > 0) {
                         if (swap_held) {
-                            swap_hands = !swap_hands;  // undo hold set up in _tap_hint
+                            swap_hands = !swap_hands; // undo hold set up in _tap_hint
                             swap_held  = false;
                         }
                         if (event.pressed) {
@@ -696,11 +706,11 @@ void process_action(keyrecord_t *record, action_t action) {
                         } else {
                             wait_ms(TAP_CODE_DELAY);
                             unregister_code(action.swap.code);
-                            *record = (keyrecord_t){};  // hack: reset tap mode
+                            *record = (keyrecord_t){}; // hack: reset tap mode
                         }
                     } else {
                         if (swap_held && !event.pressed) {
-                            swap_hands = !swap_hands;  // undo hold set up in _tap_hint
+                            swap_hands = !swap_hands; // undo hold set up in _tap_hint
                             swap_held  = false;
                         }
                     }
@@ -862,9 +872,13 @@ __attribute__((weak)) void register_code(uint8_t code) {
         }
 #ifdef EXTRAKEY_ENABLE
     else if
-        IS_SYSTEM(code) { host_system_send(KEYCODE2SYSTEM(code)); }
+        IS_SYSTEM(code) {
+            host_system_send(KEYCODE2SYSTEM(code));
+        }
     else if
-        IS_CONSUMER(code) { host_consumer_send(KEYCODE2CONSUMER(code)); }
+        IS_CONSUMER(code) {
+            host_consumer_send(KEYCODE2CONSUMER(code));
+        }
 #endif
 #ifdef MOUSEKEY_ENABLE
     else if
@@ -927,9 +941,13 @@ __attribute__((weak)) void unregister_code(uint8_t code) {
             send_keyboard_report();
         }
     else if
-        IS_SYSTEM(code) { host_system_send(0); }
+        IS_SYSTEM(code) {
+            host_system_send(0);
+        }
     else if
-        IS_CONSUMER(code) { host_consumer_send(0); }
+        IS_CONSUMER(code) {
+            host_consumer_send(0);
+        }
 #ifdef MOUSEKEY_ENABLE
     else if
         IS_MOUSEKEY(code) {
@@ -956,7 +974,9 @@ __attribute__((weak)) void tap_code_delay(uint8_t code, uint16_t delay) {
  *
  * \param code The basic keycode to tap. If `code` is `KC_CAPS_LOCK`, the delay will be `TAP_HOLD_CAPS_DELAY`, otherwise `TAP_CODE_DELAY`, if defined.
  */
-__attribute__((weak)) void tap_code(uint8_t code) { tap_code_delay(code, code == KC_CAPS_LOCK ? TAP_HOLD_CAPS_DELAY : TAP_CODE_DELAY); }
+__attribute__((weak)) void tap_code(uint8_t code) {
+    tap_code_delay(code, code == KC_CAPS_LOCK ? TAP_HOLD_CAPS_DELAY : TAP_CODE_DELAY);
+}
 
 /** \brief Adds the given physically pressed modifiers and sends a keyboard report immediately.
  *
@@ -1100,7 +1120,9 @@ bool is_tap_action(action_t action) {
  *
  * FIXME: Needs documentation.
  */
-void debug_event(keyevent_t event) { dprintf("%04X%c(%u)", (event.key.row << 8 | event.key.col), (event.pressed ? 'd' : 'u'), event.time); }
+void debug_event(keyevent_t event) {
+    dprintf("%04X%c(%u)", (event.key.row << 8 | event.key.col), (event.pressed ? 'd' : 'u'), event.time);
+}
 /** \brief Debug print (FIXME: Needs better description)
  *
  * FIXME: Needs documentation.
diff --git a/quantum/action_layer.c b/quantum/action_layer.c
index ed1a4bd20d..e20eedee40 100644
--- a/quantum/action_layer.c
+++ b/quantum/action_layer.c
@@ -18,13 +18,17 @@ layer_state_t default_layer_state = 0;
  *
  * Run user code on default layer state change
  */
-__attribute__((weak)) layer_state_t default_layer_state_set_user(layer_state_t state) { return state; }
+__attribute__((weak)) layer_state_t default_layer_state_set_user(layer_state_t state) {
+    return state;
+}
 
 /** \brief Default Layer State Set At Keyboard Level
  *
  *  Run keyboard code on default layer state change
  */
-__attribute__((weak)) layer_state_t default_layer_state_set_kb(layer_state_t state) { return default_layer_state_set_user(state); }
+__attribute__((weak)) layer_state_t default_layer_state_set_kb(layer_state_t state) {
+    return default_layer_state_set_user(state);
+}
 
 /** \brief Default Layer State Set
  *
@@ -39,9 +43,9 @@ static void default_layer_state_set(layer_state_t state) {
     default_layer_debug();
     debug("\n");
 #ifdef STRICT_LAYER_RELEASE
-    clear_keyboard_but_mods();  // To avoid stuck keys
+    clear_keyboard_but_mods(); // To avoid stuck keys
 #else
-    clear_keyboard_but_mods_and_keys();  // Don't reset held keys
+    clear_keyboard_but_mods_and_keys(); // Don't reset held keys
 #endif
 }
 
@@ -49,30 +53,40 @@ static void default_layer_state_set(layer_state_t state) {
  *
  * Print out the hex value of the 32-bit default layer state, as well as the value of the highest bit.
  */
-void default_layer_debug(void) { dprintf("%08lX(%u)", default_layer_state, get_highest_layer(default_layer_state)); }
+void default_layer_debug(void) {
+    dprintf("%08lX(%u)", default_layer_state, get_highest_layer(default_layer_state));
+}
 
 /** \brief Default Layer Set
  *
  * Sets the default layer state.
  */
-void default_layer_set(layer_state_t state) { default_layer_state_set(state); }
+void default_layer_set(layer_state_t state) {
+    default_layer_state_set(state);
+}
 
 #ifndef NO_ACTION_LAYER
 /** \brief Default Layer Or
  *
  * Turns on the default layer based on matching bits between specifed layer and existing layer state
  */
-void default_layer_or(layer_state_t state) { default_layer_state_set(default_layer_state | state); }
+void default_layer_or(layer_state_t state) {
+    default_layer_state_set(default_layer_state | state);
+}
 /** \brief Default Layer And
  *
  * Turns on default layer based on matching enabled bits between specifed layer and existing layer state
  */
-void default_layer_and(layer_state_t state) { default_layer_state_set(default_layer_state & state); }
+void default_layer_and(layer_state_t state) {
+    default_layer_state_set(default_layer_state & state);
+}
 /** \brief Default Layer Xor
  *
  * Turns on default layer based on non-matching bits between specifed layer and existing layer state
  */
-void default_layer_xor(layer_state_t state) { default_layer_state_set(default_layer_state ^ state); }
+void default_layer_xor(layer_state_t state) {
+    default_layer_state_set(default_layer_state ^ state);
+}
 #endif
 
 #ifndef NO_ACTION_LAYER
@@ -84,13 +98,17 @@ layer_state_t layer_state = 0;
  *
  * Runs user code on layer state change
  */
-__attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) { return state; }
+__attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
+    return state;
+}
 
 /** \brief Layer state set keyboard
  *
  * Runs keyboard code on layer state change
  */
-__attribute__((weak)) layer_state_t layer_state_set_kb(layer_state_t state) { return layer_state_set_user(state); }
+__attribute__((weak)) layer_state_t layer_state_set_kb(layer_state_t state) {
+    return layer_state_set_user(state);
+}
 
 /** \brief Layer state set
  *
@@ -105,9 +123,9 @@ void layer_state_set(layer_state_t state) {
     layer_debug();
     dprintln();
 #    ifdef STRICT_LAYER_RELEASE
-    clear_keyboard_but_mods();  // To avoid stuck keys
+    clear_keyboard_but_mods(); // To avoid stuck keys
 #    else
-    clear_keyboard_but_mods_and_keys();  // Don't reset held keys
+    clear_keyboard_but_mods_and_keys(); // Don't reset held keys
 #    endif
 }
 
@@ -115,13 +133,17 @@ void layer_state_set(layer_state_t state) {
  *
  * Turn off all layers
  */
-void layer_clear(void) { layer_state_set(0); }
+void layer_clear(void) {
+    layer_state_set(0);
+}
 
 /** \brief Layer state is
  *
  * Return whether the given state is on (it might still be shadowed by a higher state, though)
  */
-bool layer_state_is(uint8_t layer) { return layer_state_cmp(layer_state, layer); }
+bool layer_state_is(uint8_t layer) {
+    return layer_state_cmp(layer_state, layer);
+}
 
 /** \brief Layer state compare
  *
@@ -138,47 +160,63 @@ bool layer_state_cmp(layer_state_t cmp_layer_state, uint8_t layer) {
  *
  * Turns on the given layer and turn off all other layers
  */
-void layer_move(uint8_t layer) { layer_state_set((layer_state_t)1 << layer); }
+void layer_move(uint8_t layer) {
+    layer_state_set((layer_state_t)1 << layer);
+}
 
 /** \brief Layer on
  *
  * Turns on given layer
  */
-void layer_on(uint8_t layer) { layer_state_set(layer_state | ((layer_state_t)1 << layer)); }
+void layer_on(uint8_t layer) {
+    layer_state_set(layer_state | ((layer_state_t)1 << layer));
+}
 
 /** \brief Layer off
  *
  * Turns off given layer
  */
-void layer_off(uint8_t layer) { layer_state_set(layer_state & ~((layer_state_t)1 << layer)); }
+void layer_off(uint8_t layer) {
+    layer_state_set(layer_state & ~((layer_state_t)1 << layer));
+}
 
 /** \brief Layer invert
  *
  * Toggle the given layer (set it if it's unset, or unset it if it's set)
  */
-void layer_invert(uint8_t layer) { layer_state_set(layer_state ^ ((layer_state_t)1 << layer)); }
+void layer_invert(uint8_t layer) {
+    layer_state_set(layer_state ^ ((layer_state_t)1 << layer));
+}
 
 /** \brief Layer or
  *
  * Turns on layers based on matching bits between specifed layer and existing layer state
  */
-void layer_or(layer_state_t state) { layer_state_set(layer_state | state); }
+void layer_or(layer_state_t state) {
+    layer_state_set(layer_state | state);
+}
 /** \brief Layer and
  *
  * Turns on layers based on matching enabled bits between specifed layer and existing layer state
  */
-void layer_and(layer_state_t state) { layer_state_set(layer_state & state); }
+void layer_and(layer_state_t state) {
+    layer_state_set(layer_state & state);
+}
 /** \brief Layer xor
  *
  * Turns on layers based on non-matching bits between specifed layer and existing layer state
  */
-void layer_xor(layer_state_t state) { layer_state_set(layer_state ^ state); }
+void layer_xor(layer_state_t state) {
+    layer_state_set(layer_state ^ state);
+}
 
 /** \brief Layer debug printing
  *
  * Print out the hex value of the 32-bit layer state, as well as the value of the highest bit.
  */
-void layer_debug(void) { dprintf("%08lX(%u)", layer_state, get_highest_layer(layer_state)); }
+void layer_debug(void) {
+    dprintf("%08lX(%u)", layer_state, get_highest_layer(layer_state));
+}
 #endif
 
 #if !defined(NO_ACTION_LAYER) && !defined(STRICT_LAYER_RELEASE)
@@ -276,4 +314,6 @@ uint8_t layer_switch_get_layer(keypos_t key) {
  *
  * Gets action code based on key position
  */
-action_t layer_switch_get_action(keypos_t key) { return action_for_key(layer_switch_get_layer(key), key); }
+action_t layer_switch_get_action(keypos_t key) {
+    return action_for_key(layer_switch_get_layer(key), key);
+}
diff --git a/quantum/action_tapping.c b/quantum/action_tapping.c
index d2c93f85e3..6f8b4f8c56 100644
--- a/quantum/action_tapping.c
+++ b/quantum/action_tapping.c
@@ -26,7 +26,9 @@
 
 uint16_t g_tapping_term = TAPPING_TERM;
 
-__attribute__((weak)) uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) { return g_tapping_term; }
+__attribute__((weak)) uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
+    return g_tapping_term;
+}
 
 #    ifdef TAPPING_TERM_PER_KEY
 #        define WITHIN_TAPPING_TERM(e) (TIMER_DIFF_16(e.time, tapping_key.event.time) < get_tapping_term(get_record_keycode(&tapping_key, false), &tapping_key))
@@ -35,15 +37,21 @@ __attribute__((weak)) uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *r
 #    endif
 
 #    ifdef TAPPING_FORCE_HOLD_PER_KEY
-__attribute__((weak)) bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) { return false; }
+__attribute__((weak)) bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) {
+    return false;
+}
 #    endif
 
 #    ifdef PERMISSIVE_HOLD_PER_KEY
-__attribute__((weak)) bool get_permissive_hold(uint16_t keycode, keyrecord_t *record) { return false; }
+__attribute__((weak)) bool get_permissive_hold(uint16_t keycode, keyrecord_t *record) {
+    return false;
+}
 #    endif
 
 #    ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY
-__attribute__((weak)) bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { return false; }
+__attribute__((weak)) bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
+    return false;
+}
 #    endif
 
 #    if defined(AUTO_SHIFT_ENABLE) && defined(RETRO_SHIFT)
@@ -124,7 +132,7 @@ bool process_tapping(keyrecord_t *keyp) {
 #    if defined(AUTO_SHIFT_ENABLE) && defined(RETRO_SHIFT)
             || (
 #        ifdef RETRO_TAPPING_PER_KEY
-                get_retro_tapping(tapping_keycode, keyp) &&
+                get_retro_tapping(tapping_keycode, &tapping_key) &&
 #        endif
                 (RETRO_SHIFT + 0) != 0 && TIMER_DIFF_16(event.time, tapping_key.event.time) < (RETRO_SHIFT + 0)
             )
@@ -158,7 +166,7 @@ bool process_tapping(keyrecord_t *keyp) {
                         (
                             (
 #        ifdef TAPPING_TERM_PER_KEY
-                                get_tapping_term(tapping_keycode, keyp)
+                                get_tapping_term(tapping_keycode, &tapping_key)
 #        else
                                 g_tapping_term
 #        endif
@@ -166,7 +174,7 @@ bool process_tapping(keyrecord_t *keyp) {
                             )
 
 #        ifdef PERMISSIVE_HOLD_PER_KEY
-                            || get_permissive_hold(tapping_keycode, keyp)
+                            || get_permissive_hold(tapping_keycode, &tapping_key)
 #        elif defined(PERMISSIVE_HOLD)
                             || true
 #        endif
@@ -177,7 +185,7 @@ bool process_tapping(keyrecord_t *keyp) {
 #        if defined(AUTO_SHIFT_ENABLE) && defined(RETRO_SHIFT)
                     || (
 #            ifdef RETRO_TAPPING_PER_KEY
-                        get_retro_tapping(tapping_keycode, keyp) &&
+                        get_retro_tapping(tapping_keycode, &tapping_key) &&
 #            endif
                         (
                             // Rolled over the two keys.
@@ -188,7 +196,7 @@ bool process_tapping(keyrecord_t *keyp) {
                                     || (
                                         IS_LT(tapping_keycode)
 #                ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY
-                                        && get_hold_on_other_key_press(tapping_keycode, keyp)
+                                        && get_hold_on_other_key_press(tapping_keycode, &tapping_key)
 #                endif
                                     )
 #            endif
@@ -196,7 +204,7 @@ bool process_tapping(keyrecord_t *keyp) {
                                     || (
                                         IS_MT(tapping_keycode)
 #                ifdef IGNORE_MOD_TAP_INTERRUPT_PER_KEY
-                                        && !get_ignore_mod_tap_interrupt(tapping_keycode, keyp)
+                                        && !get_ignore_mod_tap_interrupt(tapping_keycode, &tapping_key)
 #                endif
                                     )
 #            endif
@@ -252,7 +260,7 @@ bool process_tapping(keyrecord_t *keyp) {
                         tapping_key.tap.interrupted = true;
 #    if defined(HOLD_ON_OTHER_KEY_PRESS) || defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY)
 #        if defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY)
-                        if (get_hold_on_other_key_press(tapping_keycode, keyp))
+                        if (get_hold_on_other_key_press(tapping_keycode, &tapping_key))
 #        endif
                         {
                             debug("Tapping: End. No tap. Interfered by pressed key\n");
@@ -360,7 +368,7 @@ bool process_tapping(keyrecord_t *keyp) {
 #    if defined(AUTO_SHIFT_ENABLE) && defined(RETRO_SHIFT)
             || (
 #        ifdef RETRO_TAPPING_PER_KEY
-                get_retro_tapping(tapping_keycode, keyp) &&
+                get_retro_tapping(tapping_keycode, &tapping_key) &&
 #        endif
                 (RETRO_SHIFT + 0) != 0 && TIMER_DIFF_16(event.time, tapping_key.event.time) < (RETRO_SHIFT + 0)
             )
@@ -373,7 +381,7 @@ bool process_tapping(keyrecord_t *keyp) {
 #    if !defined(TAPPING_FORCE_HOLD) || defined(TAPPING_FORCE_HOLD_PER_KEY)
                     if (
 #        ifdef TAPPING_FORCE_HOLD_PER_KEY
-                        !get_tapping_force_hold(tapping_keycode, keyp) &&
+                        !get_tapping_force_hold(tapping_keycode, &tapping_key) &&
 #        endif
                         !tapping_key.tap.interrupted && tapping_key.tap.count > 0) {
                         // sequential tap.
diff --git a/quantum/action_util.c b/quantum/action_util.c
index 9eb2a6d30d..64a1b6b30d 100644
--- a/quantum/action_util.c
+++ b/quantum/action_util.c
@@ -43,8 +43,10 @@ extern inline void clear_keys(void);
 #ifndef NO_ACTION_ONESHOT
 static uint8_t oneshot_mods        = 0;
 static uint8_t oneshot_locked_mods = 0;
-uint8_t        get_oneshot_locked_mods(void) { return oneshot_locked_mods; }
-void           set_oneshot_locked_mods(uint8_t mods) {
+uint8_t        get_oneshot_locked_mods(void) {
+    return oneshot_locked_mods;
+}
+void set_oneshot_locked_mods(uint8_t mods) {
     if (mods != oneshot_locked_mods) {
         oneshot_locked_mods = mods;
         oneshot_locked_mods_changed_kb(oneshot_locked_mods);
@@ -58,9 +60,13 @@ void clear_oneshot_locked_mods(void) {
 }
 #    if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
 static uint16_t oneshot_time = 0;
-bool            has_oneshot_mods_timed_out(void) { return TIMER_DIFF_16(timer_read(), oneshot_time) >= ONESHOT_TIMEOUT; }
+bool            has_oneshot_mods_timed_out(void) {
+    return TIMER_DIFF_16(timer_read(), oneshot_time) >= ONESHOT_TIMEOUT;
+}
 #    else
-bool has_oneshot_mods_timed_out(void) { return false; }
+bool has_oneshot_mods_timed_out(void) {
+    return false;
+}
 #    endif
 #endif
 
@@ -74,24 +80,32 @@ bool has_oneshot_mods_timed_out(void) { return false; }
  */
 static int8_t oneshot_layer_data = 0;
 
-inline uint8_t get_oneshot_layer(void) { return oneshot_layer_data >> 3; }
-inline uint8_t get_oneshot_layer_state(void) { return oneshot_layer_data & 0b111; }
+inline uint8_t get_oneshot_layer(void) {
+    return oneshot_layer_data >> 3;
+}
+inline uint8_t get_oneshot_layer_state(void) {
+    return oneshot_layer_data & 0b111;
+}
 
 #    ifdef SWAP_HANDS_ENABLE
 enum {
     SHO_OFF,
-    SHO_ACTIVE,   // Swap hands button was pressed, and we didn't send any swapped keys yet
-    SHO_PRESSED,  // Swap hands button is currently pressed
-    SHO_USED,     // Swap hands button is still pressed, and we already sent swapped keys
+    SHO_ACTIVE,  // Swap hands button was pressed, and we didn't send any swapped keys yet
+    SHO_PRESSED, // Swap hands button is currently pressed
+    SHO_USED,    // Swap hands button is still pressed, and we already sent swapped keys
 } swap_hands_oneshot = SHO_OFF;
 #    endif
 
 #    if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
 static uint16_t oneshot_layer_time = 0;
-inline bool     has_oneshot_layer_timed_out() { return TIMER_DIFF_16(timer_read(), oneshot_layer_time) >= ONESHOT_TIMEOUT && !(get_oneshot_layer_state() & ONESHOT_TOGGLED); }
+inline bool     has_oneshot_layer_timed_out() {
+    return TIMER_DIFF_16(timer_read(), oneshot_layer_time) >= ONESHOT_TIMEOUT && !(get_oneshot_layer_state() & ONESHOT_TOGGLED);
+}
 #        ifdef SWAP_HANDS_ENABLE
 static uint16_t oneshot_swaphands_time = 0;
-inline bool     has_oneshot_swaphands_timed_out() { return TIMER_DIFF_16(timer_read(), oneshot_swaphands_time) >= ONESHOT_TIMEOUT && (swap_hands_oneshot == SHO_ACTIVE); }
+inline bool     has_oneshot_swaphands_timed_out() {
+    return TIMER_DIFF_16(timer_read(), oneshot_swaphands_time) >= ONESHOT_TIMEOUT && (swap_hands_oneshot == SHO_ACTIVE);
+}
 #        endif
 #    endif
 
@@ -179,7 +193,9 @@ void clear_oneshot_layer_state(oneshot_fullfillment_t state) {
  *
  * FIXME: needs doc
  */
-bool is_oneshot_layer_active(void) { return get_oneshot_layer_state(); }
+bool is_oneshot_layer_active(void) {
+    return get_oneshot_layer_state();
+}
 
 /** \brief set oneshot
  *
@@ -198,21 +214,29 @@ void oneshot_set(bool active) {
  *
  * FIXME: needs doc
  */
-void oneshot_toggle(void) { oneshot_set(!keymap_config.oneshot_disable); }
+void oneshot_toggle(void) {
+    oneshot_set(!keymap_config.oneshot_disable);
+}
 
 /** \brief enable oneshot
  *
  * FIXME: needs doc
  */
-void oneshot_enable(void) { oneshot_set(true); }
+void oneshot_enable(void) {
+    oneshot_set(true);
+}
 
 /** \brief disable oneshot
  *
  * FIXME: needs doc
  */
-void oneshot_disable(void) { oneshot_set(false); }
+void oneshot_disable(void) {
+    oneshot_set(false);
+}
 
-bool is_oneshot_enabled(void) { return keymap_config.oneshot_disable; }
+bool is_oneshot_enabled(void) {
+    return keymap_config.oneshot_disable;
+}
 
 #endif
 
@@ -259,68 +283,96 @@ void send_keyboard_report(void) {
  *
  * FIXME: needs doc
  */
-uint8_t get_mods(void) { return real_mods; }
+uint8_t get_mods(void) {
+    return real_mods;
+}
 /** \brief add mods
  *
  * FIXME: needs doc
  */
-void add_mods(uint8_t mods) { real_mods |= mods; }
+void add_mods(uint8_t mods) {
+    real_mods |= mods;
+}
 /** \brief del mods
  *
  * FIXME: needs doc
  */
-void del_mods(uint8_t mods) { real_mods &= ~mods; }
+void del_mods(uint8_t mods) {
+    real_mods &= ~mods;
+}
 /** \brief set mods
  *
  * FIXME: needs doc
  */
-void set_mods(uint8_t mods) { real_mods = mods; }
+void set_mods(uint8_t mods) {
+    real_mods = mods;
+}
 /** \brief clear mods
  *
  * FIXME: needs doc
  */
-void clear_mods(void) { real_mods = 0; }
+void clear_mods(void) {
+    real_mods = 0;
+}
 
 /** \brief get weak mods
  *
  * FIXME: needs doc
  */
-uint8_t get_weak_mods(void) { return weak_mods; }
+uint8_t get_weak_mods(void) {
+    return weak_mods;
+}
 /** \brief add weak mods
  *
  * FIXME: needs doc
  */
-void add_weak_mods(uint8_t mods) { weak_mods |= mods; }
+void add_weak_mods(uint8_t mods) {
+    weak_mods |= mods;
+}
 /** \brief del weak mods
  *
  * FIXME: needs doc
  */
-void del_weak_mods(uint8_t mods) { weak_mods &= ~mods; }
+void del_weak_mods(uint8_t mods) {
+    weak_mods &= ~mods;
+}
 /** \brief set weak mods
  *
  * FIXME: needs doc
  */
-void set_weak_mods(uint8_t mods) { weak_mods = mods; }
+void set_weak_mods(uint8_t mods) {
+    weak_mods = mods;
+}
 /** \brief clear weak mods
  *
  * FIXME: needs doc
  */
-void clear_weak_mods(void) { weak_mods = 0; }
+void clear_weak_mods(void) {
+    weak_mods = 0;
+}
 
 #ifdef KEY_OVERRIDE_ENABLE
 /** \brief set weak mods used by key overrides. DO not call this manually
  */
-void set_weak_override_mods(uint8_t mods) { weak_override_mods = mods; }
+void set_weak_override_mods(uint8_t mods) {
+    weak_override_mods = mods;
+}
 /** \brief clear weak mods used by key overrides. DO not call this manually
  */
-void clear_weak_override_mods(void) { weak_override_mods = 0; }
+void clear_weak_override_mods(void) {
+    weak_override_mods = 0;
+}
 
 /** \brief set suppressed mods used by key overrides. DO not call this manually
  */
-void set_suppressed_override_mods(uint8_t mods) { suppressed_mods = mods; }
+void set_suppressed_override_mods(uint8_t mods) {
+    suppressed_mods = mods;
+}
 /** \brief clear suppressed mods used by key overrides. DO not call this manually
  */
-void clear_suppressed_override_mods(void) { suppressed_mods = 0; }
+void clear_suppressed_override_mods(void) {
+    suppressed_mods = 0;
+}
 #endif
 
 #ifndef NO_ACTION_ONESHOT
@@ -328,7 +380,9 @@ void clear_suppressed_override_mods(void) { suppressed_mods = 0; }
  *
  * FIXME: needs doc
  */
-uint8_t get_oneshot_mods(void) { return oneshot_mods; }
+uint8_t get_oneshot_mods(void) {
+    return oneshot_mods;
+}
 
 void add_oneshot_mods(uint8_t mods) {
     if ((oneshot_mods & mods) != mods) {
@@ -391,7 +445,9 @@ __attribute__((weak)) void oneshot_locked_mods_changed_user(uint8_t mods) {}
  *
  * \param mods Contains the active modifiers active after the change.
  */
-__attribute__((weak)) void oneshot_locked_mods_changed_kb(uint8_t mods) { oneshot_locked_mods_changed_user(mods); }
+__attribute__((weak)) void oneshot_locked_mods_changed_kb(uint8_t mods) {
+    oneshot_locked_mods_changed_user(mods);
+}
 
 /** \brief Called when the one shot modifiers have been changed.
  *
@@ -403,7 +459,9 @@ __attribute__((weak)) void oneshot_mods_changed_user(uint8_t mods) {}
  *
  * \param mods Contains the active modifiers active after the change.
  */
-__attribute__((weak)) void oneshot_mods_changed_kb(uint8_t mods) { oneshot_mods_changed_user(mods); }
+__attribute__((weak)) void oneshot_mods_changed_kb(uint8_t mods) {
+    oneshot_mods_changed_user(mods);
+}
 
 /** \brief Called when the one shot layers have been changed.
  *
@@ -415,10 +473,14 @@ __attribute__((weak)) void oneshot_layer_changed_user(uint8_t layer) {}
  *
  * \param layer Contains the layer that is toggled on, or zero when toggled off.
  */
-__attribute__((weak)) void oneshot_layer_changed_kb(uint8_t layer) { oneshot_layer_changed_user(layer); }
+__attribute__((weak)) void oneshot_layer_changed_kb(uint8_t layer) {
+    oneshot_layer_changed_user(layer);
+}
 
 /** \brief inspect keyboard state
  *
  * FIXME: needs doc
  */
-uint8_t has_anymod(void) { return bitpop(real_mods); }
+uint8_t has_anymod(void) {
+    return bitpop(real_mods);
+}
diff --git a/quantum/action_util.h b/quantum/action_util.h
index bfd0a6cf95..6f1f09c4bd 100644
--- a/quantum/action_util.h
+++ b/quantum/action_util.h
@@ -29,11 +29,17 @@ extern report_keyboard_t *keyboard_report;
 void send_keyboard_report(void);
 
 /* key */
-inline void add_key(uint8_t key) { add_key_to_report(keyboard_report, key); }
+inline void add_key(uint8_t key) {
+    add_key_to_report(keyboard_report, key);
+}
 
-inline void del_key(uint8_t key) { del_key_from_report(keyboard_report, key); }
+inline void del_key(uint8_t key) {
+    del_key_from_report(keyboard_report, key);
+}
 
-inline void clear_keys(void) { clear_keys_from_report(keyboard_report); }
+inline void clear_keys(void) {
+    clear_keys_from_report(keyboard_report);
+}
 
 /* modifier */
 uint8_t get_mods(void);
diff --git a/quantum/audio/audio.c b/quantum/audio/audio.c
index b3d6389dd5..c6523b908c 100644
--- a/quantum/audio/audio.c
+++ b/quantum/audio/audio.c
@@ -64,21 +64,21 @@
 #ifndef AUDIO_TONE_STACKSIZE
 #    define AUDIO_TONE_STACKSIZE 8
 #endif
-uint8_t        active_tones = 0;             // number of tones pushed onto the stack by audio_play_tone - might be more than the hardware is able to reproduce at any single time
-musical_tone_t tones[AUDIO_TONE_STACKSIZE];  // stack of currently active tones
+uint8_t        active_tones = 0;            // number of tones pushed onto the stack by audio_play_tone - might be more than the hardware is able to reproduce at any single time
+musical_tone_t tones[AUDIO_TONE_STACKSIZE]; // stack of currently active tones
 
-bool playing_melody = false;  // playing a SONG?
-bool playing_note   = false;  // or (possibly multiple simultaneous) tones
-bool state_changed  = false;  // global flag, which is set if anything changes with the active_tones
+bool playing_melody = false; // playing a SONG?
+bool playing_note   = false; // or (possibly multiple simultaneous) tones
+bool state_changed  = false; // global flag, which is set if anything changes with the active_tones
 
 // melody/SONG related state variables
-float (*notes_pointer)[][2];                            // SONG, an array of MUSICAL_NOTEs
-uint16_t notes_count;                                   // length of the notes_pointer array
-bool     notes_repeat;                                  // PLAY_SONG or PLAY_LOOP?
-uint16_t melody_current_note_duration = 0;              // duration of the currently playing note from the active melody, in ms
-uint8_t  note_tempo                   = TEMPO_DEFAULT;  // beats-per-minute
-uint16_t current_note                 = 0;              // index into the array at notes_pointer
-bool     note_resting                 = false;          // if a short pause was introduced between two notes with the same frequency while playing a melody
+float (*notes_pointer)[][2];                           // SONG, an array of MUSICAL_NOTEs
+uint16_t notes_count;                                  // length of the notes_pointer array
+bool     notes_repeat;                                 // PLAY_SONG or PLAY_LOOP?
+uint16_t melody_current_note_duration = 0;             // duration of the currently playing note from the active melody, in ms
+uint8_t  note_tempo                   = TEMPO_DEFAULT; // beats-per-minute
+uint16_t current_note                 = 0;             // index into the array at notes_pointer
+bool     note_resting                 = false;         // if a short pause was introduced between two notes with the same frequency while playing a melody
 uint16_t last_timestamp               = 0;
 
 #ifdef AUDIO_ENABLE_TONE_MULTIPLEXING
@@ -86,7 +86,7 @@ uint16_t last_timestamp               = 0;
 #        define AUDIO_MAX_SIMULTANEOUS_TONES 3
 #    endif
 uint16_t tone_multiplexing_rate        = AUDIO_TONE_MULTIPLEXING_RATE_DEFAULT;
-uint8_t  tone_multiplexing_index_shift = 0;  // offset used on active-tone array access
+uint8_t  tone_multiplexing_index_shift = 0; // offset used on active-tone array access
 #endif
 
 // provided and used by voices.c
@@ -123,12 +123,12 @@ void audio_init() {
         eeconfig_init();
     }
     audio_config.raw = eeconfig_read_audio();
-#else  // EEPROM settings
+#else // EEPROM settings
     audio_config.enable        = true;
 #    ifdef AUDIO_CLICKY_ON
     audio_config.clicky_enable = true;
 #    endif
-#endif  // EEPROM settings
+#endif // EEPROM settings
 
     for (uint8_t i = 0; i < AUDIO_TONE_STACKSIZE; i++) {
         tones[i] = (musical_tone_t){.time_started = 0, .pitch = -1.0f, .duration = 0};
@@ -181,7 +181,9 @@ void audio_off(void) {
     eeconfig_update_audio(audio_config.raw);
 }
 
-bool audio_is_on(void) { return (audio_config.enable != 0); }
+bool audio_is_on(void) {
+    return (audio_config.enable != 0);
+}
 
 void audio_stop_all() {
     if (audio_driver_stopped) {
@@ -268,7 +270,7 @@ void audio_play_note(float pitch, uint16_t duration) {
                 tones[j]     = tones[j + 1];
                 tones[j + 1] = (musical_tone_t){.time_started = timer_read(), .pitch = pitch, .duration = duration};
             }
-            return;  // since this frequency played already, the hardware was already started
+            return; // since this frequency played already, the hardware was already started
         }
     }
 
@@ -286,7 +288,7 @@ void audio_play_note(float pitch, uint16_t duration) {
     tones[active_tones - 1] = (musical_tone_t){.time_started = timer_read(), .pitch = pitch, .duration = duration};
 
     // TODO: needs to be handled per note/tone -> use its timestamp instead?
-    voices_timer = timer_read();  // reset to zero, for the effects added by voices.c
+    voices_timer = timer_read(); // reset to zero, for the effects added by voices.c
 
     if (audio_driver_stopped) {
         audio_driver_start();
@@ -294,7 +296,9 @@ void audio_play_note(float pitch, uint16_t duration) {
     }
 }
 
-void audio_play_tone(float pitch) { audio_play_note(pitch, 0xffff); }
+void audio_play_tone(float pitch) {
+    audio_play_note(pitch, 0xffff);
+}
 
 void audio_play_melody(float (*np)[][2], uint16_t n_count, bool n_repeat) {
     if (!audio_config.enable) {
@@ -316,7 +320,7 @@ void audio_play_melody(float (*np)[][2], uint16_t n_count, bool n_repeat) {
     notes_count   = n_count;
     notes_repeat  = n_repeat;
 
-    current_note = 0;  // note in the melody-array/list at note_pointer
+    current_note = 0; // note in the melody-array/list at note_pointer
 
     // start first note manually, which also starts the audio_driver
     // all following/remaining notes are played by 'audio_update_state'
@@ -347,11 +351,17 @@ void  audio_play_click(uint16_t delay, float pitch, uint16_t duration) {
     }
 }
 
-bool audio_is_playing_note(void) { return playing_note; }
+bool audio_is_playing_note(void) {
+    return playing_note;
+}
 
-bool audio_is_playing_melody(void) { return playing_melody; }
+bool audio_is_playing_melody(void) {
+    return playing_melody;
+}
 
-uint8_t audio_get_number_of_active_tones(void) { return active_tones; }
+uint8_t audio_get_number_of_active_tones(void) {
+    return active_tones;
+}
 
 float audio_get_frequency(uint8_t tone_index) {
     if (tone_index >= active_tones) {
@@ -370,7 +380,7 @@ float audio_get_processed_frequency(uint8_t tone_index) {
 
 #ifdef AUDIO_ENABLE_TONE_MULTIPLEXING
     index = index - tone_multiplexing_index_shift;
-    if (index < 0)  // wrap around
+    if (index < 0) // wrap around
         index += active_tones;
 #endif
 
@@ -396,7 +406,7 @@ bool audio_update_state(void) {
             last_timestamp         = current_time;
             uint16_t previous_note = current_note;
             current_note++;
-            voices_timer = timer_read();  // reset to zero, for the effects added by voices.c
+            voices_timer = timer_read(); // reset to zero, for the effects added by voices.c
 
             if (current_note >= notes_count) {
                 if (notes_repeat) {
@@ -466,11 +476,11 @@ bool audio_update_state(void) {
 
         // housekeeping: stop notes that have no playtime left
         for (int i = 0; i < active_tones; i++) {
-            if ((tones[i].duration != 0xffff)  // indefinitely playing notes, started by 'audio_play_tone'
-                && (tones[i].duration != 0)    // 'uninitialized'
+            if ((tones[i].duration != 0xffff) // indefinitely playing notes, started by 'audio_play_tone'
+                && (tones[i].duration != 0)   // 'uninitialized'
             ) {
                 if (timer_elapsed(tones[i].time_started) >= tones[i].duration) {
-                    audio_stop_tone(tones[i].pitch);  // also sets 'state_changed=true'
+                    audio_stop_tone(tones[i].pitch); // also sets 'state_changed=true'
                 }
             }
         }
@@ -487,9 +497,15 @@ bool audio_update_state(void) {
 
 // Tone-multiplexing functions
 #ifdef AUDIO_ENABLE_TONE_MULTIPLEXING
-void audio_set_tone_multiplexing_rate(uint16_t rate) { tone_multiplexing_rate = rate; }
-void audio_enable_tone_multiplexing(void) { tone_multiplexing_rate = AUDIO_TONE_MULTIPLEXING_RATE_DEFAULT; }
-void audio_disable_tone_multiplexing(void) { tone_multiplexing_rate = 0; }
+void audio_set_tone_multiplexing_rate(uint16_t rate) {
+    tone_multiplexing_rate = rate;
+}
+void audio_enable_tone_multiplexing(void) {
+    tone_multiplexing_rate = AUDIO_TONE_MULTIPLEXING_RATE_DEFAULT;
+}
+void audio_disable_tone_multiplexing(void) {
+    tone_multiplexing_rate = 0;
+}
 void audio_increase_tone_multiplexing_rate(uint16_t change) {
     if ((0xffff - change) > tone_multiplexing_rate) {
         tone_multiplexing_rate += change;
diff --git a/quantum/audio/audio.h b/quantum/audio/audio.h
index 290d461f5a..fe23cf3ed1 100644
--- a/quantum/audio/audio.h
+++ b/quantum/audio/audio.h
@@ -54,9 +54,9 @@ typedef union {
  * "A musical tone is characterized by its duration, pitch, intensity (or loudness), and timbre (or quality)"
  */
 typedef struct {
-    uint16_t time_started;  // timestamp the tone/note was started, system time runs with 1ms resolution -> 16bit timer overflows every ~64 seconds, long enough under normal circumstances; but might be too soon for long-duration notes when the note_tempo is set to a very low value
-    float    pitch;         // aka frequency, in Hz
-    uint16_t duration;      // in ms, converted from the musical_notes.h unit which has 64parts to a beat, factoring in the current tempo in beats-per-minute
+    uint16_t time_started; // timestamp the tone/note was started, system time runs with 1ms resolution -> 16bit timer overflows every ~64 seconds, long enough under normal circumstances; but might be too soon for long-duration notes when the note_tempo is set to a very low value
+    float    pitch;        // aka frequency, in Hz
+    uint16_t duration;     // in ms, converted from the musical_notes.h unit which has 64parts to a beat, factoring in the current tempo in beats-per-minute
     // float intensity;    // aka volume [0,1] TODO: not used at the moment; pwm drivers can't handle it
     // uint8_t timbre;     // range: [0,100] TODO: this currently kept track of globally, should we do this per tone instead?
 } musical_tone_t;
diff --git a/quantum/audio/song_list.h b/quantum/audio/song_list.h
index 8e80a016aa..3e425abb47 100644
--- a/quantum/audio/song_list.h
+++ b/quantum/audio/song_list.h
@@ -22,7 +22,7 @@
 
 #if __has_include("user_song_list.h")
 #    include "user_song_list.h"
-#endif  // if file exists
+#endif // if file exists
 
 #define NO_SOUND
 
diff --git a/quantum/audio/voices.c b/quantum/audio/voices.c
index 8988d827e9..1c08a3af36 100644
--- a/quantum/audio/voices.c
+++ b/quantum/audio/voices.c
@@ -32,11 +32,17 @@ voice_type voice = AUDIO_VOICE_DEFAULT;
 voice_type voice = default_voice;
 #endif
 
-void set_voice(voice_type v) { voice = v; }
+void set_voice(voice_type v) {
+    voice = v;
+}
 
-void voice_iterate() { voice = (voice + 1) % number_of_voices; }
+void voice_iterate() {
+    voice = (voice + 1) % number_of_voices;
+}
 
-void voice_deiterate() { voice = (voice - 1 + number_of_voices) % number_of_voices; }
+void voice_deiterate() {
+    voice = (voice - 1 + number_of_voices) % number_of_voices;
+}
 
 #ifdef AUDIO_VOICES
 float mod(float a, int b) {
@@ -67,8 +73,8 @@ float voice_envelope(float frequency) {
     // envelope_index ranges from 0 to 0xFFFF, which is preserved at 880.0 Hz
 //    __attribute__((unused)) uint16_t compensated_index = (uint16_t)((float)envelope_index * (880.0 / frequency));
 #ifdef AUDIO_VOICES
-    uint16_t envelope_index    = timer_elapsed(voices_timer);  // TODO: multiply in some factor?
-    uint16_t compensated_index = envelope_index / 100;         // TODO: correct factor would be?
+    uint16_t envelope_index    = timer_elapsed(voices_timer); // TODO: multiply in some factor?
+    uint16_t compensated_index = envelope_index / 100;        // TODO: correct factor would be?
 #endif
 
     switch (voice) {
@@ -303,7 +309,7 @@ float voice_envelope(float frequency) {
             //         note_timbre = TIMBRE_25;
             //     break;
 
-#endif  // AUDIO_VOICES
+#endif // AUDIO_VOICES
 
         default:
             break;
@@ -318,19 +324,31 @@ float voice_envelope(float frequency) {
         // TODO: where to keep track of the start-frequency?
         // frequency = voice_add_glissando(??, frequency);
     }
-#endif  // AUDIO_VOICES
+#endif // AUDIO_VOICES
 
     return frequency;
 }
 
 // Vibrato functions
 
-void voice_set_vibrato_rate(float rate) { vibrato_rate = rate; }
-void voice_increase_vibrato_rate(float change) { vibrato_rate *= change; }
-void voice_decrease_vibrato_rate(float change) { vibrato_rate /= change; }
-void voice_set_vibrato_strength(float strength) { vibrato_strength = strength; }
-void voice_increase_vibrato_strength(float change) { vibrato_strength *= change; }
-void voice_decrease_vibrato_strength(float change) { vibrato_strength /= change; }
+void voice_set_vibrato_rate(float rate) {
+    vibrato_rate = rate;
+}
+void voice_increase_vibrato_rate(float change) {
+    vibrato_rate *= change;
+}
+void voice_decrease_vibrato_rate(float change) {
+    vibrato_rate /= change;
+}
+void voice_set_vibrato_strength(float strength) {
+    vibrato_strength = strength;
+}
+void voice_increase_vibrato_strength(float change) {
+    vibrato_strength *= change;
+}
+void voice_decrease_vibrato_strength(float change) {
+    vibrato_strength /= change;
+}
 
 // Timbre functions
 
@@ -339,4 +357,6 @@ void voice_set_timbre(uint8_t timbre) {
         note_timbre = timbre;
     }
 }
-uint8_t voice_get_timbre(void) { return note_timbre; }
+uint8_t voice_get_timbre(void) {
+    return note_timbre;
+}
diff --git a/quantum/audio/voices.h b/quantum/audio/voices.h
index 1f402e7e12..fcab9db556 100644
--- a/quantum/audio/voices.h
+++ b/quantum/audio/voices.h
@@ -40,7 +40,7 @@ typedef enum {
 // duty_third_down,
 // duty_fifth_third_down,
 #endif
-    number_of_voices  // important that this is last
+    number_of_voices // important that this is last
 } voice_type;
 
 void set_voice(voice_type v);
diff --git a/quantum/backlight/backlight.c b/quantum/backlight/backlight.c
index dfb98419e6..52ec086bb0 100644
--- a/quantum/backlight/backlight.c
+++ b/quantum/backlight/backlight.c
@@ -95,10 +95,10 @@ void backlight_toggle(void) {
  * FIXME: needs doc
  */
 void backlight_enable(void) {
-    if (backlight_config.enable) return;  // do nothing if backlight is already on
+    if (backlight_config.enable) return; // do nothing if backlight is already on
 
     backlight_config.enable = true;
-    if (backlight_config.raw == 1)  // enabled but level == 0
+    if (backlight_config.raw == 1) // enabled but level == 0
         backlight_config.level = 1;
     eeconfig_update_backlight(backlight_config.raw);
     dprintf("backlight enable\n");
@@ -110,7 +110,7 @@ void backlight_enable(void) {
  * FIXME: needs doc
  */
 void backlight_disable(void) {
-    if (!backlight_config.enable) return;  // do nothing if backlight is already off
+    if (!backlight_config.enable) return; // do nothing if backlight is already off
 
     backlight_config.enable = false;
     eeconfig_update_backlight(backlight_config.raw);
@@ -122,7 +122,9 @@ void backlight_disable(void) {
  *
  * FIXME: needs doc
  */
-bool is_backlight_enabled(void) { return backlight_config.enable; }
+bool is_backlight_enabled(void) {
+    return backlight_config.enable;
+}
 
 /** \brief Backlight step through levels
  *
@@ -158,11 +160,17 @@ void backlight_level(uint8_t level) {
     eeconfig_update_backlight(backlight_config.raw);
 }
 
-uint8_t eeconfig_read_backlight(void) { return eeprom_read_byte(EECONFIG_BACKLIGHT); }
+uint8_t eeconfig_read_backlight(void) {
+    return eeprom_read_byte(EECONFIG_BACKLIGHT);
+}
 
-void eeconfig_update_backlight(uint8_t val) { eeprom_update_byte(EECONFIG_BACKLIGHT, val); }
+void eeconfig_update_backlight(uint8_t val) {
+    eeprom_update_byte(EECONFIG_BACKLIGHT, val);
+}
 
-void eeconfig_update_backlight_current(void) { eeconfig_update_backlight(backlight_config.raw); }
+void eeconfig_update_backlight_current(void) {
+    eeconfig_update_backlight(backlight_config.raw);
+}
 
 void eeconfig_update_backlight_default(void) {
     backlight_config.enable = 1;
@@ -179,7 +187,9 @@ void eeconfig_update_backlight_default(void) {
  *
  * FIXME: needs doc
  */
-uint8_t get_backlight_level(void) { return backlight_config.level; }
+uint8_t get_backlight_level(void) {
+    return backlight_config.level;
+}
 
 #ifdef BACKLIGHT_BREATHING
 /** \brief Backlight breathing toggle
@@ -200,7 +210,7 @@ void backlight_toggle_breathing(void) {
  * FIXME: needs doc
  */
 void backlight_enable_breathing(void) {
-    if (backlight_config.breathing) return;  // do nothing if breathing is already on
+    if (backlight_config.breathing) return; // do nothing if breathing is already on
 
     backlight_config.breathing = true;
     eeconfig_update_backlight(backlight_config.raw);
@@ -213,7 +223,7 @@ void backlight_enable_breathing(void) {
  * FIXME: needs doc
  */
 void backlight_disable_breathing(void) {
-    if (!backlight_config.breathing) return;  // do nothing if breathing is already off
+    if (!backlight_config.breathing) return; // do nothing if breathing is already off
 
     backlight_config.breathing = false;
     eeconfig_update_backlight(backlight_config.raw);
@@ -225,18 +235,30 @@ void backlight_disable_breathing(void) {
  *
  * FIXME: needs doc
  */
-bool is_backlight_breathing(void) { return backlight_config.breathing; }
+bool is_backlight_breathing(void) {
+    return backlight_config.breathing;
+}
 
 // following are marked as weak purely for backwards compatibility
-__attribute__((weak)) void breathing_period_set(uint8_t value) { breathing_period = value ? value : 1; }
+__attribute__((weak)) void breathing_period_set(uint8_t value) {
+    breathing_period = value ? value : 1;
+}
 
-__attribute__((weak)) uint8_t get_breathing_period(void) { return breathing_period; }
+__attribute__((weak)) uint8_t get_breathing_period(void) {
+    return breathing_period;
+}
 
-__attribute__((weak)) void breathing_period_default(void) { breathing_period_set(BREATHING_PERIOD); }
+__attribute__((weak)) void breathing_period_default(void) {
+    breathing_period_set(BREATHING_PERIOD);
+}
 
-__attribute__((weak)) void breathing_period_inc(void) { breathing_period_set(breathing_period + 1); }
+__attribute__((weak)) void breathing_period_inc(void) {
+    breathing_period_set(breathing_period + 1);
+}
 
-__attribute__((weak)) void breathing_period_dec(void) { breathing_period_set(breathing_period - 1); }
+__attribute__((weak)) void breathing_period_dec(void) {
+    breathing_period_set(breathing_period - 1);
+}
 
 __attribute__((weak)) void breathing_toggle(void) {
     if (is_breathing())
diff --git a/quantum/backlight/backlight.h b/quantum/backlight/backlight.h
index c30c70fd62..ff9c8de420 100644
--- a/quantum/backlight/backlight.h
+++ b/quantum/backlight/backlight.h
@@ -39,7 +39,7 @@ typedef union {
     struct {
         bool    enable : 1;
         bool    breathing : 1;
-        uint8_t reserved : 1;  // Reserved for possible future backlight modes
+        uint8_t reserved : 1; // Reserved for possible future backlight modes
         uint8_t level : 5;
     };
 } backlight_config_t;
diff --git a/quantum/backlight/backlight_avr.c b/quantum/backlight/backlight_avr.c
index 9c972ae02e..f3a0252270 100644
--- a/quantum/backlight/backlight_avr.c
+++ b/quantum/backlight/backlight_avr.c
@@ -136,7 +136,7 @@
 #    define TCCRxB TCCR1B
 #    define TIMERx_COMPA_vect TIMER1_COMPA_vect
 #    define TIMERx_OVF_vect TIMER1_OVF_vect
-#    if defined(__AVR_ATmega32A__)  // This MCU has only one TIMSK register
+#    if defined(__AVR_ATmega32A__) // This MCU has only one TIMSK register
 #        define TIMSKx TIMSK
 #    else
 #        define TIMSKx TIMSK1
@@ -166,7 +166,7 @@ error("Please set 'BACKLIGHT_DRIVER = custom' within rules.mk")
 error("Please set 'BACKLIGHT_DRIVER = software' within rules.mk")
 #endif
 
-#ifndef BACKLIGHT_PWM_TIMER  // pwm through software
+#ifndef BACKLIGHT_PWM_TIMER // pwm through software
 
 static inline void enable_pwm(void) {
 #    if BACKLIGHT_ON_STATE == 1
@@ -203,7 +203,9 @@ static inline void disable_pwm(void) {
 // or F_CPU/BACKLIGHT_CUSTOM_RESOLUTION if used.
 
 // Triggered when the counter reaches the OCRx value
-ISR(TIMERx_COMPA_vect) { backlight_pins_off(); }
+ISR(TIMERx_COMPA_vect) {
+    backlight_pins_off();
+}
 
 // Triggered when the counter reaches the TOP value
 // this one triggers at F_CPU/ICRx = 16MHz/65536 =~ 244 Hz
@@ -232,15 +234,15 @@ ISR(TIMERx_OVF_vect) {
 
 // See http://jared.geek.nz/2013/feb/linear-led-pwm
 static uint16_t cie_lightness(uint16_t v) {
-    if (v <= (uint32_t)ICRx / 12)  // If the value is less than or equal to ~8% of max
+    if (v <= (uint32_t)ICRx / 12) // If the value is less than or equal to ~8% of max
     {
-        return v / 9;  // Same as dividing by 900%
+        return v / 9; // Same as dividing by 900%
     } else {
         // In the next two lines values are bit-shifted. This is to avoid loosing decimals in integer math.
-        uint32_t y   = (((uint32_t)v + (uint32_t)ICRx / 6) << 5) / ((uint32_t)ICRx / 6 + ICRx);  // If above 8%, add ~16% of max, and normalize with (max + ~16% max)
-        uint32_t out = (y * y * y * ICRx) >> 15;                                                 // Cube it and undo the bit-shifting. (which is now three times as much due to the cubing)
+        uint32_t y   = (((uint32_t)v + (uint32_t)ICRx / 6) << 5) / ((uint32_t)ICRx / 6 + ICRx); // If above 8%, add ~16% of max, and normalize with (max + ~16% max)
+        uint32_t out = (y * y * y * ICRx) >> 15;                                                // Cube it and undo the bit-shifting. (which is now three times as much due to the cubing)
 
-        if (out > ICRx)  // Avoid overflows
+        if (out > ICRx) // Avoid overflows
         {
             out = ICRx;
         }
@@ -249,10 +251,14 @@ static uint16_t cie_lightness(uint16_t v) {
 }
 
 // rescale the supplied backlight value to be in terms of the value limit	// range for val is [0..ICRx]. PWM pin is high while the timer count is below val.
-static uint32_t rescale_limit_val(uint32_t val) { return (val * (BACKLIGHT_LIMIT_VAL + 1)) / 256; }
+static uint32_t rescale_limit_val(uint32_t val) {
+    return (val * (BACKLIGHT_LIMIT_VAL + 1)) / 256;
+}
 
 // range for val is [0..ICRx]. PWM pin is high while the timer count is below val.
-static inline void set_pwm(uint16_t val) { OCRxx = val; }
+static inline void set_pwm(uint16_t val) {
+    OCRxx = val;
+}
 
 void backlight_set(uint8_t level) {
     if (level > BACKLIGHT_LEVELS) level = BACKLIGHT_LEVELS;
@@ -303,7 +309,9 @@ static uint16_t breathing_freq_scale_factor = 2;
 #    ifdef BACKLIGHT_PWM_TIMER
 static bool breathing = false;
 
-bool is_breathing(void) { return breathing; }
+bool is_breathing(void) {
+    return breathing;
+}
 
 #        define breathing_interrupt_enable() \
             do {                             \
@@ -315,7 +323,9 @@ bool is_breathing(void) { return breathing; }
             } while (0)
 #    else
 
-bool is_breathing(void) { return !!(TIMSKx & _BV(TOIEx)); }
+bool is_breathing(void) {
+    return !!(TIMSKx & _BV(TOIEx));
+}
 
 #        define breathing_interrupt_enable() \
             do {                             \
@@ -370,7 +380,9 @@ void breathing_self_disable(void) {
 static const uint8_t breathing_table[BREATHING_STEPS] PROGMEM = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 3, 4, 5, 6, 8, 10, 12, 15, 17, 20, 24, 28, 32, 36, 41, 46, 51, 57, 63, 70, 76, 83, 91, 98, 106, 113, 121, 129, 138, 146, 154, 162, 170, 178, 185, 193, 200, 207, 213, 220, 225, 231, 235, 240, 244, 247, 250, 252, 253, 254, 255, 254, 253, 252, 250, 247, 244, 240, 235, 231, 225, 220, 213, 207, 200, 193, 185, 178, 170, 162, 154, 146, 138, 129, 121, 113, 106, 98, 91, 83, 76, 70, 63, 57, 51, 46, 41, 36, 32, 28, 24, 20, 17, 15, 12, 10, 8, 6, 5, 4, 3, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
 // Use this before the cie_lightness function.
-static inline uint16_t scale_backlight(uint16_t v) { return v / BACKLIGHT_LEVELS * get_backlight_level(); }
+static inline uint16_t scale_backlight(uint16_t v) {
+    return v / BACKLIGHT_LEVELS * get_backlight_level();
+}
 
 #    ifdef BACKLIGHT_PWM_TIMER
 void breathing_task(void)
@@ -403,7 +415,7 @@ ISR(TIMERx_OVF_vect)
     set_pwm(cie_lightness(rescale_limit_val(scale_backlight((uint16_t)pgm_read_byte(&breathing_table[index]) * ICRx / 255))));
 }
 
-#endif  // BACKLIGHT_BREATHING
+#endif // BACKLIGHT_BREATHING
 
 void backlight_init_ports(void) {
     // Setup backlight pin as output and output to on state.
@@ -415,10 +427,10 @@ void backlight_init_ports(void) {
 
 #ifdef BACKLIGHT_PWM_TIMER
     // TimerX setup, Fast PWM mode count to TOP set in ICRx
-    TCCRxA = _BV(WGM11);  // = 0b00000010;
+    TCCRxA = _BV(WGM11); // = 0b00000010;
     // clock select clk/1
-    TCCRxB = _BV(WGM13) | _BV(WGM12) | _BV(CS10);  // = 0b00011001;
-#else                                              // hardware PWM
+    TCCRxB = _BV(WGM13) | _BV(WGM12) | _BV(CS10); // = 0b00011001;
+#else                                             // hardware PWM
     // Pin PB7 = OCR1C (Timer 1, Channel C)
     // Compare Output Mode = Clear on compare match, Channel C = COM1C1=1 COM1C0=0
     // (i.e. start high, go low when counter matches.)
@@ -430,8 +442,8 @@ void backlight_init_ports(void) {
     "In fast PWM mode, the compare units allow generation of PWM waveforms on the OCnx pins. Setting the COMnx1:0 bits to two will produce a non-inverted PWM [..]."
     "In fast PWM mode the counter is incremented until the counter value matches either one of the fixed values 0x00FF, 0x01FF, or 0x03FF (WGMn3:0 = 5, 6, or 7), the value in ICRn (WGMn3:0 = 14), or the value in OCRnA (WGMn3:0 = 15)."
     */
-    TCCRxA = _BV(COMxx1) | _BV(WGM11);             // = 0b00001010;
-    TCCRxB = _BV(WGM13) | _BV(WGM12) | _BV(CS10);  // = 0b00011001;
+    TCCRxA = _BV(COMxx1) | _BV(WGM11);            // = 0b00001010;
+    TCCRxB = _BV(WGM13) | _BV(WGM12) | _BV(CS10); // = 0b00011001;
 #endif
 
 #ifdef BACKLIGHT_CUSTOM_RESOLUTION
diff --git a/quantum/backlight/backlight_chibios.c b/quantum/backlight/backlight_chibios.c
index 7c6edd10d6..e8f9e70f78 100644
--- a/quantum/backlight/backlight_chibios.c
+++ b/quantum/backlight/backlight_chibios.c
@@ -53,14 +53,14 @@ static PWMConfig pwmCFG = {0xFFFF, /* PWM clock frequency  */
 
 // See http://jared.geek.nz/2013/feb/linear-led-pwm
 static uint16_t cie_lightness(uint16_t v) {
-    if (v <= 5243)     // if below 8% of max
-        return v / 9;  // same as dividing by 900%
+    if (v <= 5243)    // if below 8% of max
+        return v / 9; // same as dividing by 900%
     else {
-        uint32_t y = (((uint32_t)v + 10486) << 8) / (10486 + 0xFFFFUL);  // add 16% of max and compare
+        uint32_t y = (((uint32_t)v + 10486) << 8) / (10486 + 0xFFFFUL); // add 16% of max and compare
         // to get a useful result with integer division, we shift left in the expression above
         // and revert what we've done again after squaring.
         y = y * y * y >> 8;
-        if (y > 0xFFFFUL)  // prevent overflow
+        if (y > 0xFFFFUL) // prevent overflow
             return 0xFFFFU;
         else
             return (uint16_t)y;
@@ -117,7 +117,9 @@ static const uint8_t breathing_table[BREATHING_STEPS] = {0, 0, 0, 0, 0, 0, 0, 0,
 
 void breathing_callback(PWMDriver *pwmp);
 
-bool is_breathing(void) { return pwmCFG.callback != NULL; }
+bool is_breathing(void) {
+    return pwmCFG.callback != NULL;
+}
 
 void breathing_enable(void) {
     pwmCFG.callback = breathing_callback;
@@ -133,7 +135,9 @@ void breathing_disable(void) {
 }
 
 // Use this before the cie_lightness function.
-static inline uint16_t scale_backlight(uint16_t v) { return v / BACKLIGHT_LEVELS * get_backlight_level(); }
+static inline uint16_t scale_backlight(uint16_t v) {
+    return v / BACKLIGHT_LEVELS * get_backlight_level();
+}
 
 void breathing_callback(PWMDriver *pwmp) {
     uint8_t  breathing_period = get_breathing_period();
diff --git a/quantum/backlight/backlight_driver_common.c b/quantum/backlight/backlight_driver_common.c
index 270a43c67e..e4c2e90b5f 100644
--- a/quantum/backlight/backlight_driver_common.c
+++ b/quantum/backlight/backlight_driver_common.c
@@ -44,6 +44,10 @@ void backlight_pins_init(void) {
     FOR_EACH_LED(setPinOutput(backlight_pin); backlight_off(backlight_pin);)
 }
 
-void backlight_pins_on(void) { FOR_EACH_LED(backlight_on(backlight_pin);) }
+void backlight_pins_on(void) {
+    FOR_EACH_LED(backlight_on(backlight_pin);)
+}
 
-void backlight_pins_off(void) { FOR_EACH_LED(backlight_off(backlight_pin);) }
+void backlight_pins_off(void) {
+    FOR_EACH_LED(backlight_off(backlight_pin);)
+}
diff --git a/quantum/backlight/backlight_software.c b/quantum/backlight/backlight_software.c
index 709304f559..3d412cab52 100644
--- a/quantum/backlight/backlight_software.c
+++ b/quantum/backlight/backlight_software.c
@@ -30,11 +30,17 @@ static const uint16_t backlight_duty_table[] = {
 
 // clang-format on
 
-static uint8_t scale_backlight(uint8_t v) { return v * (backlight_duty_table_size - 1) / BACKLIGHT_LEVELS; }
+static uint8_t scale_backlight(uint8_t v) {
+    return v * (backlight_duty_table_size - 1) / BACKLIGHT_LEVELS;
+}
 
-void backlight_init_ports(void) { backlight_pins_init(); }
+void backlight_init_ports(void) {
+    backlight_pins_init();
+}
 
-void backlight_set(uint8_t level) { s_duty_pattern = backlight_duty_table[scale_backlight(level)]; }
+void backlight_set(uint8_t level) {
+    s_duty_pattern = backlight_duty_table[scale_backlight(level)];
+}
 
 void backlight_task(void) {
     static uint8_t backlight_tick = 0;
diff --git a/quantum/backlight/backlight_timer.c b/quantum/backlight/backlight_timer.c
index c32c35c154..82fb6a6a83 100644
--- a/quantum/backlight/backlight_timer.c
+++ b/quantum/backlight/backlight_timer.c
@@ -14,14 +14,14 @@ static uint16_t backlight_timer_get_duty(void);
 
 // See http://jared.geek.nz/2013/feb/linear-led-pwm
 static uint16_t cie_lightness(uint16_t v) {
-    if (v <= 5243)     // if below 8% of max
-        return v / 9;  // same as dividing by 900%
+    if (v <= 5243)    // if below 8% of max
+        return v / 9; // same as dividing by 900%
     else {
-        uint32_t y = (((uint32_t)v + 10486) << 8) / (10486 + 0xFFFFUL);  // add 16% of max and compare
+        uint32_t y = (((uint32_t)v + 10486) << 8) / (10486 + 0xFFFFUL); // add 16% of max and compare
         // to get a useful result with integer division, we shift left in the expression above
         // and revert what we've done again after squaring.
         y = y * y * y >> 8;
-        if (y > 0xFFFFUL)  // prevent overflow
+        if (y > 0xFFFFUL) // prevent overflow
             return 0xFFFFU;
         else
             return (uint16_t)y;
@@ -61,7 +61,9 @@ static void backlight_timer_top(void) {
     }
 }
 
-static void backlight_timer_cmp(void) { backlight_pins_off(); }
+static void backlight_timer_cmp(void) {
+    backlight_pins_off();
+}
 
 void backlight_task(void) {}
 
@@ -77,7 +79,9 @@ static uint16_t breathing_counter = 0;
 static const uint8_t breathing_table[BREATHING_STEPS] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 3, 4, 5, 6, 8, 10, 12, 15, 17, 20, 24, 28, 32, 36, 41, 46, 51, 57, 63, 70, 76, 83, 91, 98, 106, 113, 121, 129, 138, 146, 154, 162, 170, 178, 185, 193, 200, 207, 213, 220, 225, 231, 235, 240, 244, 247, 250, 252, 253, 254, 255, 254, 253, 252, 250, 247, 244, 240, 235, 231, 225, 220, 213, 207, 200, 193, 185, 178, 170, 162, 154, 146, 138, 129, 121, 113, 106, 98, 91, 83, 76, 70, 63, 57, 51, 46, 41, 36, 32, 28, 24, 20, 17, 15, 12, 10, 8, 6, 5, 4, 3, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
 // Use this before the cie_lightness function.
-static inline uint16_t scale_backlight(uint16_t v) { return v / BACKLIGHT_LEVELS * get_backlight_level(); }
+static inline uint16_t scale_backlight(uint16_t v) {
+    return v / BACKLIGHT_LEVELS * get_backlight_level();
+}
 
 void breathing_task(void) {
     uint8_t  breathing_period = get_breathing_period();
@@ -91,13 +95,17 @@ void breathing_task(void) {
     backlight_timer_set_duty(cie_lightness(scale_backlight((uint16_t)breathing_table[index] * 256)));
 }
 
-bool is_breathing(void) { return breathing; }
+bool is_breathing(void) {
+    return breathing;
+}
 
 void breathing_enable(void) {
     breathing_counter = 0;
     breathing         = true;
 }
-void breathing_disable(void) { breathing = false; }
+void breathing_disable(void) {
+    breathing = false;
+}
 
 void breathing_pulse(void) {
     backlight_set(is_backlight_enabled() ? 0 : BACKLIGHT_LEVELS);
@@ -140,8 +148,12 @@ static void timerCallback(void) {
     }
 }
 
-static void     backlight_timer_set_duty(uint16_t duty) { s_duty = duty; }
-static uint16_t backlight_timer_get_duty(void) { return s_duty; }
+static void backlight_timer_set_duty(uint16_t duty) {
+    s_duty = duty;
+}
+static uint16_t backlight_timer_get_duty(void) {
+    return s_duty;
+}
 
 // ChibiOS - Map GPT timer onto Software PWM
 static void gptTimerCallback(GPTDriver *gptp) {
diff --git a/quantum/bitwise.c b/quantum/bitwise.c
index 861cca0054..1868e14932 100644
--- a/quantum/bitwise.c
+++ b/quantum/bitwise.c
@@ -20,7 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // bit population - return number of on-bit
 __attribute__((noinline)) uint8_t bitpop(uint8_t bits) {
     uint8_t c;
-    for (c = 0; bits; c++) bits &= bits - 1;
+    for (c = 0; bits; c++)
+        bits &= bits - 1;
     return c;
     /*
         const uint8_t bit_count[] = { 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4 };
@@ -30,13 +31,15 @@ __attribute__((noinline)) uint8_t bitpop(uint8_t bits) {
 
 uint8_t bitpop16(uint16_t bits) {
     uint8_t c;
-    for (c = 0; bits; c++) bits &= bits - 1;
+    for (c = 0; bits; c++)
+        bits &= bits - 1;
     return c;
 }
 
 uint8_t bitpop32(uint32_t bits) {
     uint8_t c;
-    for (c = 0; bits; c++) bits &= bits - 1;
+    for (c = 0; bits; c++)
+        bits &= bits - 1;
     return c;
 }
 
diff --git a/quantum/bootmagic/bootmagic_lite.c b/quantum/bootmagic/bootmagic_lite.c
index 54bbf5a2ee..f63c71fc6b 100644
--- a/quantum/bootmagic/bootmagic_lite.c
+++ b/quantum/bootmagic/bootmagic_lite.c
@@ -19,7 +19,9 @@
  *
  * ...just incase someone wants to only change the eeprom behaviour
  */
-__attribute__((weak)) void bootmagic_lite_reset_eeprom(void) { eeconfig_disable(); }
+__attribute__((weak)) void bootmagic_lite_reset_eeprom(void) {
+    eeconfig_disable();
+}
 
 /** \brief The lite version of TMK's bootmagic based on Wilba.
  *
@@ -57,4 +59,6 @@ __attribute__((weak)) void bootmagic_lite(void) {
     }
 }
 
-void bootmagic(void) { bootmagic_lite(); }
+void bootmagic(void) {
+    bootmagic_lite();
+}
diff --git a/quantum/color.c b/quantum/color.c
index 1c5128e4a2..c80078dbf2 100644
--- a/quantum/color.c
+++ b/quantum/color.c
@@ -104,7 +104,9 @@ RGB hsv_to_rgb(HSV hsv) {
 #endif
 }
 
-RGB hsv_to_rgb_nocie(HSV hsv) { return hsv_to_rgb_impl(hsv, false); }
+RGB hsv_to_rgb_nocie(HSV hsv) {
+    return hsv_to_rgb_impl(hsv, false);
+}
 
 #ifdef RGBW
 #    ifndef MIN
diff --git a/quantum/command.c b/quantum/command.c
index 6d56a25ea1..f90d73207c 100644
--- a/quantum/command.c
+++ b/quantum/command.c
@@ -446,7 +446,7 @@ static bool command_common(uint8_t code) {
 
         // NKRO toggle
         case MAGIC_KC(MAGIC_KEY_NKRO):
-            clear_keyboard();  // clear to prevent stuck keys
+            clear_keyboard(); // clear to prevent stuck keys
             keymap_config.nkro = !keymap_config.nkro;
             if (keymap_config.nkro) {
                 print("NKRO: on\n");
diff --git a/quantum/debounce/sym_defer_g.c b/quantum/debounce/sym_defer_g.c
index 8cac1c37f9..47450992a4 100644
--- a/quantum/debounce/sym_defer_g.c
+++ b/quantum/debounce/sym_defer_g.c
@@ -45,6 +45,6 @@ void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool
 }
 
 void debounce_free(void) {}
-#else  // no debouncing.
+#else // no debouncing.
 #    include "none.c"
 #endif
diff --git a/quantum/debounce/sym_defer_pr.c b/quantum/debounce/sym_defer_pr.c
index 8b33acc6a2..ce24f0922f 100644
--- a/quantum/debounce/sym_defer_pr.c
+++ b/quantum/debounce/sym_defer_pr.c
@@ -69,4 +69,6 @@ void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool
     }
 }
 
-bool debounce_active(void) { return true; }
+bool debounce_active(void) {
+    return true;
+}
diff --git a/quantum/debounce/sym_eager_pk.c b/quantum/debounce/sym_eager_pk.c
index deec463649..fe3e88bb06 100644
--- a/quantum/debounce/sym_eager_pk.c
+++ b/quantum/debounce/sym_eager_pk.c
@@ -131,7 +131,7 @@ static void transfer_matrix_values(matrix_row_t raw[], matrix_row_t cooked[], ui
                 if (*debounce_pointer == DEBOUNCE_ELAPSED) {
                     *debounce_pointer    = DEBOUNCE;
                     counters_need_update = true;
-                    existing_row ^= col_mask;  // flip the bit.
+                    existing_row ^= col_mask; // flip the bit.
                 }
             }
             debounce_pointer++;
diff --git a/quantum/debounce/tests/debounce_test_common.cpp b/quantum/debounce/tests/debounce_test_common.cpp
index f9414e571d..0d5a7bb766 100644
--- a/quantum/debounce/tests/debounce_test_common.cpp
+++ b/quantum/debounce/tests/debounce_test_common.cpp
@@ -31,7 +31,9 @@ void set_time(uint32_t t);
 void advance_time(uint32_t ms);
 }
 
-void DebounceTest::addEvents(std::initializer_list<DebounceTestEvent> events) { events_.insert(events_.end(), events.begin(), events.end()); }
+void DebounceTest::addEvents(std::initializer_list<DebounceTestEvent> events) {
+    events_.insert(events_.end(), events.begin(), events.end());
+}
 
 void DebounceTest::runEvents() {
     /* Run the test multiple times, from 1kHz to 10kHz scan rate */
diff --git a/quantum/deferred_exec.c b/quantum/deferred_exec.c
index a64b451df2..a0046a9648 100644
--- a/quantum/deferred_exec.c
+++ b/quantum/deferred_exec.c
@@ -157,7 +157,15 @@ void deferred_exec_advanced_task(deferred_executor_t *table, size_t table_count,
 static uint32_t            last_deferred_exec_check                = 0;
 static deferred_executor_t basic_executors[MAX_DEFERRED_EXECUTORS] = {0};
 
-deferred_token defer_exec(uint32_t delay_ms, deferred_exec_callback callback, void *cb_arg) { return defer_exec_advanced(basic_executors, MAX_DEFERRED_EXECUTORS, delay_ms, callback, cb_arg); }
-bool           extend_deferred_exec(deferred_token token, uint32_t delay_ms) { return extend_deferred_exec_advanced(basic_executors, MAX_DEFERRED_EXECUTORS, token, delay_ms); }
-bool           cancel_deferred_exec(deferred_token token) { return cancel_deferred_exec_advanced(basic_executors, MAX_DEFERRED_EXECUTORS, token); }
-void           deferred_exec_task(void) { deferred_exec_advanced_task(basic_executors, MAX_DEFERRED_EXECUTORS, &last_deferred_exec_check); }
+deferred_token defer_exec(uint32_t delay_ms, deferred_exec_callback callback, void *cb_arg) {
+    return defer_exec_advanced(basic_executors, MAX_DEFERRED_EXECUTORS, delay_ms, callback, cb_arg);
+}
+bool extend_deferred_exec(deferred_token token, uint32_t delay_ms) {
+    return extend_deferred_exec_advanced(basic_executors, MAX_DEFERRED_EXECUTORS, token, delay_ms);
+}
+bool cancel_deferred_exec(deferred_token token) {
+    return cancel_deferred_exec_advanced(basic_executors, MAX_DEFERRED_EXECUTORS, token);
+}
+void deferred_exec_task(void) {
+    deferred_exec_advanced_task(basic_executors, MAX_DEFERRED_EXECUTORS, &last_deferred_exec_check);
+}
diff --git a/quantum/digitizer.c b/quantum/digitizer.c
index e299867429..7925129d0c 100644
--- a/quantum/digitizer.c
+++ b/quantum/digitizer.c
@@ -24,9 +24,13 @@ __attribute__((weak)) void digitizer_send(void) {
     }
 }
 
-__attribute__((weak)) void digitizer_task(void) { digitizer_send(); }
+__attribute__((weak)) void digitizer_task(void) {
+    digitizer_send();
+}
 
-digitizer_t digitizer_get_report(void) { return digitizerReport; }
+digitizer_t digitizer_get_report(void) {
+    return digitizerReport;
+}
 
 void digitizer_set_report(digitizer_t newDigitizerReport) {
     digitizerReport = newDigitizerReport;
diff --git a/quantum/dip_switch.c b/quantum/dip_switch.c
index 133ec85027..eee29aaf91 100644
--- a/quantum/dip_switch.c
+++ b/quantum/dip_switch.c
@@ -52,13 +52,21 @@ static uint16_t       scan_count;
 static bool dip_switch_state[NUMBER_OF_DIP_SWITCHES]      = {0};
 static bool last_dip_switch_state[NUMBER_OF_DIP_SWITCHES] = {0};
 
-__attribute__((weak)) bool dip_switch_update_user(uint8_t index, bool active) { return true; }
+__attribute__((weak)) bool dip_switch_update_user(uint8_t index, bool active) {
+    return true;
+}
 
-__attribute__((weak)) bool dip_switch_update_kb(uint8_t index, bool active) { return dip_switch_update_user(index, active); }
+__attribute__((weak)) bool dip_switch_update_kb(uint8_t index, bool active) {
+    return dip_switch_update_user(index, active);
+}
 
-__attribute__((weak)) bool dip_switch_update_mask_user(uint32_t state) { return true; }
+__attribute__((weak)) bool dip_switch_update_mask_user(uint32_t state) {
+    return true;
+}
 
-__attribute__((weak)) bool dip_switch_update_mask_kb(uint32_t state) { return dip_switch_update_mask_user(state); }
+__attribute__((weak)) bool dip_switch_update_mask_kb(uint32_t state) {
+    return dip_switch_update_mask_user(state);
+}
 
 void dip_switch_init(void) {
 #ifdef DIP_SWITCH_PINS
diff --git a/quantum/dynamic_keymap.c b/quantum/dynamic_keymap.c
index 8f1f39bc0f..f070375ff3 100644
--- a/quantum/dynamic_keymap.c
+++ b/quantum/dynamic_keymap.c
@@ -14,12 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "keymap.h"  // to get keymaps[][][]
+#include "keymap.h" // to get keymaps[][][]
 #include "eeprom.h"
-#include "progmem.h"  // to read default from flash
-#include "quantum.h"  // for send_string()
+#include "progmem.h" // to read default from flash
+#include "quantum.h" // for send_string()
 #include "dynamic_keymap.h"
-#include "via.h"  // for default VIA_EEPROM_ADDR_END
+#include "via.h" // for default VIA_EEPROM_ADDR_END
 
 #ifndef DYNAMIC_KEYMAP_LAYER_COUNT
 #    define DYNAMIC_KEYMAP_LAYER_COUNT 4
@@ -79,7 +79,9 @@
 #    define DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE (DYNAMIC_KEYMAP_EEPROM_MAX_ADDR - DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR + 1)
 #endif
 
-uint8_t dynamic_keymap_get_layer_count(void) { return DYNAMIC_KEYMAP_LAYER_COUNT; }
+uint8_t dynamic_keymap_get_layer_count(void) {
+    return DYNAMIC_KEYMAP_LAYER_COUNT;
+}
 
 void *dynamic_keymap_key_to_eeprom_address(uint8_t layer, uint8_t row, uint8_t column) {
     // TODO: optimize this with some left shifts
@@ -151,9 +153,13 @@ uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key) {
     }
 }
 
-uint8_t dynamic_keymap_macro_get_count(void) { return DYNAMIC_KEYMAP_MACRO_COUNT; }
+uint8_t dynamic_keymap_macro_get_count(void) {
+    return DYNAMIC_KEYMAP_MACRO_COUNT;
+}
 
-uint16_t dynamic_keymap_macro_get_buffer_size(void) { return DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE; }
+uint16_t dynamic_keymap_macro_get_buffer_size(void) {
+    return DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE;
+}
 
 void dynamic_keymap_macro_get_buffer(uint16_t offset, uint16_t size, uint8_t *data) {
     void *   source = (void *)(DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR + offset);
diff --git a/quantum/eeconfig.c b/quantum/eeconfig.c
index 4c2ad2490c..14cd5887f4 100644
--- a/quantum/eeconfig.c
+++ b/quantum/eeconfig.c
@@ -49,7 +49,7 @@ void eeconfig_init_quantum(void) {
     eeprom_update_byte(EECONFIG_KEYMAP_UPPER_BYTE, 0);
     eeprom_update_byte(EECONFIG_MOUSEKEY_ACCEL, 0);
     eeprom_update_byte(EECONFIG_BACKLIGHT, 0);
-    eeprom_update_byte(EECONFIG_AUDIO, 0xFF);  // On by default
+    eeprom_update_byte(EECONFIG_AUDIO, 0xFF); // On by default
     eeprom_update_dword(EECONFIG_RGBLIGHT, 0);
     eeprom_update_byte(EECONFIG_STENOMODE, 0);
     eeprom_update_dword(EECONFIG_HAPTIC, 0);
@@ -90,13 +90,17 @@ void eeconfig_init_quantum(void) {
  *
  * FIXME: needs doc
  */
-void eeconfig_init(void) { eeconfig_init_quantum(); }
+void eeconfig_init(void) {
+    eeconfig_init_quantum();
+}
 
 /** \brief eeconfig enable
  *
  * FIXME: needs doc
  */
-void eeconfig_enable(void) { eeprom_update_word(EECONFIG_MAGIC, EECONFIG_MAGIC_NUMBER); }
+void eeconfig_enable(void) {
+    eeprom_update_word(EECONFIG_MAGIC, EECONFIG_MAGIC_NUMBER);
+}
 
 /** \brief eeconfig disable
  *
@@ -141,29 +145,39 @@ bool eeconfig_is_disabled(void) {
  *
  * FIXME: needs doc
  */
-uint8_t eeconfig_read_debug(void) { return eeprom_read_byte(EECONFIG_DEBUG); }
+uint8_t eeconfig_read_debug(void) {
+    return eeprom_read_byte(EECONFIG_DEBUG);
+}
 /** \brief eeconfig update debug
  *
  * FIXME: needs doc
  */
-void eeconfig_update_debug(uint8_t val) { eeprom_update_byte(EECONFIG_DEBUG, val); }
+void eeconfig_update_debug(uint8_t val) {
+    eeprom_update_byte(EECONFIG_DEBUG, val);
+}
 
 /** \brief eeconfig read default layer
  *
  * FIXME: needs doc
  */
-uint8_t eeconfig_read_default_layer(void) { return eeprom_read_byte(EECONFIG_DEFAULT_LAYER); }
+uint8_t eeconfig_read_default_layer(void) {
+    return eeprom_read_byte(EECONFIG_DEFAULT_LAYER);
+}
 /** \brief eeconfig update default layer
  *
  * FIXME: needs doc
  */
-void eeconfig_update_default_layer(uint8_t val) { eeprom_update_byte(EECONFIG_DEFAULT_LAYER, val); }
+void eeconfig_update_default_layer(uint8_t val) {
+    eeprom_update_byte(EECONFIG_DEFAULT_LAYER, val);
+}
 
 /** \brief eeconfig read keymap
  *
  * FIXME: needs doc
  */
-uint16_t eeconfig_read_keymap(void) { return (eeprom_read_byte(EECONFIG_KEYMAP_LOWER_BYTE) | (eeprom_read_byte(EECONFIG_KEYMAP_UPPER_BYTE) << 8)); }
+uint16_t eeconfig_read_keymap(void) {
+    return (eeprom_read_byte(EECONFIG_KEYMAP_LOWER_BYTE) | (eeprom_read_byte(EECONFIG_KEYMAP_UPPER_BYTE) << 8));
+}
 /** \brief eeconfig update keymap
  *
  * FIXME: needs doc
@@ -177,53 +191,73 @@ void eeconfig_update_keymap(uint16_t val) {
  *
  * FIXME: needs doc
  */
-uint8_t eeconfig_read_audio(void) { return eeprom_read_byte(EECONFIG_AUDIO); }
+uint8_t eeconfig_read_audio(void) {
+    return eeprom_read_byte(EECONFIG_AUDIO);
+}
 /** \brief eeconfig update audio
  *
  * FIXME: needs doc
  */
-void eeconfig_update_audio(uint8_t val) { eeprom_update_byte(EECONFIG_AUDIO, val); }
+void eeconfig_update_audio(uint8_t val) {
+    eeprom_update_byte(EECONFIG_AUDIO, val);
+}
 
 /** \brief eeconfig read kb
  *
  * FIXME: needs doc
  */
-uint32_t eeconfig_read_kb(void) { return eeprom_read_dword(EECONFIG_KEYBOARD); }
+uint32_t eeconfig_read_kb(void) {
+    return eeprom_read_dword(EECONFIG_KEYBOARD);
+}
 /** \brief eeconfig update kb
  *
  * FIXME: needs doc
  */
-void eeconfig_update_kb(uint32_t val) { eeprom_update_dword(EECONFIG_KEYBOARD, val); }
+void eeconfig_update_kb(uint32_t val) {
+    eeprom_update_dword(EECONFIG_KEYBOARD, val);
+}
 
 /** \brief eeconfig read user
  *
  * FIXME: needs doc
  */
-uint32_t eeconfig_read_user(void) { return eeprom_read_dword(EECONFIG_USER); }
+uint32_t eeconfig_read_user(void) {
+    return eeprom_read_dword(EECONFIG_USER);
+}
 /** \brief eeconfig update user
  *
  * FIXME: needs doc
  */
-void eeconfig_update_user(uint32_t val) { eeprom_update_dword(EECONFIG_USER, val); }
+void eeconfig_update_user(uint32_t val) {
+    eeprom_update_dword(EECONFIG_USER, val);
+}
 
 /** \brief eeconfig read haptic
  *
  * FIXME: needs doc
  */
-uint32_t eeconfig_read_haptic(void) { return eeprom_read_dword(EECONFIG_HAPTIC); }
+uint32_t eeconfig_read_haptic(void) {
+    return eeprom_read_dword(EECONFIG_HAPTIC);
+}
 /** \brief eeconfig update haptic
  *
  * FIXME: needs doc
  */
-void eeconfig_update_haptic(uint32_t val) { eeprom_update_dword(EECONFIG_HAPTIC, val); }
+void eeconfig_update_haptic(uint32_t val) {
+    eeprom_update_dword(EECONFIG_HAPTIC, val);
+}
 
 /** \brief eeconfig read split handedness
  *
  * FIXME: needs doc
  */
-bool eeconfig_read_handedness(void) { return !!eeprom_read_byte(EECONFIG_HANDEDNESS); }
+bool eeconfig_read_handedness(void) {
+    return !!eeprom_read_byte(EECONFIG_HANDEDNESS);
+}
 /** \brief eeconfig update split handedness
  *
  * FIXME: needs doc
  */
-void eeconfig_update_handedness(bool val) { eeprom_update_byte(EECONFIG_HANDEDNESS, !!val); }
+void eeconfig_update_handedness(bool val) {
+    eeprom_update_byte(EECONFIG_HANDEDNESS, !!val);
+}
diff --git a/quantum/eeconfig.h b/quantum/eeconfig.h
index 22d874273c..f3cd1867ab 100644
--- a/quantum/eeconfig.h
+++ b/quantum/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)0xFEE9  // When changing, decrement this value to avoid future re-init issues
+#    define EECONFIG_MAGIC_NUMBER (uint16_t)0xFEE9 // When changing, decrement this value to avoid future re-init issues
 #endif
 #define EECONFIG_MAGIC_NUMBER_OFF (uint16_t)0xFFFF
 
@@ -112,28 +112,30 @@ void     eeconfig_update_haptic(uint32_t val);
 bool eeconfig_read_handedness(void);
 void eeconfig_update_handedness(bool val);
 
-#define EECONFIG_DEBOUNCE_HELPER(name, offset, config)                     \
-    static uint8_t dirty_##name = false;                                   \
-                                                                           \
-    static inline void eeconfig_init_##name(void) {                        \
-        eeprom_read_block(&config, offset, sizeof(config));                \
-        dirty_##name = false;                                              \
-    }                                                                      \
-    static inline void eeconfig_flush_##name(bool force) {                 \
-        if (force || dirty_##name) {                                       \
-            eeprom_update_block(&config, offset, sizeof(config));          \
-            dirty_##name = false;                                          \
-        }                                                                  \
-    }                                                                      \
-    static inline void eeconfig_flush_##name##_task(uint16_t timeout) {    \
-        static uint16_t flush_timer = 0;                                   \
-        if (timer_elapsed(flush_timer) > timeout) {                        \
-            eeconfig_flush_##name(false);                                  \
-            flush_timer = timer_read();                                    \
-        }                                                                  \
-    }                                                                      \
-    static inline void eeconfig_flag_##name(bool v) { dirty_##name |= v; } \
-    static inline void eeconfig_write_##name(typeof(config) conf) {        \
-        memcpy(&config, &conf, sizeof(config));                            \
-        eeconfig_flag_##name(true);                                        \
+#define EECONFIG_DEBOUNCE_HELPER(name, offset, config)                  \
+    static uint8_t dirty_##name = false;                                \
+                                                                        \
+    static inline void eeconfig_init_##name(void) {                     \
+        eeprom_read_block(&config, offset, sizeof(config));             \
+        dirty_##name = false;                                           \
+    }                                                                   \
+    static inline void eeconfig_flush_##name(bool force) {              \
+        if (force || dirty_##name) {                                    \
+            eeprom_update_block(&config, offset, sizeof(config));       \
+            dirty_##name = false;                                       \
+        }                                                               \
+    }                                                                   \
+    static inline void eeconfig_flush_##name##_task(uint16_t timeout) { \
+        static uint16_t flush_timer = 0;                                \
+        if (timer_elapsed(flush_timer) > timeout) {                     \
+            eeconfig_flush_##name(false);                               \
+            flush_timer = timer_read();                                 \
+        }                                                               \
+    }                                                                   \
+    static inline void eeconfig_flag_##name(bool v) {                   \
+        dirty_##name |= v;                                              \
+    }                                                                   \
+    static inline void eeconfig_write_##name(typeof(config) conf) {     \
+        memcpy(&config, &conf, sizeof(config));                         \
+        eeconfig_flag_##name(true);                                     \
     }
diff --git a/quantum/encoder.c b/quantum/encoder.c
index 8fb87281c2..59133f872a 100644
--- a/quantum/encoder.c
+++ b/quantum/encoder.c
@@ -59,9 +59,13 @@ static uint8_t thisHand, thatHand;
 static uint8_t encoder_value[NUMBER_OF_ENCODERS] = {0};
 #endif
 
-__attribute__((weak)) bool encoder_update_user(uint8_t index, bool clockwise) { return true; }
+__attribute__((weak)) bool encoder_update_user(uint8_t index, bool clockwise) {
+    return true;
+}
 
-__attribute__((weak)) bool encoder_update_kb(uint8_t index, bool clockwise) { return encoder_update_user(index, clockwise); }
+__attribute__((weak)) bool encoder_update_kb(uint8_t index, bool clockwise) {
+    return encoder_update_user(index, clockwise);
+}
 
 void encoder_init(void) {
 #if defined(SPLIT_KEYBOARD) && defined(ENCODERS_PAD_A_RIGHT) && defined(ENCODERS_PAD_B_RIGHT)
@@ -113,7 +117,7 @@ static bool encoder_update(uint8_t index, uint8_t state) {
         changed = true;
         encoder_update_kb(index, ENCODER_COUNTER_CLOCKWISE);
     }
-    if (encoder_pulses[i] <= -resolution) {  // direction is arbitrary here, but this clockwise
+    if (encoder_pulses[i] <= -resolution) { // direction is arbitrary here, but this clockwise
         encoder_value[index]--;
         changed = true;
         encoder_update_kb(index, ENCODER_CLOCKWISE);
@@ -140,7 +144,9 @@ bool encoder_read(void) {
 #ifdef SPLIT_KEYBOARD
 void last_encoder_activity_trigger(void);
 
-void encoder_state_raw(uint8_t* slave_state) { memcpy(slave_state, &encoder_value[thisHand], sizeof(uint8_t) * NUMBER_OF_ENCODERS); }
+void encoder_state_raw(uint8_t* slave_state) {
+    memcpy(slave_state, &encoder_value[thisHand], sizeof(uint8_t) * NUMBER_OF_ENCODERS);
+}
 
 void encoder_update_raw(uint8_t* slave_state) {
     bool changed = false;
diff --git a/quantum/encoder/tests/mock.c b/quantum/encoder/tests/mock.c
index d0506a938f..10a00cb8f2 100644
--- a/quantum/encoder/tests/mock.c
+++ b/quantum/encoder/tests/mock.c
@@ -26,7 +26,9 @@ uint8_t mockSetPinInputHigh(pin_t pin) {
     return 0;
 }
 
-bool mockReadPin(pin_t pin) { return pins[pin]; }
+bool mockReadPin(pin_t pin) {
+    return pins[pin];
+}
 
 bool setPin(pin_t pin, bool val) {
     pins[pin] = val;
diff --git a/quantum/encoder/tests/mock_split.c b/quantum/encoder/tests/mock_split.c
index 68bf3af599..dd3c26d958 100644
--- a/quantum/encoder/tests/mock_split.c
+++ b/quantum/encoder/tests/mock_split.c
@@ -26,7 +26,9 @@ uint8_t mockSetPinInputHigh(pin_t pin) {
     return 0;
 }
 
-bool mockReadPin(pin_t pin) { return pins[pin]; }
+bool mockReadPin(pin_t pin) {
+    return pins[pin];
+}
 
 bool setPin(pin_t pin, bool val) {
     pins[pin] = val;
diff --git a/quantum/haptic.c b/quantum/haptic.c
index f915acf946..31d1114806 100644
--- a/quantum/haptic.c
+++ b/quantum/haptic.c
@@ -247,7 +247,9 @@ void haptic_set_dwell(uint8_t dwell) {
     xprintf("haptic_config.dwell = %u\n", haptic_config.dwell);
 }
 
-uint8_t haptic_get_enable(void) { return haptic_config.enable; }
+uint8_t haptic_get_enable(void) {
+    return haptic_config.enable;
+}
 
 uint8_t haptic_get_mode(void) {
     if (!haptic_config.enable) {
diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index 6bb2800910..ba5609f0aa 100644
--- a/quantum/keyboard.c
+++ b/quantum/keyboard.c
@@ -110,18 +110,34 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 static uint32_t last_input_modification_time = 0;
-uint32_t        last_input_activity_time(void) { return last_input_modification_time; }
-uint32_t        last_input_activity_elapsed(void) { return timer_elapsed32(last_input_modification_time); }
+uint32_t        last_input_activity_time(void) {
+    return last_input_modification_time;
+}
+uint32_t last_input_activity_elapsed(void) {
+    return timer_elapsed32(last_input_modification_time);
+}
 
 static uint32_t last_matrix_modification_time = 0;
-uint32_t        last_matrix_activity_time(void) { return last_matrix_modification_time; }
-uint32_t        last_matrix_activity_elapsed(void) { return timer_elapsed32(last_matrix_modification_time); }
-void            last_matrix_activity_trigger(void) { last_matrix_modification_time = last_input_modification_time = timer_read32(); }
+uint32_t        last_matrix_activity_time(void) {
+    return last_matrix_modification_time;
+}
+uint32_t last_matrix_activity_elapsed(void) {
+    return timer_elapsed32(last_matrix_modification_time);
+}
+void last_matrix_activity_trigger(void) {
+    last_matrix_modification_time = last_input_modification_time = timer_read32();
+}
 
 static uint32_t last_encoder_modification_time = 0;
-uint32_t        last_encoder_activity_time(void) { return last_encoder_modification_time; }
-uint32_t        last_encoder_activity_elapsed(void) { return timer_elapsed32(last_encoder_modification_time); }
-void            last_encoder_activity_trigger(void) { last_encoder_modification_time = last_input_modification_time = timer_read32(); }
+uint32_t        last_encoder_activity_time(void) {
+    return last_encoder_modification_time;
+}
+uint32_t last_encoder_activity_elapsed(void) {
+    return timer_elapsed32(last_encoder_modification_time);
+}
+void last_encoder_activity_trigger(void) {
+    last_encoder_modification_time = last_input_modification_time = timer_read32();
+}
 
 // Only enable this if console is enabled to print to
 #if defined(DEBUG_MATRIX_SCAN_RATE)
@@ -143,7 +159,9 @@ void matrix_scan_perf_task(void) {
     }
 }
 
-uint32_t get_matrix_scan_rate(void) { return last_matrix_scan_count; }
+uint32_t get_matrix_scan_rate(void) {
+    return last_matrix_scan_count;
+}
 #else
 #    define matrix_scan_perf_task()
 #endif
@@ -163,7 +181,7 @@ static matrix_row_t   get_real_keys(uint8_t row, matrix_row_t rowdata) {
 }
 
 static inline bool popcount_more_than_one(matrix_row_t rowdata) {
-    rowdata &= rowdata - 1;  // if there are less than two bits (keys) set, rowdata will become zero
+    rowdata &= rowdata - 1; // if there are less than two bits (keys) set, rowdata will become zero
     return rowdata;
 }
 
@@ -220,7 +238,9 @@ __attribute__((weak)) void keyboard_pre_init_user(void) {}
  *
  * FIXME: needs doc
  */
-__attribute__((weak)) void keyboard_pre_init_kb(void) { keyboard_pre_init_user(); }
+__attribute__((weak)) void keyboard_pre_init_kb(void) {
+    keyboard_pre_init_user();
+}
 
 /** \brief keyboard_post_init_user
  *
@@ -234,7 +254,9 @@ __attribute__((weak)) void keyboard_post_init_user() {}
  * FIXME: needs doc
  */
 
-__attribute__((weak)) void keyboard_post_init_kb(void) { keyboard_post_init_user(); }
+__attribute__((weak)) void keyboard_post_init_kb(void) {
+    keyboard_post_init_user();
+}
 
 /** \brief keyboard_setup
  *
@@ -258,13 +280,17 @@ void keyboard_setup(void) {
  *
  * FIXME: needs doc
  */
-__attribute__((weak)) bool is_keyboard_master(void) { return true; }
+__attribute__((weak)) bool is_keyboard_master(void) {
+    return true;
+}
 
 /** \brief is_keyboard_left
  *
  * FIXME: needs doc
  */
-__attribute__((weak)) bool is_keyboard_left(void) { return true; }
+__attribute__((weak)) bool is_keyboard_left(void) {
+    return true;
+}
 
 #endif
 
@@ -273,7 +299,9 @@ __attribute__((weak)) bool is_keyboard_left(void) { return true; }
  * Override this function if you have a condition where keypresses processing should change:
  *   - splits where the slave side needs to process for rgb/oled functionality
  */
-__attribute__((weak)) bool should_process_keypress(void) { return is_keyboard_master(); }
+__attribute__((weak)) bool should_process_keypress(void) {
+    return is_keyboard_master();
+}
 
 /** \brief housekeeping_task_kb
  *
diff --git a/quantum/keyboard.h b/quantum/keyboard.h
index 9b0fb3cef8..e122b38264 100644
--- a/quantum/keyboard.h
+++ b/quantum/keyboard.h
@@ -44,13 +44,21 @@ typedef struct {
  * 1) (time == 0) to handle (keyevent_t){} as empty event
  * 2) Matrix(255, 255) to make TICK event available
  */
-static inline bool IS_NOEVENT(keyevent_t event) { return event.time == 0 || (event.key.row == 255 && event.key.col == 255); }
-static inline bool IS_PRESSED(keyevent_t event) { return (!IS_NOEVENT(event) && event.pressed); }
-static inline bool IS_RELEASED(keyevent_t event) { return (!IS_NOEVENT(event) && !event.pressed); }
+static inline bool IS_NOEVENT(keyevent_t event) {
+    return event.time == 0 || (event.key.row == 255 && event.key.col == 255);
+}
+static inline bool IS_PRESSED(keyevent_t event) {
+    return (!IS_NOEVENT(event) && event.pressed);
+}
+static inline bool IS_RELEASED(keyevent_t event) {
+    return (!IS_NOEVENT(event) && !event.pressed);
+}
 
 /* Tick event */
-#define TICK \
-    (keyevent_t) { .key = (keypos_t){.row = 255, .col = 255}, .pressed = false, .time = (timer_read() | 1) }
+#define TICK                                                                                    \
+    (keyevent_t) {                                                                              \
+        .key = (keypos_t){.row = 255, .col = 255}, .pressed = false, .time = (timer_read() | 1) \
+    }
 
 /* it runs once at early stage of startup before keyboard_init. */
 void keyboard_setup(void);
@@ -68,18 +76,18 @@ void keyboard_pre_init_user(void);
 void keyboard_post_init_kb(void);
 void keyboard_post_init_user(void);
 
-void housekeeping_task(void);       // To be executed by the main loop in each backend TMK protocol
-void housekeeping_task_kb(void);    // To be overridden by keyboard-level code
-void housekeeping_task_user(void);  // To be overridden by user/keymap-level code
+void housekeeping_task(void);      // To be executed by the main loop in each backend TMK protocol
+void housekeeping_task_kb(void);   // To be overridden by keyboard-level code
+void housekeeping_task_user(void); // To be overridden by user/keymap-level code
 
-uint32_t last_input_activity_time(void);     // Timestamp of the last matrix or encoder activity
-uint32_t last_input_activity_elapsed(void);  // Number of milliseconds since the last matrix or encoder activity
+uint32_t last_input_activity_time(void);    // Timestamp of the last matrix or encoder activity
+uint32_t last_input_activity_elapsed(void); // Number of milliseconds since the last matrix or encoder activity
 
-uint32_t last_matrix_activity_time(void);     // Timestamp of the last matrix activity
-uint32_t last_matrix_activity_elapsed(void);  // Number of milliseconds since the last matrix activity
+uint32_t last_matrix_activity_time(void);    // Timestamp of the last matrix activity
+uint32_t last_matrix_activity_elapsed(void); // Number of milliseconds since the last matrix activity
 
-uint32_t last_encoder_activity_time(void);     // Timestamp of the last encoder activity
-uint32_t last_encoder_activity_elapsed(void);  // Number of milliseconds since the last encoder activity
+uint32_t last_encoder_activity_time(void);    // Timestamp of the last encoder activity
+uint32_t last_encoder_activity_elapsed(void); // Number of milliseconds since the last encoder activity
 
 uint32_t get_matrix_scan_rate(void);
 
diff --git a/quantum/keycode.h b/quantum/keycode.h
index a932550635..3c80a386d1 100644
--- a/quantum/keycode.h
+++ b/quantum/keycode.h
@@ -251,7 +251,7 @@ enum hid_keyboard_keypad_usage {
     KC_J,
     KC_K,
     KC_L,
-    KC_M,  // 0x10
+    KC_M, // 0x10
     KC_N,
     KC_O,
     KC_P,
@@ -267,7 +267,7 @@ enum hid_keyboard_keypad_usage {
     KC_Z,
     KC_1,
     KC_2,
-    KC_3,  // 0x20
+    KC_3, // 0x20
     KC_4,
     KC_5,
     KC_6,
@@ -283,7 +283,7 @@ enum hid_keyboard_keypad_usage {
     KC_MINUS,
     KC_EQUAL,
     KC_LEFT_BRACKET,
-    KC_RIGHT_BRACKET,  // 0x30
+    KC_RIGHT_BRACKET, // 0x30
     KC_BACKSLASH,
     KC_NONUS_HASH,
     KC_SEMICOLON,
@@ -299,7 +299,7 @@ enum hid_keyboard_keypad_usage {
     KC_F4,
     KC_F5,
     KC_F6,
-    KC_F7,  // 0x40
+    KC_F7, // 0x40
     KC_F8,
     KC_F9,
     KC_F10,
@@ -315,7 +315,7 @@ enum hid_keyboard_keypad_usage {
     KC_END,
     KC_PAGE_DOWN,
     KC_RIGHT,
-    KC_LEFT,  // 0x50
+    KC_LEFT, // 0x50
     KC_DOWN,
     KC_UP,
     KC_NUM_LOCK,
@@ -331,7 +331,7 @@ enum hid_keyboard_keypad_usage {
     KC_KP_5,
     KC_KP_6,
     KC_KP_7,
-    KC_KP_8,  // 0x60
+    KC_KP_8, // 0x60
     KC_KP_9,
     KC_KP_0,
     KC_KP_DOT,
@@ -347,7 +347,7 @@ enum hid_keyboard_keypad_usage {
     KC_F18,
     KC_F19,
     KC_F20,
-    KC_F21,  // 0x70
+    KC_F21, // 0x70
     KC_F22,
     KC_F23,
     KC_F24,
@@ -363,7 +363,7 @@ enum hid_keyboard_keypad_usage {
     KC_PASTE,
     KC_FIND,
     KC_KB_MUTE,
-    KC_KB_VOLUME_UP,  // 0x80
+    KC_KB_VOLUME_UP, // 0x80
     KC_KB_VOLUME_DOWN,
     KC_LOCKING_CAPS_LOCK,
     KC_LOCKING_NUM_LOCK,
@@ -379,7 +379,7 @@ enum hid_keyboard_keypad_usage {
     KC_INTERNATIONAL_7,
     KC_INTERNATIONAL_8,
     KC_INTERNATIONAL_9,
-    KC_LANGUAGE_1,  // 0x90
+    KC_LANGUAGE_1, // 0x90
     KC_LANGUAGE_2,
     KC_LANGUAGE_3,
     KC_LANGUAGE_4,
@@ -395,7 +395,7 @@ enum hid_keyboard_keypad_usage {
     KC_PRIOR,
     KC_RETURN,
     KC_SEPARATOR,
-    KC_OUT,  // 0xA0
+    KC_OUT, // 0xA0
     KC_OPER,
     KC_CLEAR_AGAIN,
     KC_CRSEL,
@@ -488,7 +488,7 @@ enum internal_special_keycodes {
     KC_MEDIA_STOP,
     KC_MEDIA_PLAY_PAUSE,
     KC_MEDIA_SELECT,
-    KC_MEDIA_EJECT,  // 0xB0
+    KC_MEDIA_EJECT, // 0xB0
     KC_MAIL,
     KC_CALCULATOR,
     KC_MY_COMPUTER,
@@ -514,7 +514,7 @@ enum mouse_keys {
 #endif
     KC_MS_DOWN,
     KC_MS_LEFT,
-    KC_MS_RIGHT,  // 0xF0
+    KC_MS_RIGHT, // 0xF0
     KC_MS_BTN1,
     KC_MS_BTN2,
     KC_MS_BTN3,
@@ -539,7 +539,7 @@ enum mouse_keys {
     /* Acceleration */
     KC_MS_ACCEL0,
     KC_MS_ACCEL1,
-    KC_MS_ACCEL2  // 0xFF
+    KC_MS_ACCEL2 // 0xFF
 };
 
 #include "keycode_legacy.h"
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index cd67f71a8f..a91b2a0b36 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -77,7 +77,7 @@ action_t action_for_keycode(uint16_t keycode) {
         case QK_MODS ... QK_MODS_MAX:;
             // Has a modifier
             // Split it up
-            action.code = ACTION_MODS_KEY(keycode >> 8, keycode & 0xFF);  // adds modifier to key
+            action.code = ACTION_MODS_KEY(keycode >> 8, keycode & 0xFF); // adds modifier to key
             break;
 #ifndef NO_ACTION_LAYER
         case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
diff --git a/quantum/keymap_extras/keymap_nordic.h b/quantum/keymap_extras/keymap_nordic.h
index 76d2f4f6b0..55a58a25b0 100644
--- a/quantum/keymap_extras/keymap_nordic.h
+++ b/quantum/keymap_extras/keymap_nordic.h
@@ -24,7 +24,7 @@
 #define NO_ACUT KC_EQL
 
 #define NO_AM KC_LBRC
-#define NO_QUOT KC_RBRC  // this is the "umlaut" char on Nordic keyboards, Apple layout
+#define NO_QUOT KC_RBRC // this is the "umlaut" char on Nordic keyboards, Apple layout
 #define NO_AE KC_SCLN
 #define NO_OSLH KC_QUOT
 #define NO_APOS KC_NUHS
diff --git a/quantum/keymap_extras/keymap_steno.h b/quantum/keymap_extras/keymap_steno.h
index 310aa07409..e888ccd643 100644
--- a/quantum/keymap_extras/keymap_steno.h
+++ b/quantum/keymap_extras/keymap_steno.h
@@ -70,7 +70,7 @@ enum steno_keycodes {
     STN_NB,
     STN_NC,
     STN_ZR,
-    STN__MAX = STN_ZR,  // must be less than QK_STENO_BOLT
+    STN__MAX = STN_ZR, // must be less than QK_STENO_BOLT
 };
 
 #ifdef STENO_COMBINEDMAP
diff --git a/quantum/led.c b/quantum/led.c
index 7b3f877208..c5ddbc22c5 100644
--- a/quantum/led.c
+++ b/quantum/led.c
@@ -64,13 +64,17 @@ __attribute__((weak)) void led_set_user(uint8_t usb_led) {}
  *
  * \deprecated Use led_update_kb() instead.
  */
-__attribute__((weak)) void led_set_kb(uint8_t usb_led) { led_set_user(usb_led); }
+__attribute__((weak)) void led_set_kb(uint8_t usb_led) {
+    led_set_user(usb_led);
+}
 
 /** \brief Lock LED update callback - keymap/user level
  *
  * \return True if led_update_kb() should run its own code, false otherwise.
  */
-__attribute__((weak)) bool led_update_user(led_t led_state) { return true; }
+__attribute__((weak)) bool led_update_user(led_t led_state) {
+    return true;
+}
 
 /** \brief Lock LED update callback - keyboard level
  *
@@ -156,7 +160,9 @@ void led_suspend(void) {
 
 /** \brief Trigger behaviour on transition from suspend
  */
-void led_wakeup(void) { led_set(host_keyboard_leds()); }
+void led_wakeup(void) {
+    led_set(host_keyboard_leds());
+}
 
 /** \brief set host led state
  *
diff --git a/quantum/led_matrix/animations/alpha_mods_anim.h b/quantum/led_matrix/animations/alpha_mods_anim.h
index 4d017894a1..01acb3f933 100644
--- a/quantum/led_matrix/animations/alpha_mods_anim.h
+++ b/quantum/led_matrix/animations/alpha_mods_anim.h
@@ -20,5 +20,5 @@ bool ALPHAS_MODS(effect_params_t* params) {
     return led_matrix_check_finished_leds(led_max);
 }
 
-#    endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_LED_MATRIX_ALPHAS_MODS
+#    endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_LED_MATRIX_ALPHAS_MODS
diff --git a/quantum/led_matrix/animations/band_anim.h b/quantum/led_matrix/animations/band_anim.h
index 293be4f67a..d9491849ea 100644
--- a/quantum/led_matrix/animations/band_anim.h
+++ b/quantum/led_matrix/animations/band_anim.h
@@ -7,7 +7,9 @@ static uint8_t BAND_math(uint8_t val, uint8_t i, uint8_t time) {
     return scale8(v < 0 ? 0 : v, val);
 }
 
-bool BAND(effect_params_t* params) { return effect_runner_i(params, &BAND_math); }
+bool BAND(effect_params_t* params) {
+    return effect_runner_i(params, &BAND_math);
+}
 
-#    endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_LED_MATRIX_BAND
+#    endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_LED_MATRIX_BAND
diff --git a/quantum/led_matrix/animations/band_pinwheel_anim.h b/quantum/led_matrix/animations/band_pinwheel_anim.h
index f47a3869ce..482d183eb6 100644
--- a/quantum/led_matrix/animations/band_pinwheel_anim.h
+++ b/quantum/led_matrix/animations/band_pinwheel_anim.h
@@ -2,9 +2,13 @@
 LED_MATRIX_EFFECT(BAND_PINWHEEL)
 #    ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS
 
-static uint8_t BAND_PINWHEEL_math(uint8_t val, int16_t dx, int16_t dy, uint8_t time) { return scale8(val - time - atan2_8(dy, dx) * 3, val); }
+static uint8_t BAND_PINWHEEL_math(uint8_t val, int16_t dx, int16_t dy, uint8_t time) {
+    return scale8(val - time - atan2_8(dy, dx) * 3, val);
+}
 
-bool BAND_PINWHEEL(effect_params_t* params) { return effect_runner_dx_dy(params, &BAND_PINWHEEL_math); }
+bool BAND_PINWHEEL(effect_params_t* params) {
+    return effect_runner_dx_dy(params, &BAND_PINWHEEL_math);
+}
 
-#    endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_LED_MATRIX_BAND_PINWHEEL
+#    endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_LED_MATRIX_BAND_PINWHEEL
diff --git a/quantum/led_matrix/animations/band_spiral_anim.h b/quantum/led_matrix/animations/band_spiral_anim.h
index a4bd382181..ef93d19270 100644
--- a/quantum/led_matrix/animations/band_spiral_anim.h
+++ b/quantum/led_matrix/animations/band_spiral_anim.h
@@ -2,9 +2,13 @@
 LED_MATRIX_EFFECT(BAND_SPIRAL)
 #    ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS
 
-static uint8_t BAND_SPIRAL_math(uint8_t val, int16_t dx, int16_t dy, uint8_t dist, uint8_t time) { return scale8(val + dist - time - atan2_8(dy, dx), val); }
+static uint8_t BAND_SPIRAL_math(uint8_t val, int16_t dx, int16_t dy, uint8_t dist, uint8_t time) {
+    return scale8(val + dist - time - atan2_8(dy, dx), val);
+}
 
-bool BAND_SPIRAL(effect_params_t* params) { return effect_runner_dx_dy_dist(params, &BAND_SPIRAL_math); }
+bool BAND_SPIRAL(effect_params_t* params) {
+    return effect_runner_dx_dy_dist(params, &BAND_SPIRAL_math);
+}
 
-#    endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_LED_MATRIX_BAND_SPIRAL
+#    endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_LED_MATRIX_BAND_SPIRAL
diff --git a/quantum/led_matrix/animations/breathing_anim.h b/quantum/led_matrix/animations/breathing_anim.h
index 899925f516..0bd4cb0cc3 100644
--- a/quantum/led_matrix/animations/breathing_anim.h
+++ b/quantum/led_matrix/animations/breathing_anim.h
@@ -15,5 +15,5 @@ bool BREATHING(effect_params_t* params) {
     return led_matrix_check_finished_leds(led_max);
 }
 
-#    endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_LED_MATRIX_BREATHING
+#    endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_LED_MATRIX_BREATHING
diff --git a/quantum/led_matrix/animations/cycle_left_right_anim.h b/quantum/led_matrix/animations/cycle_left_right_anim.h
index 1a8999b831..0a339e6d62 100644
--- a/quantum/led_matrix/animations/cycle_left_right_anim.h
+++ b/quantum/led_matrix/animations/cycle_left_right_anim.h
@@ -2,9 +2,13 @@
 LED_MATRIX_EFFECT(CYCLE_LEFT_RIGHT)
 #    ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS
 
-static uint8_t CYCLE_LEFT_RIGHT_math(uint8_t val, uint8_t i, uint8_t time) { return scale8(g_led_config.point[i].x - time, val); }
+static uint8_t CYCLE_LEFT_RIGHT_math(uint8_t val, uint8_t i, uint8_t time) {
+    return scale8(g_led_config.point[i].x - time, val);
+}
 
-bool CYCLE_LEFT_RIGHT(effect_params_t* params) { return effect_runner_i(params, &CYCLE_LEFT_RIGHT_math); }
+bool CYCLE_LEFT_RIGHT(effect_params_t* params) {
+    return effect_runner_i(params, &CYCLE_LEFT_RIGHT_math);
+}
 
-#    endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT
+#    endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT
diff --git a/quantum/led_matrix/animations/cycle_out_in_anim.h b/quantum/led_matrix/animations/cycle_out_in_anim.h
index 77d3a14b6f..8311d97fe8 100644
--- a/quantum/led_matrix/animations/cycle_out_in_anim.h
+++ b/quantum/led_matrix/animations/cycle_out_in_anim.h
@@ -2,9 +2,13 @@
 LED_MATRIX_EFFECT(CYCLE_OUT_IN)
 #    ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS
 
-static uint8_t CYCLE_OUT_IN_math(uint8_t val, int16_t dx, int16_t dy, uint8_t dist, uint8_t time) { return scale8(3 * dist / 2 + time, val); }
+static uint8_t CYCLE_OUT_IN_math(uint8_t val, int16_t dx, int16_t dy, uint8_t dist, uint8_t time) {
+    return scale8(3 * dist / 2 + time, val);
+}
 
-bool CYCLE_OUT_IN(effect_params_t* params) { return effect_runner_dx_dy_dist(params, &CYCLE_OUT_IN_math); }
+bool CYCLE_OUT_IN(effect_params_t* params) {
+    return effect_runner_dx_dy_dist(params, &CYCLE_OUT_IN_math);
+}
 
-#    endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_LED_MATRIX_CYCLE_OUT_IN
+#    endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_LED_MATRIX_CYCLE_OUT_IN
diff --git a/quantum/led_matrix/animations/cycle_up_down_anim.h b/quantum/led_matrix/animations/cycle_up_down_anim.h
index b25947199c..7e2d71a0f1 100644
--- a/quantum/led_matrix/animations/cycle_up_down_anim.h
+++ b/quantum/led_matrix/animations/cycle_up_down_anim.h
@@ -2,9 +2,13 @@
 LED_MATRIX_EFFECT(CYCLE_UP_DOWN)
 #    ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS
 
-static uint8_t CYCLE_UP_DOWN_math(uint8_t val, uint8_t i, uint8_t time) { return scale8(g_led_config.point[i].y - time, val); }
+static uint8_t CYCLE_UP_DOWN_math(uint8_t val, uint8_t i, uint8_t time) {
+    return scale8(g_led_config.point[i].y - time, val);
+}
 
-bool CYCLE_UP_DOWN(effect_params_t* params) { return effect_runner_i(params, &CYCLE_UP_DOWN_math); }
+bool CYCLE_UP_DOWN(effect_params_t* params) {
+    return effect_runner_i(params, &CYCLE_UP_DOWN_math);
+}
 
-#    endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_LED_MATRIX_CYCLE_UP_DOWN
+#    endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_LED_MATRIX_CYCLE_UP_DOWN
diff --git a/quantum/led_matrix/animations/dual_beacon_anim.h b/quantum/led_matrix/animations/dual_beacon_anim.h
index 81735e323c..1dfb5ffe52 100644
--- a/quantum/led_matrix/animations/dual_beacon_anim.h
+++ b/quantum/led_matrix/animations/dual_beacon_anim.h
@@ -2,9 +2,13 @@
 LED_MATRIX_EFFECT(DUAL_BEACON)
 #    ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS
 
-static uint8_t DUAL_BEACON_math(uint8_t val, int8_t sin, int8_t cos, uint8_t i, uint8_t time) { return scale8(((g_led_config.point[i].y - k_led_matrix_center.y) * cos + (g_led_config.point[i].x - k_led_matrix_center.x) * sin) / 128, val); }
+static uint8_t DUAL_BEACON_math(uint8_t val, int8_t sin, int8_t cos, uint8_t i, uint8_t time) {
+    return scale8(((g_led_config.point[i].y - k_led_matrix_center.y) * cos + (g_led_config.point[i].x - k_led_matrix_center.x) * sin) / 128, val);
+}
 
-bool DUAL_BEACON(effect_params_t* params) { return effect_runner_sin_cos_i(params, &DUAL_BEACON_math); }
+bool DUAL_BEACON(effect_params_t* params) {
+    return effect_runner_sin_cos_i(params, &DUAL_BEACON_math);
+}
 
-#    endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_LED_MATRIX_DUAL_BEACON
+#    endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_LED_MATRIX_DUAL_BEACON
diff --git a/quantum/led_matrix/animations/runners/effect_runner_reactive.h b/quantum/led_matrix/animations/runners/effect_runner_reactive.h
index be3090aa53..8468458744 100644
--- a/quantum/led_matrix/animations/runners/effect_runner_reactive.h
+++ b/quantum/led_matrix/animations/runners/effect_runner_reactive.h
@@ -25,4 +25,4 @@ bool effect_runner_reactive(effect_params_t* params, reactive_f effect_func) {
     return led_matrix_check_finished_leds(led_max);
 }
 
-#endif  // LED_MATRIX_KEYREACTIVE_ENABLED
+#endif // LED_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/led_matrix/animations/runners/effect_runner_reactive_splash.h b/quantum/led_matrix/animations/runners/effect_runner_reactive_splash.h
index f6ffc825a1..aec4a6ffda 100644
--- a/quantum/led_matrix/animations/runners/effect_runner_reactive_splash.h
+++ b/quantum/led_matrix/animations/runners/effect_runner_reactive_splash.h
@@ -23,4 +23,4 @@ bool effect_runner_reactive_splash(uint8_t start, effect_params_t* params, react
     return led_matrix_check_finished_leds(led_max);
 }
 
-#endif  // LED_MATRIX_KEYREACTIVE_ENABLED
+#endif // LED_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/led_matrix/animations/solid_anim.h b/quantum/led_matrix/animations/solid_anim.h
index c728dbcc98..895542e152 100644
--- a/quantum/led_matrix/animations/solid_anim.h
+++ b/quantum/led_matrix/animations/solid_anim.h
@@ -12,4 +12,4 @@ bool SOLID(effect_params_t* params) {
     return led_matrix_check_finished_leds(led_max);
 }
 
-#endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
diff --git a/quantum/led_matrix/animations/solid_reactive_cross.h b/quantum/led_matrix/animations/solid_reactive_cross.h
index a149e9a929..55a2556996 100644
--- a/quantum/led_matrix/animations/solid_reactive_cross.h
+++ b/quantum/led_matrix/animations/solid_reactive_cross.h
@@ -23,13 +23,17 @@ static uint8_t SOLID_REACTIVE_CROSS_math(uint8_t val, int16_t dx, int16_t dy, ui
 }
 
 #            ifdef ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
-bool SOLID_REACTIVE_CROSS(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_CROSS_math); }
+bool SOLID_REACTIVE_CROSS(effect_params_t* params) {
+    return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_CROSS_math);
+}
 #            endif
 
 #            ifdef ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
-bool SOLID_REACTIVE_MULTICROSS(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_CROSS_math); }
+bool SOLID_REACTIVE_MULTICROSS(effect_params_t* params) {
+    return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_CROSS_math);
+}
 #            endif
 
-#        endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#    endif      // defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS) || defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS)
-#endif          // LED_MATRIX_KEYREACTIVE_ENABLED
+#        endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#    endif     // defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS) || defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS)
+#endif         // LED_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/led_matrix/animations/solid_reactive_nexus.h b/quantum/led_matrix/animations/solid_reactive_nexus.h
index 5a86e48c6c..b1ec54e3b1 100644
--- a/quantum/led_matrix/animations/solid_reactive_nexus.h
+++ b/quantum/led_matrix/animations/solid_reactive_nexus.h
@@ -20,13 +20,17 @@ static uint8_t SOLID_REACTIVE_NEXUS_math(uint8_t val, int16_t dx, int16_t dy, ui
 }
 
 #            ifdef ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS
-bool SOLID_REACTIVE_NEXUS(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_NEXUS_math); }
+bool SOLID_REACTIVE_NEXUS(effect_params_t* params) {
+    return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_NEXUS_math);
+}
 #            endif
 
 #            ifdef ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS
-bool SOLID_REACTIVE_MULTINEXUS(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_NEXUS_math); }
+bool SOLID_REACTIVE_MULTINEXUS(effect_params_t* params) {
+    return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_NEXUS_math);
+}
 #            endif
 
-#        endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#    endif      // defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS) || defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS)
-#endif          // LED_MATRIX_KEYREACTIVE_ENABLED
+#        endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#    endif     // defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS) || defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS)
+#endif         // LED_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/led_matrix/animations/solid_reactive_simple_anim.h b/quantum/led_matrix/animations/solid_reactive_simple_anim.h
index 14f5e90730..3b289c78dd 100644
--- a/quantum/led_matrix/animations/solid_reactive_simple_anim.h
+++ b/quantum/led_matrix/animations/solid_reactive_simple_anim.h
@@ -3,10 +3,14 @@
 LED_MATRIX_EFFECT(SOLID_REACTIVE_SIMPLE)
 #        ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS
 
-static uint8_t SOLID_REACTIVE_SIMPLE_math(uint8_t val, uint16_t offset) { return scale8(255 - offset, val); }
+static uint8_t SOLID_REACTIVE_SIMPLE_math(uint8_t val, uint16_t offset) {
+    return scale8(255 - offset, val);
+}
 
-bool SOLID_REACTIVE_SIMPLE(effect_params_t* params) { return effect_runner_reactive(params, &SOLID_REACTIVE_SIMPLE_math); }
+bool SOLID_REACTIVE_SIMPLE(effect_params_t* params) {
+    return effect_runner_reactive(params, &SOLID_REACTIVE_SIMPLE_math);
+}
 
-#        endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#    endif      // ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE
-#endif          // LED_MATRIX_KEYREACTIVE_ENABLED
+#        endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#    endif     // ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE
+#endif         // LED_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/led_matrix/animations/solid_reactive_wide.h b/quantum/led_matrix/animations/solid_reactive_wide.h
index 3aa88063a7..96338113f1 100644
--- a/quantum/led_matrix/animations/solid_reactive_wide.h
+++ b/quantum/led_matrix/animations/solid_reactive_wide.h
@@ -18,13 +18,17 @@ static uint8_t SOLID_REACTIVE_WIDE_math(uint8_t val, int16_t dx, int16_t dy, uin
 }
 
 #            ifdef ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
-bool SOLID_REACTIVE_WIDE(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_WIDE_math); }
+bool SOLID_REACTIVE_WIDE(effect_params_t* params) {
+    return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_WIDE_math);
+}
 #            endif
 
 #            ifdef ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE
-bool SOLID_REACTIVE_MULTIWIDE(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_WIDE_math); }
+bool SOLID_REACTIVE_MULTIWIDE(effect_params_t* params) {
+    return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_WIDE_math);
+}
 #            endif
 
-#        endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#    endif      // !defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE) || !defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE)
-#endif          // LED_MATRIX_KEYREACTIVE_ENABLED
+#        endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#    endif     // !defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE) || !defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE)
+#endif         // LED_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/led_matrix/animations/solid_splash_anim.h b/quantum/led_matrix/animations/solid_splash_anim.h
index 17b692a09a..b8b6e8ea5e 100644
--- a/quantum/led_matrix/animations/solid_splash_anim.h
+++ b/quantum/led_matrix/animations/solid_splash_anim.h
@@ -18,13 +18,17 @@ uint8_t SOLID_SPLASH_math(uint8_t val, int16_t dx, int16_t dy, uint8_t dist, uin
 }
 
 #            ifdef ENABLE_LED_MATRIX_SOLID_SPLASH
-bool SOLID_SPLASH(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_SPLASH_math); }
+bool SOLID_SPLASH(effect_params_t* params) {
+    return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_SPLASH_math);
+}
 #            endif
 
 #            ifdef ENABLE_LED_MATRIX_SOLID_MULTISPLASH
-bool SOLID_MULTISPLASH(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_SPLASH_math); }
+bool SOLID_MULTISPLASH(effect_params_t* params) {
+    return effect_runner_reactive_splash(0, params, &SOLID_SPLASH_math);
+}
 #            endif
 
-#        endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#    endif      // defined(ENABLE_LED_MATRIX_SPLASH) || defined(ENABLE_LED_MATRIX_MULTISPLASH)
-#endif          // LED_MATRIX_KEYREACTIVE_ENABLED
+#        endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#    endif     // defined(ENABLE_LED_MATRIX_SPLASH) || defined(ENABLE_LED_MATRIX_MULTISPLASH)
+#endif         // LED_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/led_matrix/animations/wave_left_right_anim.h b/quantum/led_matrix/animations/wave_left_right_anim.h
index 76487f8515..8dedd64738 100644
--- a/quantum/led_matrix/animations/wave_left_right_anim.h
+++ b/quantum/led_matrix/animations/wave_left_right_anim.h
@@ -2,9 +2,13 @@
 LED_MATRIX_EFFECT(WAVE_LEFT_RIGHT)
 #    ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS
 
-static uint8_t WAVE_LEFT_RIGHT_math(uint8_t val, uint8_t i, uint8_t time) { return scale8(sin8(g_led_config.point[i].x - time), val); }
+static uint8_t WAVE_LEFT_RIGHT_math(uint8_t val, uint8_t i, uint8_t time) {
+    return scale8(sin8(g_led_config.point[i].x - time), val);
+}
 
-bool WAVE_LEFT_RIGHT(effect_params_t* params) { return effect_runner_i(params, &WAVE_LEFT_RIGHT_math); }
+bool WAVE_LEFT_RIGHT(effect_params_t* params) {
+    return effect_runner_i(params, &WAVE_LEFT_RIGHT_math);
+}
 
-#    endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT
+#    endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT
diff --git a/quantum/led_matrix/animations/wave_up_down_anim.h b/quantum/led_matrix/animations/wave_up_down_anim.h
index 94710f5c6e..4564f3e493 100644
--- a/quantum/led_matrix/animations/wave_up_down_anim.h
+++ b/quantum/led_matrix/animations/wave_up_down_anim.h
@@ -2,9 +2,13 @@
 LED_MATRIX_EFFECT(WAVE_UP_DOWN)
 #    ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS
 
-static uint8_t WAVE_UP_DOWN_math(uint8_t val, uint8_t i, uint8_t time) { return scale8(sin8(g_led_config.point[i].y - time), val); }
+static uint8_t WAVE_UP_DOWN_math(uint8_t val, uint8_t i, uint8_t time) {
+    return scale8(sin8(g_led_config.point[i].y - time), val);
+}
 
-bool WAVE_UP_DOWN(effect_params_t* params) { return effect_runner_i(params, &WAVE_UP_DOWN_math); }
+bool WAVE_UP_DOWN(effect_params_t* params) {
+    return effect_runner_i(params, &WAVE_UP_DOWN_math);
+}
 
-#    endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_LED_MATRIX_WAVE_UP_DOWN
+#    endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_LED_MATRIX_WAVE_UP_DOWN
diff --git a/quantum/led_matrix/led_matrix.c b/quantum/led_matrix/led_matrix.c
index be1494e884..38ed79bed0 100644
--- a/quantum/led_matrix/led_matrix.c
+++ b/quantum/led_matrix/led_matrix.c
@@ -88,14 +88,14 @@ const led_point_t k_led_matrix_center = LED_MATRIX_CENTER;
 #endif
 
 // globals
-led_eeconfig_t led_matrix_eeconfig;  // TODO: would like to prefix this with g_ for global consistancy, do this in another pr
+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
+#endif // LED_MATRIX_FRAMEBUFFER_EFFECTS
 #ifdef LED_MATRIX_KEYREACTIVE_ENABLED
 last_hit_t g_last_hit_tracker;
-#endif  // LED_MATRIX_KEYREACTIVE_ENABLED
+#endif // LED_MATRIX_KEYREACTIVE_ENABLED
 
 // internals
 static bool            suspend_state     = false;
@@ -105,13 +105,13 @@ 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
+#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
+#endif // LED_MATRIX_KEYREACTIVE_ENABLED
 
 // split led matrix
 #if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
@@ -120,7 +120,9 @@ const uint8_t k_led_matrix_split[2] = LED_MATRIX_SPLIT;
 
 EECONFIG_DEBOUNCE_HELPER(led_matrix, EECONFIG_LED_MATRIX, led_matrix_eeconfig);
 
-void eeconfig_update_led_matrix(void) { eeconfig_flush_led_matrix(true); }
+void eeconfig_update_led_matrix(void) {
+    eeconfig_flush_led_matrix(true);
+}
 
 void eeconfig_update_led_matrix_default(void) {
     dprintf("eeconfig_update_led_matrix_default\n");
@@ -141,7 +143,9 @@ void eeconfig_debug_led_matrix(void) {
     dprintf("led_matrix_eeconfig.flags = %d\n", led_matrix_eeconfig.flags);
 }
 
-__attribute__((weak)) uint8_t led_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t *led_i) { return 0; }
+__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 led_matrix_map_row_column_to_led(uint8_t row, uint8_t column, uint8_t *led_i) {
     uint8_t led_count = led_matrix_map_row_column_to_led_kb(row, column, led_i);
@@ -153,7 +157,9 @@ uint8_t led_matrix_map_row_column_to_led(uint8_t row, uint8_t column, uint8_t *l
     return led_count;
 }
 
-void led_matrix_update_pwm_buffers(void) { led_matrix_driver.flush(); }
+void led_matrix_update_pwm_buffers(void) {
+    led_matrix_driver.flush();
+}
 
 void led_matrix_set_value(int index, uint8_t value) {
 #ifdef USE_CIE1931_CURVE
@@ -164,7 +170,8 @@ void led_matrix_set_value(int index, uint8_t value) {
 
 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);
+    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]));
@@ -180,7 +187,7 @@ void process_led_matrix(uint8_t row, uint8_t col, bool pressed) {
 #endif
 #if LED_DISABLE_TIMEOUT > 0
     led_anykey_timer = 0;
-#endif  // LED_DISABLE_TIMEOUT > 0
+#endif // LED_DISABLE_TIMEOUT > 0
 
 #ifdef LED_MATRIX_KEYREACTIVE_ENABLED
     uint8_t led[LED_HITS_TO_REMEMBER];
@@ -190,7 +197,7 @@ void process_led_matrix(uint8_t row, uint8_t col, bool pressed) {
     if (!pressed)
 #    elif defined(LED_MATRIX_KEYPRESSES)
     if (pressed)
-#    endif  // defined(LED_MATRIX_KEYRELEASES)
+#    endif // defined(LED_MATRIX_KEYRELEASES)
     {
         led_count = led_matrix_map_row_column_to_led(row, col, led);
     }
@@ -198,7 +205,7 @@ void process_led_matrix(uint8_t row, uint8_t col, bool pressed) {
     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.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 = LED_HITS_TO_REMEMBER - led_count;
     }
@@ -211,13 +218,13 @@ void process_led_matrix(uint8_t row, uint8_t col, bool pressed) {
         last_hit_buffer.tick[index]  = 0;
         last_hit_buffer.count++;
     }
-#endif  // LED_MATRIX_KEYREACTIVE_ENABLED
+#endif // LED_MATRIX_KEYREACTIVE_ENABLED
 
 #if defined(LED_MATRIX_FRAMEBUFFER_EFFECTS) && defined(ENABLE_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(ENABLE_LED_MATRIX_TYPING_HEATMAP)
+#endif // defined(LED_MATRIX_FRAMEBUFFER_EFFECTS) && defined(ENABLE_LED_MATRIX_TYPING_HEATMAP)
 }
 
 static bool led_matrix_none(effect_params_t *params) {
@@ -232,7 +239,7 @@ static bool led_matrix_none(effect_params_t *params) {
 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
+#endif // defined(LED_MATRIX_KEYREACTIVE_ENABLED) || LED_DISABLE_TIMEOUT > 0
     led_timer_buffer = sync_timer_read32();
 
     // Update double buffer timers
@@ -244,7 +251,7 @@ static void led_task_timers(void) {
             led_anykey_timer += deltaTime;
         }
     }
-#endif  // LED_DISABLE_TIMEOUT > 0
+#endif // LED_DISABLE_TIMEOUT > 0
 
     // Update double buffer last hit timers
 #ifdef LED_MATRIX_KEYREACTIVE_ENABLED
@@ -256,7 +263,7 @@ static void led_task_timers(void) {
         }
         last_hit_buffer.tick[i] += deltaTime;
     }
-#endif  // LED_MATRIX_KEYREACTIVE_ENABLED
+#endif // LED_MATRIX_KEYREACTIVE_ENABLED
 }
 
 static void led_task_sync(void) {
@@ -273,7 +280,7 @@ static void led_task_start(void) {
     g_led_timer = led_timer_buffer;
 #ifdef LED_MATRIX_KEYREACTIVE_ENABLED
     g_last_hit_tracker = last_hit_buffer;
-#endif  // LED_MATRIX_KEYREACTIVE_ENABLED
+#endif // LED_MATRIX_KEYREACTIVE_ENABLED
 
     // next task
     led_task_state = RENDERING;
@@ -352,7 +359,7 @@ void led_matrix_task(void) {
     bool suspend_backlight = suspend_state ||
 #if LED_DISABLE_TIMEOUT > 0
                              (led_anykey_timer > (uint32_t)LED_DISABLE_TIMEOUT) ||
-#endif  // LED_DISABLE_TIMEOUT > 0
+#endif // LED_DISABLE_TIMEOUT > 0
                              false;
 
     uint8_t effect = suspend_backlight || !led_matrix_eeconfig.enable ? 0 : led_matrix_eeconfig.mode;
@@ -421,7 +428,7 @@ void led_matrix_init(void) {
     for (uint8_t i = 0; i < LED_HITS_TO_REMEMBER; ++i) {
         last_hit_buffer.tick[i] = UINT16_MAX;
     }
-#endif  // LED_MATRIX_KEYREACTIVE_ENABLED
+#endif // LED_MATRIX_KEYREACTIVE_ENABLED
 
     if (!eeconfig_is_enabled()) {
         dprintf("led_matrix_init_drivers eeconfig is not enabled.\n");
@@ -434,20 +441,22 @@ void led_matrix_init(void) {
         dprintf("led_matrix_init_drivers led_matrix_eeconfig.mode = 0. Write default values to EEPROM.\n");
         eeconfig_update_led_matrix_default();
     }
-    eeconfig_debug_led_matrix();  // display current eeprom values
+    eeconfig_debug_led_matrix(); // display current eeprom values
 }
 
 void led_matrix_set_suspend_state(bool state) {
 #ifdef LED_DISABLE_WHEN_USB_SUSPENDED
-    if (state && !suspend_state && is_keyboard_master()) {  // only run if turning off, and only once
-        led_task_render(0);                                 // turn off all LEDs when suspending
-        led_task_flush(0);                                  // and actually flash led state to LEDs
+    if (state && !suspend_state && is_keyboard_master()) { // only run if turning off, and only once
+        led_task_render(0);                                // turn off all LEDs when suspending
+        led_task_flush(0);                                 // and actually flash led state to LEDs
     }
     suspend_state = state;
 #endif
 }
 
-bool led_matrix_get_suspend_state(void) { return suspend_state; }
+bool led_matrix_get_suspend_state(void) {
+    return suspend_state;
+}
 
 void led_matrix_toggle_eeprom_helper(bool write_to_eeprom) {
     led_matrix_eeconfig.enable ^= 1;
@@ -455,8 +464,12 @@ void led_matrix_toggle_eeprom_helper(bool write_to_eeprom) {
     eeconfig_flag_led_matrix(write_to_eeprom);
     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_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_enable_noeeprom();
@@ -478,7 +491,9 @@ void led_matrix_disable_noeeprom(void) {
     led_matrix_eeconfig.enable = 0;
 }
 
-uint8_t led_matrix_is_enabled(void) { return led_matrix_eeconfig.enable; }
+uint8_t led_matrix_is_enabled(void) {
+    return led_matrix_eeconfig.enable;
+}
 
 void led_matrix_mode_eeprom_helper(uint8_t mode, bool write_to_eeprom) {
     if (!led_matrix_eeconfig.enable) {
@@ -495,24 +510,38 @@ void led_matrix_mode_eeprom_helper(uint8_t mode, bool write_to_eeprom) {
     eeconfig_flag_led_matrix(write_to_eeprom);
     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_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);
+}
 
-uint8_t led_matrix_get_mode(void) { return led_matrix_eeconfig.mode; }
+uint8_t led_matrix_get_mode(void) {
+    return led_matrix_eeconfig.mode;
+}
 
 void led_matrix_step_helper(bool write_to_eeprom) {
     uint8_t mode = led_matrix_eeconfig.mode + 1;
     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_step_noeeprom(void) {
+    led_matrix_step_helper(false);
+}
+void led_matrix_step(void) {
+    led_matrix_step_helper(true);
+}
 
 void led_matrix_step_reverse_helper(bool write_to_eeprom) {
     uint8_t mode = led_matrix_eeconfig.mode - 1;
     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_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_set_val_eeprom_helper(uint8_t val, bool write_to_eeprom) {
     if (!led_matrix_eeconfig.enable) {
@@ -522,37 +551,77 @@ void led_matrix_set_val_eeprom_helper(uint8_t val, bool write_to_eeprom) {
     eeconfig_flag_led_matrix(write_to_eeprom);
     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_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);
+}
 
-uint8_t led_matrix_get_val(void) { return led_matrix_eeconfig.val; }
+uint8_t led_matrix_get_val(void) {
+    return led_matrix_eeconfig.val;
+}
 
-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); }
-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_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);
+}
+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_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;
     eeconfig_flag_led_matrix(write_to_eeprom);
     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); }
+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_speed(void) { return led_matrix_eeconfig.speed; }
+uint8_t led_matrix_get_speed(void) {
+    return led_matrix_eeconfig.speed;
+}
 
-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_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_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); }
-void led_matrix_decrease_speed_noeeprom(void) { led_matrix_decrease_speed_helper(false); }
-void led_matrix_decrease_speed(void) { led_matrix_decrease_speed_helper(true); }
+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);
+}
+void led_matrix_decrease_speed_noeeprom(void) {
+    led_matrix_decrease_speed_helper(false);
+}
+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; }
+led_flags_t led_matrix_get_flags(void) {
+    return led_matrix_eeconfig.flags;
+}
 
-void led_matrix_set_flags(led_flags_t flags) { led_matrix_eeconfig.flags = flags; }
+void led_matrix_set_flags(led_flags_t flags) {
+    led_matrix_eeconfig.flags = flags;
+}
diff --git a/quantum/led_matrix/led_matrix.h b/quantum/led_matrix/led_matrix.h
index cb7526d6e0..d21f36e295 100644
--- a/quantum/led_matrix/led_matrix.h
+++ b/quantum/led_matrix/led_matrix.h
@@ -27,6 +27,8 @@
 
 #ifdef IS31FL3731
 #    include "is31fl3731-simple.h"
+#elif defined(IS31FLCOMMON)
+#    include "is31flcommon.h"
 #endif
 #ifdef IS31FL3733
 #    include "is31fl3733-simple.h"
diff --git a/quantum/led_matrix/led_matrix_drivers.c b/quantum/led_matrix/led_matrix_drivers.c
index 2157619a0b..847ca1c310 100644
--- a/quantum/led_matrix/led_matrix_drivers.c
+++ b/quantum/led_matrix/led_matrix_drivers.c
@@ -25,7 +25,7 @@
  * in their own files.
  */
 
-#if defined(IS31FL3731) || defined(IS31FL3733)
+#if defined(IS31FL3731) || defined(IS31FL3733) || defined(IS31FLCOMMON)
 #    include "i2c_master.h"
 
 static void init(void) {
@@ -66,6 +66,18 @@ static void init(void) {
 #                endif
 #            endif
 #        endif
+
+#    elif defined(IS31FLCOMMON)
+    IS31FL_common_init(DRIVER_ADDR_1, ISSI_SSR_1);
+#        if defined(LED_DRIVER_ADDR_2)
+    IS31FL_common_init(DRIVER_ADDR_2, ISSI_SSR_2);
+#            if defined(LED_DRIVER_ADDR_3)
+    IS31FL_common_init(DRIVER_ADDR_3, ISSI_SSR_3);
+#                if defined(LED_DRIVER_ADDR_4)
+    IS31FL_common_init(DRIVER_ADDR_4, ISSI_SSR_4);
+#                endif
+#            endif
+#        endif
 #    endif
 
     for (int index = 0; index < DRIVER_LED_TOTAL; index++) {
@@ -73,6 +85,8 @@ static void init(void) {
         IS31FL3731_set_led_control_register(index, true);
 #    elif defined(IS31FL3733)
         IS31FL3733_set_led_control_register(index, true);
+#    elif defined(IS31FLCOMMON)
+        IS31FL_simple_set_scaling_buffer(index, true);
 #    endif
     }
 
@@ -100,6 +114,21 @@ static void init(void) {
 #                endif
 #            endif
 #        endif
+
+#    elif defined(IS31FLCOMMON)
+#        ifdef ISSI_MANUAL_SCALING
+    IS31FL_set_manual_scaling_buffer();
+#        endif
+    IS31FL_common_update_scaling_register(DRIVER_ADDR_1, 0);
+#        if defined(LED_DRIVER_ADDR_2)
+    IS31FL_common_update_scaling_register(DRIVER_ADDR_2, 1);
+#            if defined(LED_DRIVER_ADDR_3)
+    IS31FL_common_update_scaling_register(DRIVER_ADDR_3, 2);
+#                if defined(LED_DRIVER_ADDR_4)
+    IS31FL_common_update_scaling_register(DRIVER_ADDR_4, 3);
+#                endif
+#            endif
+#        endif
 #    endif
 }
 
@@ -144,5 +173,26 @@ const led_matrix_driver_t led_matrix_driver = {
     .set_value = IS31FL3733_set_value,
     .set_value_all = IS31FL3733_set_value_all,
 };
+
+#    elif defined(IS31FLCOMMON)
+static void flush(void) {
+    IS31FL_common_update_pwm_register(DRIVER_ADDR_1, 0);
+#        if defined(LED_DRIVER_ADDR_2)
+    IS31FL_common_update_pwm_register(DRIVER_ADDR_2, 1);
+#            if defined(LED_DRIVER_ADDR_3)
+    IS31FL_common_update_pwm_register(DRIVER_ADDR_3, 2);
+#                if defined(LED_DRIVER_ADDR_4)
+    IS31FL_common_update_pwm_register(DRIVER_ADDR_4, 3);
+#                endif
+#            endif
+#        endif
+}
+
+const led_matrix_driver_t led_matrix_driver = {
+    .init = init,
+    .flush = flush,
+    .set_value = IS31FL_simple_set_brightness,
+    .set_value_all = IS31FL_simple_set_brigntness_all,
+};
 #    endif
 #endif
diff --git a/quantum/led_matrix/led_matrix_types.h b/quantum/led_matrix/led_matrix_types.h
index 61cdbd9b8e..3dc533100f 100644
--- a/quantum/led_matrix/led_matrix_types.h
+++ b/quantum/led_matrix/led_matrix_types.h
@@ -36,7 +36,7 @@
 // Last led hit
 #ifndef LED_HITS_TO_REMEMBER
 #    define LED_HITS_TO_REMEMBER 8
-#endif  // LED_HITS_TO_REMEMBER
+#endif // LED_HITS_TO_REMEMBER
 
 #ifdef LED_MATRIX_KEYREACTIVE_ENABLED
 typedef struct PACKED {
@@ -46,7 +46,7 @@ typedef struct PACKED {
     uint8_t  index[LED_HITS_TO_REMEMBER];
     uint16_t tick[LED_HITS_TO_REMEMBER];
 } last_hit_t;
-#endif  // LED_MATRIX_KEYREACTIVE_ENABLED
+#endif // LED_MATRIX_KEYREACTIVE_ENABLED
 
 typedef enum led_task_states { STARTING, RENDERING, FLUSHING, SYNCING } led_task_states;
 
@@ -87,7 +87,7 @@ typedef union {
         uint8_t     mode : 6;
         uint16_t    reserved;
         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/logging/debug.c b/quantum/logging/debug.c
index ea62deaa8c..ca7654eda2 100644
--- a/quantum/logging/debug.c
+++ b/quantum/logging/debug.c
@@ -17,9 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "debug.h"
 
 debug_config_t debug_config = {
-    .enable   = false,  //
-    .matrix   = false,  //
-    .keyboard = false,  //
-    .mouse    = false,  //
-    .reserved = 0       //
+    .enable   = false, //
+    .matrix   = false, //
+    .keyboard = false, //
+    .mouse    = false, //
+    .reserved = 0      //
 };
diff --git a/quantum/logging/print.c b/quantum/logging/print.c
index e8440e55ee..50a6b826ee 100644
--- a/quantum/logging/print.c
+++ b/quantum/logging/print.c
@@ -19,9 +19,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // bind lib/printf to console interface - sendchar
 
-static int8_t          null_sendchar_func(uint8_t c) { return 0; }
+static int8_t null_sendchar_func(uint8_t c) {
+    return 0;
+}
 static sendchar_func_t func = null_sendchar_func;
 
-void print_set_sendchar(sendchar_func_t send) { func = send; }
+void print_set_sendchar(sendchar_func_t send) {
+    func = send;
+}
 
-void _putchar(char character) { func(character); }
+void _putchar(char character) {
+    func(character);
+}
diff --git a/quantum/logging/print.h b/quantum/logging/print.h
index 8c055f549e..aa72fc7074 100644
--- a/quantum/logging/print.h
+++ b/quantum/logging/print.h
@@ -37,7 +37,7 @@ void print_set_sendchar(sendchar_func_t func);
 #        include_next "_print.h" /* Include the platforms print.h */
 #    else
 // Fall back to lib/printf
-#        include "printf.h"  // lib/printf/printf.h
+#        include "printf.h" // lib/printf/printf.h
 
 // Create user & normal print defines
 #        define print(s) printf(s)
diff --git a/quantum/logging/sendchar.c b/quantum/logging/sendchar.c
index 9422382f6f..5bc744b743 100644
--- a/quantum/logging/sendchar.c
+++ b/quantum/logging/sendchar.c
@@ -17,4 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "sendchar.h"
 
 /* default noop "null" implementation */
-__attribute__((weak)) int8_t sendchar(uint8_t c) { return 0; }
+__attribute__((weak)) int8_t sendchar(uint8_t c) {
+    return 0;
+}
diff --git a/quantum/main.c b/quantum/main.c
index 6ed6b95741..faba668056 100644
--- a/quantum/main.c
+++ b/quantum/main.c
@@ -45,7 +45,7 @@ void protocol_task(void) {
 
 #ifdef DEFERRED_EXEC_ENABLE
 void deferred_exec_task(void);
-#endif  // DEFERRED_EXEC_ENABLE
+#endif // DEFERRED_EXEC_ENABLE
 
 /** \brief Main
  *
@@ -66,7 +66,7 @@ int main(void) {
 #ifdef DEFERRED_EXEC_ENABLE
         // Run deferred executions
         deferred_exec_task();
-#endif  // DEFERRED_EXEC_ENABLE
+#endif // DEFERRED_EXEC_ENABLE
 
         housekeeping_task();
     }
diff --git a/quantum/matrix.c b/quantum/matrix.c
index 1dd9655e57..db59b73754 100644
--- a/quantum/matrix.c
+++ b/quantum/matrix.c
@@ -47,19 +47,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 #ifdef DIRECT_PINS
-static SPLIT_MUTABLE pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS;
+static SPLIT_MUTABLE pin_t direct_pins[ROWS_PER_HAND][MATRIX_COLS] = DIRECT_PINS;
 #elif (DIODE_DIRECTION == ROW2COL) || (DIODE_DIRECTION == COL2ROW)
 #    ifdef MATRIX_ROW_PINS
-static SPLIT_MUTABLE_ROW pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
-#    endif  // MATRIX_ROW_PINS
+static SPLIT_MUTABLE_ROW pin_t row_pins[ROWS_PER_HAND] = MATRIX_ROW_PINS;
+#    endif // MATRIX_ROW_PINS
 #    ifdef MATRIX_COL_PINS
-static SPLIT_MUTABLE_COL pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
-#    endif  // MATRIX_COL_PINS
+static SPLIT_MUTABLE_COL pin_t col_pins[MATRIX_COLS]   = MATRIX_COL_PINS;
+#    endif // MATRIX_COL_PINS
 #endif
 
 /* matrix state(1:on, 0:off) */
-extern matrix_row_t raw_matrix[MATRIX_ROWS];  // raw values
-extern matrix_row_t matrix[MATRIX_ROWS];      // debounced values
+extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
+extern matrix_row_t matrix[MATRIX_ROWS];     // debounced values
 
 #ifdef SPLIT_KEYBOARD
 // row offsets for each hand
@@ -78,8 +78,17 @@ static inline void setPinOutput_writeLow(pin_t pin) {
     }
 }
 
+static inline void setPinOutput_writeHigh(pin_t pin) {
+    ATOMIC_BLOCK_FORCEON {
+        setPinOutput(pin);
+        writePinHigh(pin);
+    }
+}
+
 static inline void setPinInputHigh_atomic(pin_t pin) {
-    ATOMIC_BLOCK_FORCEON { setPinInputHigh(pin); }
+    ATOMIC_BLOCK_FORCEON {
+        setPinInputHigh(pin);
+    }
 }
 
 static inline uint8_t readMatrixPin(pin_t pin) {
@@ -95,7 +104,7 @@ static inline uint8_t readMatrixPin(pin_t pin) {
 #ifdef DIRECT_PINS
 
 __attribute__((weak)) void matrix_init_pins(void) {
-    for (int row = 0; row < MATRIX_ROWS; row++) {
+    for (int row = 0; row < ROWS_PER_HAND; row++) {
         for (int col = 0; col < MATRIX_COLS; col++) {
             pin_t pin = direct_pins[row][col];
             if (pin != NO_PIN) {
@@ -137,7 +146,11 @@ static bool select_row(uint8_t row) {
 static void unselect_row(uint8_t row) {
     pin_t pin = row_pins[row];
     if (pin != NO_PIN) {
+#            ifdef MATRIX_UNSELECT_DRIVE_HIGH
+        setPinOutput_writeHigh(pin);
+#            else
         setPinInputHigh_atomic(pin);
+#            endif
     }
 }
 
@@ -160,8 +173,8 @@ __attribute__((weak)) void matrix_read_cols_on_row(matrix_row_t current_matrix[]
     // Start with a clear matrix row
     matrix_row_t current_row_value = 0;
 
-    if (!select_row(current_row)) {  // Select row
-        return;                      // skip NO_PIN row
+    if (!select_row(current_row)) { // Select row
+        return;                     // skip NO_PIN row
     }
     matrix_output_select_delay();
 
@@ -176,7 +189,7 @@ __attribute__((weak)) void matrix_read_cols_on_row(matrix_row_t current_matrix[]
 
     // Unselect row
     unselect_row(current_row);
-    matrix_output_unselect_delay(current_row, current_row_value != 0);  // wait for all Col signals to go HIGH
+    matrix_output_unselect_delay(current_row, current_row_value != 0); // wait for all Col signals to go HIGH
 
     // Update the matrix
     current_matrix[current_row] = current_row_value;
@@ -196,7 +209,11 @@ static bool select_col(uint8_t col) {
 static void unselect_col(uint8_t col) {
     pin_t pin = col_pins[col];
     if (pin != NO_PIN) {
+#            ifdef MATRIX_UNSELECT_DRIVE_HIGH
+        setPinOutput_writeHigh(pin);
+#            else
         setPinInputHigh_atomic(pin);
+#            endif
     }
 }
 
@@ -219,8 +236,8 @@ __attribute__((weak)) void matrix_read_rows_on_col(matrix_row_t current_matrix[]
     bool key_pressed = false;
 
     // Select col
-    if (!select_col(current_col)) {  // select col
-        return;                      // skip NO_PIN col
+    if (!select_col(current_col)) { // select col
+        return;                     // skip NO_PIN col
     }
     matrix_output_select_delay();
 
@@ -239,13 +256,13 @@ __attribute__((weak)) void matrix_read_rows_on_col(matrix_row_t current_matrix[]
 
     // Unselect col
     unselect_col(current_col);
-    matrix_output_unselect_delay(current_col, key_pressed);  // wait for all Row signals to go HIGH
+    matrix_output_unselect_delay(current_col, key_pressed); // wait for all Row signals to go HIGH
 }
 
 #        else
 #            error DIODE_DIRECTION must be one of COL2ROW or ROW2COL!
 #        endif
-#    endif  // defined(MATRIX_ROW_PINS) && defined(MATRIX_COL_PINS)
+#    endif // defined(MATRIX_ROW_PINS) && defined(MATRIX_COL_PINS)
 #else
 #    error DIODE_DIRECTION is not defined!
 #endif
@@ -255,16 +272,16 @@ void matrix_init(void) {
     // Set pinout for right half if pinout for that half is defined
     if (!isLeftHand) {
 #    ifdef DIRECT_PINS_RIGHT
-        const pin_t direct_pins_right[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS_RIGHT;
-        for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+        const pin_t direct_pins_right[ROWS_PER_HAND][MATRIX_COLS] = DIRECT_PINS_RIGHT;
+        for (uint8_t i = 0; i < ROWS_PER_HAND; i++) {
             for (uint8_t j = 0; j < MATRIX_COLS; j++) {
                 direct_pins[i][j] = direct_pins_right[i][j];
             }
         }
 #    endif
 #    ifdef MATRIX_ROW_PINS_RIGHT
-        const pin_t row_pins_right[MATRIX_ROWS] = MATRIX_ROW_PINS_RIGHT;
-        for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+        const pin_t row_pins_right[ROWS_PER_HAND] = MATRIX_ROW_PINS_RIGHT;
+        for (uint8_t i = 0; i < ROWS_PER_HAND; i++) {
             row_pins[i] = row_pins_right[i];
         }
 #    endif
@@ -296,7 +313,7 @@ void matrix_init(void) {
 // Fallback implementation for keyboards not using the standard split_util.c
 __attribute__((weak)) bool transport_master_if_connected(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
     transport_master(master_matrix, slave_matrix);
-    return true;  // Treat the transport as always connected
+    return true; // Treat the transport as always connected
 }
 #endif
 
diff --git a/quantum/matrix_common.c b/quantum/matrix_common.c
index d67aaf508c..1497ceae71 100644
--- a/quantum/matrix_common.c
+++ b/quantum/matrix_common.c
@@ -33,9 +33,13 @@ extern const matrix_row_t matrix_mask[];
 
 // user-defined overridable functions
 
-__attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
+__attribute__((weak)) void matrix_init_kb(void) {
+    matrix_init_user();
+}
 
-__attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); }
+__attribute__((weak)) void matrix_scan_kb(void) {
+    matrix_scan_user();
+}
 
 __attribute__((weak)) void matrix_init_user(void) {}
 
@@ -43,11 +47,17 @@ __attribute__((weak)) void matrix_scan_user(void) {}
 
 // helper functions
 
-inline uint8_t matrix_rows(void) { return MATRIX_ROWS; }
+inline uint8_t matrix_rows(void) {
+    return MATRIX_ROWS;
+}
 
-inline uint8_t matrix_cols(void) { return MATRIX_COLS; }
+inline uint8_t matrix_cols(void) {
+    return MATRIX_COLS;
+}
 
-inline bool matrix_is_on(uint8_t row, uint8_t col) { return (matrix[row] & ((matrix_row_t)1 << col)); }
+inline bool matrix_is_on(uint8_t row, uint8_t col) {
+    return (matrix[row] & ((matrix_row_t)1 << col));
+}
 
 inline matrix_row_t matrix_get_row(uint8_t row) {
     // Matrix mask lets you disable switches in the returned matrix data. For example, if you have a
@@ -124,16 +134,26 @@ bool matrix_post_scan(void) {
 #endif
 
 /*　`matrix_io_delay ()` exists for backwards compatibility. From now on, use matrix_output_unselect_delay().　*/
-__attribute__((weak)) void matrix_io_delay(void) { wait_us(MATRIX_IO_DELAY); }
-__attribute__((weak)) void matrix_output_select_delay(void) { waitInputPinDelay(); }
-__attribute__((weak)) void matrix_output_unselect_delay(uint8_t line, bool key_pressed) { matrix_io_delay(); }
+__attribute__((weak)) void matrix_io_delay(void) {
+    wait_us(MATRIX_IO_DELAY);
+}
+__attribute__((weak)) void matrix_output_select_delay(void) {
+    waitInputPinDelay();
+}
+__attribute__((weak)) void matrix_output_unselect_delay(uint8_t line, bool key_pressed) {
+    matrix_io_delay();
+}
 
 // CUSTOM MATRIX 'LITE'
 __attribute__((weak)) void matrix_init_custom(void) {}
-__attribute__((weak)) bool matrix_scan_custom(matrix_row_t current_matrix[]) { return true; }
+__attribute__((weak)) bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    return true;
+}
 
 #ifdef SPLIT_KEYBOARD
-__attribute__((weak)) void matrix_slave_scan_kb(void) { matrix_slave_scan_user(); }
+__attribute__((weak)) void matrix_slave_scan_kb(void) {
+    matrix_slave_scan_user();
+}
 __attribute__((weak)) void matrix_slave_scan_user(void) {}
 #endif
 
@@ -170,4 +190,6 @@ __attribute__((weak)) uint8_t matrix_scan(void) {
     return changed;
 }
 
-__attribute__((weak)) bool peek_matrix(uint8_t row_index, uint8_t col_index, bool raw) { return 0 != ((raw ? raw_matrix[row_index] : matrix[row_index]) & (MATRIX_ROW_SHIFTER << col_index)); }
+__attribute__((weak)) bool peek_matrix(uint8_t row_index, uint8_t col_index, bool raw) {
+    return 0 != ((raw ? raw_matrix[row_index] : matrix[row_index]) & (MATRIX_ROW_SHIFTER << col_index));
+}
diff --git a/quantum/mousekey.c b/quantum/mousekey.c
index c2291fb397..8bafbf977a 100644
--- a/quantum/mousekey.c
+++ b/quantum/mousekey.c
@@ -487,4 +487,6 @@ static void mousekey_debug(void) {
     print(")\n");
 }
 
-report_mouse_t mousekey_get_report(void) { return mouse_report; }
+report_mouse_t mousekey_get_report(void) {
+    return mouse_report;
+}
diff --git a/quantum/pointing_device.c b/quantum/pointing_device.c
index cce292e0bf..9627cab4b8 100644
--- a/quantum/pointing_device.c
+++ b/quantum/pointing_device.c
@@ -39,7 +39,9 @@ uint16_t       shared_cpi          = 0;
  *
  * @param[in] new_mouse_report report_mouse_t
  */
-void pointing_device_set_shared_report(report_mouse_t new_mouse_report) { shared_mouse_report = new_mouse_report; }
+void pointing_device_set_shared_report(report_mouse_t new_mouse_report) {
+    shared_mouse_report = new_mouse_report;
+}
 
 /**
  * @brief Gets current pointing device CPI if supported
@@ -50,7 +52,9 @@ void pointing_device_set_shared_report(report_mouse_t new_mouse_report) { shared
  *
  * @return cpi value as uint16_t
  */
-uint16_t pointing_device_get_shared_cpi(void) { return shared_cpi; }
+uint16_t pointing_device_get_shared_cpi(void) {
+    return shared_cpi;
+}
 
 #    if defined(POINTING_DEVICE_LEFT)
 #        define POINTING_DEVICE_THIS_SIDE is_keyboard_left()
@@ -60,7 +64,7 @@ uint16_t pointing_device_get_shared_cpi(void) { return shared_cpi; }
 #        define POINTING_DEVICE_THIS_SIDE true
 #    endif
 
-#endif  // defined(SPLIT_POINTING_ENABLE)
+#endif // defined(SPLIT_POINTING_ENABLE)
 
 static report_mouse_t local_mouse_report = {};
 
@@ -73,7 +77,9 @@ extern const pointing_device_driver_t pointing_device_driver;
  * @param[in] old report_mouse_t
  * @return bool result
  */
-__attribute__((weak)) bool has_mouse_report_changed(report_mouse_t new, report_mouse_t old) { return memcmp(&new, &old, sizeof(new)); }
+__attribute__((weak)) bool has_mouse_report_changed(report_mouse_t new, report_mouse_t old) {
+    return memcmp(&new, &old, sizeof(new));
+}
 
 /**
  * @brief Keyboard level code pointing device initialisation
@@ -95,7 +101,9 @@ __attribute__((weak)) void pointing_device_init_user(void) {}
  * @param[in] mouse_report report_mouse_t
  * @return report_mouse_t
  */
-__attribute__((weak)) report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) { return pointing_device_task_user(mouse_report); }
+__attribute__((weak)) report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
+    return pointing_device_task_user(mouse_report);
+}
 
 /**
  * @brief Weak function allowing for user level mouse report modification
@@ -105,7 +113,9 @@ __attribute__((weak)) report_mouse_t pointing_device_task_kb(report_mouse_t mous
  * @param[in] mouse_report report_mouse_t
  * @return report_mouse_t
  */
-__attribute__((weak)) report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) { return mouse_report; }
+__attribute__((weak)) report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) {
+    return mouse_report;
+}
 
 /**
  * @brief Handles pointing device buttons
@@ -246,7 +256,7 @@ __attribute__((weak)) void pointing_device_task(void) {
 #    endif
 #else
     local_mouse_report = pointing_device_driver.get_report(local_mouse_report);
-#endif  // defined(SPLIT_POINTING_ENABLE)
+#endif // defined(SPLIT_POINTING_ENABLE)
 
     // allow kb to intercept and modify report
 #if defined(SPLIT_POINTING_ENABLE) && defined(POINTING_DEVICE_COMBINED)
@@ -275,14 +285,18 @@ __attribute__((weak)) void pointing_device_task(void) {
  *
  * @return report_mouse_t
  */
-report_mouse_t pointing_device_get_report(void) { return local_mouse_report; }
+report_mouse_t pointing_device_get_report(void) {
+    return local_mouse_report;
+}
 
 /**
  * @brief Sets mouse report used be pointing device task
  *
  * @param[in] new_mouse_report
  */
-void pointing_device_set_report(report_mouse_t new_mouse_report) { local_mouse_report = new_mouse_report; }
+void pointing_device_set_report(report_mouse_t new_mouse_report) {
+    local_mouse_report = new_mouse_report;
+}
 
 /**
  * @brief Gets current pointing device CPI if supported
@@ -422,7 +436,9 @@ report_mouse_t pointing_device_adjust_by_defines_right(report_mouse_t mouse_repo
  * @param[in] right_report report_mouse_t
  * @return pointing_device_task_combined_user(left_report, right_report) by default
  */
-__attribute__((weak)) report_mouse_t pointing_device_task_combined_kb(report_mouse_t left_report, report_mouse_t right_report) { return pointing_device_task_combined_user(left_report, right_report); }
+__attribute__((weak)) report_mouse_t pointing_device_task_combined_kb(report_mouse_t left_report, report_mouse_t right_report) {
+    return pointing_device_task_combined_user(left_report, right_report);
+}
 
 /**
  * @brief Weak function allowing for user level mouse report modification
@@ -435,5 +451,7 @@ __attribute__((weak)) report_mouse_t pointing_device_task_combined_kb(report_mou
  * @param[in] right_report report_mouse_t
  * @return pointing_device_combine_reports(left_report, right_report) by default
  */
-__attribute__((weak)) report_mouse_t pointing_device_task_combined_user(report_mouse_t left_report, report_mouse_t right_report) { return pointing_device_combine_reports(left_report, right_report); }
+__attribute__((weak)) report_mouse_t pointing_device_task_combined_user(report_mouse_t left_report, report_mouse_t right_report) {
+    return pointing_device_combine_reports(left_report, right_report);
+}
 #endif
diff --git a/quantum/pointing_device.h b/quantum/pointing_device.h
index 8394c20952..5f3845227a 100644
--- a/quantum/pointing_device.h
+++ b/quantum/pointing_device.h
@@ -103,5 +103,5 @@ report_mouse_t pointing_device_combine_reports(report_mouse_t left_report, repor
 report_mouse_t pointing_device_task_combined_kb(report_mouse_t left_report, report_mouse_t right_report);
 report_mouse_t pointing_device_task_combined_user(report_mouse_t left_report, report_mouse_t right_report);
 report_mouse_t pointing_device_adjust_by_defines_right(report_mouse_t mouse_report);
-#    endif  // defined(POINTING_DEVICE_COMBINED)
-#endif      // defined(SPLIT_POINTING_ENABLE)
+#    endif // defined(POINTING_DEVICE_COMBINED)
+#endif     // defined(SPLIT_POINTING_ENABLE)
diff --git a/quantum/pointing_device_drivers.c b/quantum/pointing_device_drivers.c
index 4333bbb095..b8ef6e67e5 100644
--- a/quantum/pointing_device_drivers.c
+++ b/quantum/pointing_device_drivers.c
@@ -101,7 +101,7 @@ const pointing_device_driver_t pointing_device_driver = {
 #        ifdef TAPPING_TERM_PER_KEY
 #            include "action.h"
 #            include "action_tapping.h"
-#            define CIRQUE_PINNACLE_TAPPING_TERM get_tapping_term(KC_BTN1, NULL)
+#            define CIRQUE_PINNACLE_TAPPING_TERM get_tapping_term(KC_BTN1, &(keyrecord_t){})
 #        else
 #            ifdef TAPPING_TERM
 #                define CIRQUE_PINNACLE_TAPPING_TERM TAPPING_TERM
@@ -120,7 +120,7 @@ report_mouse_t cirque_pinnacle_get_report(report_mouse_t mouse_report) {
     int8_t          report_x = 0, report_y = 0;
     static bool     is_z_down = false;
 
-    cirque_pinnacle_scale_data(&touchData, cirque_pinnacle_get_scale(), cirque_pinnacle_get_scale());  // Scale coordinates to arbitrary X, Y resolution
+    cirque_pinnacle_scale_data(&touchData, cirque_pinnacle_get_scale(), cirque_pinnacle_get_scale()); // Scale coordinates to arbitrary X, Y resolution
 
     if (x && y && touchData.xValue && touchData.yValue) {
         report_x = (int8_t)(touchData.xValue - x);
@@ -207,11 +207,13 @@ const pointing_device_driver_t pointing_device_driver = {
 };
 // clang-format on
 #elif defined(POINTING_DEVICE_DRIVER_pmw3360)
-static void pmw3360_device_init(void) { pmw3360_init(); }
+static void pmw3360_device_init(void) {
+    pmw3360_init();
+}
 
 report_mouse_t pmw3360_get_report(report_mouse_t mouse_report) {
     report_pmw3360_t data        = pmw3360_read_burst();
-    static uint16_t  MotionStart = 0;  // Timer for accel, 0 is resting state
+    static uint16_t  MotionStart = 0; // Timer for accel, 0 is resting state
 
     if (data.isOnSurface && data.isMotion) {
         // Reset timer if stopped moving
@@ -243,11 +245,13 @@ const pointing_device_driver_t pointing_device_driver = {
 };
 // clang-format on
 #elif defined(POINTING_DEVICE_DRIVER_pmw3389)
-static void pmw3389_device_init(void) { pmw3389_init(); }
+static void pmw3389_device_init(void) {
+    pmw3389_init();
+}
 
 report_mouse_t pmw3389_get_report(report_mouse_t mouse_report) {
     report_pmw3389_t data        = pmw3389_read_burst();
-    static uint16_t  MotionStart = 0;  // Timer for accel, 0 is resting state
+    static uint16_t  MotionStart = 0; // Timer for accel, 0 is resting state
 
     if (data.isOnSurface && data.isMotion) {
         // Reset timer if stopped moving
@@ -280,9 +284,13 @@ const pointing_device_driver_t pointing_device_driver = {
 // clang-format on
 #else
 __attribute__((weak)) void           pointing_device_driver_init(void) {}
-__attribute__((weak)) report_mouse_t pointing_device_driver_get_report(report_mouse_t mouse_report) { return mouse_report; }
-__attribute__((weak)) uint16_t       pointing_device_driver_get_cpi(void) { return 0; }
-__attribute__((weak)) void           pointing_device_driver_set_cpi(uint16_t cpi) {}
+__attribute__((weak)) report_mouse_t pointing_device_driver_get_report(report_mouse_t mouse_report) {
+    return mouse_report;
+}
+__attribute__((weak)) uint16_t pointing_device_driver_get_cpi(void) {
+    return 0;
+}
+__attribute__((weak)) void pointing_device_driver_set_cpi(uint16_t cpi) {}
 
 // clang-format off
 const pointing_device_driver_t pointing_device_driver = {
diff --git a/quantum/process_keycode/process_audio.c b/quantum/process_keycode/process_audio.c
index 23664721e8..e7fe453308 100644
--- a/quantum/process_keycode/process_audio.c
+++ b/quantum/process_keycode/process_audio.c
@@ -50,11 +50,17 @@ bool process_audio(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-void process_audio_noteon(uint8_t note) { play_note(compute_freq_for_midi_note(note), 0xF); }
+void process_audio_noteon(uint8_t note) {
+    play_note(compute_freq_for_midi_note(note), 0xF);
+}
 
-void process_audio_noteoff(uint8_t note) { stop_note(compute_freq_for_midi_note(note)); }
+void process_audio_noteoff(uint8_t note) {
+    stop_note(compute_freq_for_midi_note(note));
+}
 
-void process_audio_all_notes_off(void) { stop_all_notes(); }
+void process_audio_all_notes_off(void) {
+    stop_all_notes();
+}
 
 __attribute__((weak)) void audio_on_user() {}
 __attribute__((weak)) void audio_off_user() {}
diff --git a/quantum/process_keycode/process_auto_shift.c b/quantum/process_keycode/process_auto_shift.c
index bbc6367ff1..2150edd7b2 100644
--- a/quantum/process_keycode/process_auto_shift.c
+++ b/quantum/process_keycode/process_auto_shift.c
@@ -62,7 +62,9 @@ static struct {
 // clang-format on
 
 /** \brief Called on physical press, returns whether key should be added to Auto Shift */
-__attribute__((weak)) bool get_custom_auto_shifted_key(uint16_t keycode, keyrecord_t *record) { return false; }
+__attribute__((weak)) bool get_custom_auto_shifted_key(uint16_t keycode, keyrecord_t *record) {
+    return false;
+}
 
 /** \brief Called on physical press, returns whether is Auto Shift key */
 __attribute__((weak)) bool get_auto_shifted_key(uint16_t keycode, keyrecord_t *record) {
@@ -82,8 +84,12 @@ __attribute__((weak)) bool get_auto_shifted_key(uint16_t keycode, keyrecord_t *r
 }
 
 /** \brief Called to check whether defines should apply if PER_KEY is set for it */
-__attribute__((weak)) bool get_auto_shift_repeat(uint16_t keycode, keyrecord_t *record) { return true; }
-__attribute__((weak)) bool get_auto_shift_no_auto_repeat(uint16_t keycode, keyrecord_t *record) { return true; }
+__attribute__((weak)) bool get_auto_shift_repeat(uint16_t keycode, keyrecord_t *record) {
+    return true;
+}
+__attribute__((weak)) bool get_auto_shift_no_auto_repeat(uint16_t keycode, keyrecord_t *record) {
+    return true;
+}
 
 /** \brief Called when an Auto Shift key needs to be pressed */
 __attribute__((weak)) void autoshift_press_user(uint16_t keycode, bool shifted, keyrecord_t *record) {
@@ -94,7 +100,9 @@ __attribute__((weak)) void autoshift_press_user(uint16_t keycode, bool shifted,
 }
 
 /** \brief Called when an Auto Shift key needs to be released */
-__attribute__((weak)) void autoshift_release_user(uint16_t keycode, bool shifted, keyrecord_t *record) { unregister_code16((IS_RETRO(keycode)) ? keycode & 0xFF : keycode); }
+__attribute__((weak)) void autoshift_release_user(uint16_t keycode, bool shifted, keyrecord_t *record) {
+    unregister_code16((IS_RETRO(keycode)) ? keycode & 0xFF : keycode);
+}
 
 /** \brief Sets the shift state to use when keyrepeating, required by custom shifts */
 void set_autoshift_shift_state(uint16_t keycode, bool shifted) {
@@ -311,7 +319,9 @@ void autoshift_toggle(void) {
     autoshift_flush_shift();
 }
 
-void autoshift_enable(void) { autoshift_flags.enabled = true; }
+void autoshift_enable(void) {
+    autoshift_flags.enabled = true;
+}
 
 void autoshift_disable(void) {
     autoshift_flags.enabled = false;
@@ -328,12 +338,20 @@ void autoshift_timer_report(void) {
 }
 #    endif
 
-bool get_autoshift_state(void) { return autoshift_flags.enabled; }
+bool get_autoshift_state(void) {
+    return autoshift_flags.enabled;
+}
 
-uint16_t                       get_generic_autoshift_timeout() { return autoshift_timeout; }
-__attribute__((weak)) uint16_t get_autoshift_timeout(uint16_t keycode, keyrecord_t *record) { return autoshift_timeout; }
+uint16_t get_generic_autoshift_timeout() {
+    return autoshift_timeout;
+}
+__attribute__((weak)) uint16_t get_autoshift_timeout(uint16_t keycode, keyrecord_t *record) {
+    return autoshift_timeout;
+}
 
-void set_autoshift_timeout(uint16_t timeout) { autoshift_timeout = timeout; }
+void set_autoshift_timeout(uint16_t timeout) {
+    autoshift_timeout = timeout;
+}
 
 bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
     // Note that record->event.time isn't reliable, see:
diff --git a/quantum/process_keycode/process_clicky.c b/quantum/process_keycode/process_clicky.c
index 6ab382d4aa..9795734984 100644
--- a/quantum/process_keycode/process_clicky.c
+++ b/quantum/process_keycode/process_clicky.c
@@ -5,40 +5,40 @@
 
 #    ifndef AUDIO_CLICKY_DELAY_DURATION
 #        define AUDIO_CLICKY_DELAY_DURATION 1
-#    endif  // !AUDIO_CLICKY_DELAY_DURATION
+#    endif // !AUDIO_CLICKY_DELAY_DURATION
 #    ifndef AUDIO_CLICKY_FREQ_DEFAULT
 #        define AUDIO_CLICKY_FREQ_DEFAULT 440.0f
-#    endif  // !AUDIO_CLICKY_FREQ_DEFAULT
+#    endif // !AUDIO_CLICKY_FREQ_DEFAULT
 #    ifndef AUDIO_CLICKY_FREQ_MIN
 #        define AUDIO_CLICKY_FREQ_MIN 65.0f
-#    endif  // !AUDIO_CLICKY_FREQ_MIN
+#    endif // !AUDIO_CLICKY_FREQ_MIN
 #    ifndef AUDIO_CLICKY_FREQ_MAX
 #        define AUDIO_CLICKY_FREQ_MAX 1500.0f
-#    endif  // !AUDIO_CLICKY_FREQ_MAX
+#    endif // !AUDIO_CLICKY_FREQ_MAX
 #    ifndef AUDIO_CLICKY_FREQ_FACTOR
 #        define AUDIO_CLICKY_FREQ_FACTOR 1.18921f
-#    endif  // !AUDIO_CLICKY_FREQ_FACTOR
+#    endif // !AUDIO_CLICKY_FREQ_FACTOR
 #    ifndef AUDIO_CLICKY_FREQ_RANDOMNESS
 #        define AUDIO_CLICKY_FREQ_RANDOMNESS 0.05f
-#    endif  // !AUDIO_CLICKY_FREQ_RANDOMNESS
+#    endif // !AUDIO_CLICKY_FREQ_RANDOMNESS
 
 float clicky_freq = AUDIO_CLICKY_FREQ_DEFAULT;
 float clicky_rand = AUDIO_CLICKY_FREQ_RANDOMNESS;
 
 // the first "note" is an intentional delay; the 2nd and 3rd notes are the "clicky"
-float clicky_song[][2] = {{AUDIO_CLICKY_FREQ_MIN, AUDIO_CLICKY_DELAY_DURATION}, {AUDIO_CLICKY_FREQ_DEFAULT, 3}, {AUDIO_CLICKY_FREQ_DEFAULT, 1}};  // 3 and 1 --> durations
+float clicky_song[][2] = {{AUDIO_CLICKY_FREQ_MIN, AUDIO_CLICKY_DELAY_DURATION}, {AUDIO_CLICKY_FREQ_DEFAULT, 3}, {AUDIO_CLICKY_FREQ_DEFAULT, 1}}; // 3 and 1 --> durations
 
 extern audio_config_t audio_config;
 
 #    ifndef NO_MUSIC_MODE
 extern bool music_activated;
 extern bool midi_activated;
-#    endif  // !NO_MUSIC_MODE
+#    endif // !NO_MUSIC_MODE
 
 void clicky_play(void) {
 #    ifndef NO_MUSIC_MODE
     if (music_activated || midi_activated || !audio_config.enable) return;
-#    endif  // !NO_MUSIC_MODE
+#    endif // !NO_MUSIC_MODE
     clicky_song[1][0] = 2.0f * clicky_freq * (1.0f + clicky_rand * (((float)rand()) / ((float)(RAND_MAX))));
     clicky_song[2][0] = clicky_freq * (1.0f + clicky_rand * (((float)rand()) / ((float)(RAND_MAX))));
     PLAY_SONG(clicky_song);
@@ -58,7 +58,9 @@ void clicky_freq_down(void) {
     }
 }
 
-void clicky_freq_reset(void) { clicky_freq = AUDIO_CLICKY_FREQ_DEFAULT; }
+void clicky_freq_reset(void) {
+    clicky_freq = AUDIO_CLICKY_FREQ_DEFAULT;
+}
 
 void clicky_toggle(void) {
     audio_config.clicky_enable ^= 1;
@@ -75,7 +77,9 @@ void clicky_off(void) {
     eeconfig_update_audio(audio_config.raw);
 }
 
-bool is_clicky_on(void) { return (audio_config.clicky_enable != 0); }
+bool is_clicky_on(void) {
+    return (audio_config.clicky_enable != 0);
+}
 
 bool process_clicky(uint16_t keycode, keyrecord_t *record) {
     if (keycode == CLICKY_TOGGLE && record->event.pressed) {
@@ -101,8 +105,8 @@ bool process_clicky(uint16_t keycode, keyrecord_t *record) {
     }
 
     if (audio_config.enable && audio_config.clicky_enable) {
-        if (record->event.pressed) {                       // Leave this separate so it's easier to add upstroke sound
-            if (keycode != AU_OFF && keycode != AU_TOG) {  // DO NOT PLAY if audio will be disabled, and causes issuse on ARM
+        if (record->event.pressed) {                      // Leave this separate so it's easier to add upstroke sound
+            if (keycode != AU_OFF && keycode != AU_TOG) { // DO NOT PLAY if audio will be disabled, and causes issuse on ARM
                 clicky_play();
             }
         }
@@ -110,4 +114,4 @@ bool process_clicky(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-#endif  // AUDIO_CLICKY
+#endif // AUDIO_CLICKY
diff --git a/quantum/process_keycode/process_combo.c b/quantum/process_keycode/process_combo.c
index 21fd737ab7..efaf8fe0e9 100644
--- a/quantum/process_keycode/process_combo.c
+++ b/quantum/process_keycode/process_combo.c
@@ -30,33 +30,45 @@ extern uint16_t COMBO_LEN;
 __attribute__((weak)) void process_combo_event(uint16_t combo_index, bool pressed) {}
 
 #ifdef COMBO_MUST_HOLD_PER_COMBO
-__attribute__((weak)) bool get_combo_must_hold(uint16_t index, combo_t *combo) { return false; }
+__attribute__((weak)) bool get_combo_must_hold(uint16_t index, combo_t *combo) {
+    return false;
+}
 #endif
 
 #ifdef COMBO_MUST_TAP_PER_COMBO
-__attribute__((weak)) bool get_combo_must_tap(uint16_t index, combo_t *combo) { return false; }
+__attribute__((weak)) bool get_combo_must_tap(uint16_t index, combo_t *combo) {
+    return false;
+}
 #endif
 
 #ifdef COMBO_TERM_PER_COMBO
-__attribute__((weak)) uint16_t get_combo_term(uint16_t index, combo_t *combo) { return COMBO_TERM; }
+__attribute__((weak)) uint16_t get_combo_term(uint16_t index, combo_t *combo) {
+    return COMBO_TERM;
+}
 #endif
 
 #ifdef COMBO_MUST_PRESS_IN_ORDER_PER_COMBO
-__attribute__((weak)) bool get_combo_must_press_in_order(uint16_t combo_index, combo_t *combo) { return true; }
+__attribute__((weak)) bool get_combo_must_press_in_order(uint16_t combo_index, combo_t *combo) {
+    return true;
+}
 #endif
 
 #ifdef COMBO_PROCESS_KEY_RELEASE
-__attribute__((weak)) bool process_combo_key_release(uint16_t combo_index, combo_t *combo, uint8_t key_index, uint16_t keycode) { return false; }
+__attribute__((weak)) bool process_combo_key_release(uint16_t combo_index, combo_t *combo, uint8_t key_index, uint16_t keycode) {
+    return false;
+}
 #endif
 
 #ifdef COMBO_SHOULD_TRIGGER
-__attribute__((weak)) bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode, keyrecord_t *record) { return true; }
+__attribute__((weak)) bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode, keyrecord_t *record) {
+    return true;
+}
 #endif
 
 #ifndef COMBO_NO_TIMER
 static uint16_t timer = 0;
 #endif
-static bool     b_combo_enable = true;  // defaults to enabled
+static bool     b_combo_enable = true; // defaults to enabled
 static uint16_t longest_term   = 0;
 
 typedef struct {
@@ -462,7 +474,7 @@ static bool process_single_combo(combo_t *combo, uint16_t keycode, keyrecord_t *
                     // get possible longer waiting time for tap-/hold-only combos.
                     longest_term = _get_wait_time(combo_index, combo);
                 }
-            }  // if timer elapsed end
+            } // if timer elapsed end
         }
     } else {
         // chord releases
@@ -477,7 +489,7 @@ static bool process_single_combo(combo_t *combo, uint16_t keycode, keyrecord_t *
             else if (get_combo_must_tap(combo_index, combo)) {
                 // immediately apply tap-only combo
                 apply_combo(combo_index, combo);
-                apply_combos();  // also apply other prepared combos and dump key buffer
+                apply_combos(); // also apply other prepared combos and dump key buffer
 #    ifdef COMBO_PROCESS_KEY_RELEASE
                 if (process_combo_key_release(combo_index, combo, key_index, keycode)) {
                     release_combo(combo_index, combo);
@@ -559,7 +571,7 @@ bool process_combo(uint16_t keycode, keyrecord_t *record) {
             key_buffer[key_buffer_size++] = (queued_record_t){
                 .record      = *record,
                 .keycode     = keycode,
-                .combo_index = -1,  // this will be set when applying combos
+                .combo_index = -1, // this will be set when applying combos
             };
         }
     } else {
@@ -598,7 +610,9 @@ void combo_task(void) {
 #endif
 }
 
-void combo_enable(void) { b_combo_enable = true; }
+void combo_enable(void) {
+    b_combo_enable = true;
+}
 
 void combo_disable(void) {
 #ifndef COMBO_NO_TIMER
@@ -618,4 +632,6 @@ void combo_toggle(void) {
     }
 }
 
-bool is_combo_enabled(void) { return b_combo_enable; }
+bool is_combo_enabled(void) {
+    return b_combo_enable;
+}
diff --git a/quantum/process_keycode/process_dynamic_macro.c b/quantum/process_keycode/process_dynamic_macro.c
index 18c8d7ca2e..a1ada2d5a2 100644
--- a/quantum/process_keycode/process_dynamic_macro.c
+++ b/quantum/process_keycode/process_dynamic_macro.c
@@ -29,13 +29,21 @@ void dynamic_macro_led_blink(void) {
 
 /* User hooks for Dynamic Macros */
 
-__attribute__((weak)) void dynamic_macro_record_start_user(void) { dynamic_macro_led_blink(); }
+__attribute__((weak)) void dynamic_macro_record_start_user(void) {
+    dynamic_macro_led_blink();
+}
 
-__attribute__((weak)) void dynamic_macro_play_user(int8_t direction) { dynamic_macro_led_blink(); }
+__attribute__((weak)) void dynamic_macro_play_user(int8_t direction) {
+    dynamic_macro_led_blink();
+}
 
-__attribute__((weak)) void dynamic_macro_record_key_user(int8_t direction, keyrecord_t *record) { dynamic_macro_led_blink(); }
+__attribute__((weak)) void dynamic_macro_record_key_user(int8_t direction, keyrecord_t *record) {
+    dynamic_macro_led_blink();
+}
 
-__attribute__((weak)) void dynamic_macro_record_end_user(int8_t direction) { dynamic_macro_led_blink(); }
+__attribute__((weak)) void dynamic_macro_record_end_user(int8_t direction) {
+    dynamic_macro_led_blink();
+}
 
 /* Convenience macros used for retrieving the debug info. All of them
  * need a `direction` variable accessible at the call site.
@@ -82,7 +90,7 @@ void dynamic_macro_play(keyrecord_t *macro_buffer, keyrecord_t *macro_end, int8_
 
     clear_keyboard();
 
-    layer_state = saved_layer_state;
+    layer_state_set(saved_layer_state);
 
     dynamic_macro_play_user(direction);
 }
diff --git a/quantum/process_keycode/process_joystick.c b/quantum/process_keycode/process_joystick.c
index fa9c2c1dbc..2fb092c573 100644
--- a/quantum/process_keycode/process_joystick.c
+++ b/quantum/process_keycode/process_joystick.c
@@ -74,7 +74,9 @@ void restorePinState(pin_t pin, uint16_t restoreState) {
 #endif
 }
 
-__attribute__((weak)) bool process_joystick_analogread() { return process_joystick_analogread_quantum(); }
+__attribute__((weak)) bool process_joystick_analogread() {
+    return process_joystick_analogread_quantum();
+}
 
 bool process_joystick_analogread_quantum() {
 #if JOYSTICK_AXES_COUNT > 0
diff --git a/quantum/process_keycode/process_key_override.c b/quantum/process_keycode/process_key_override.c
index 09b2725079..ad9683d106 100644
--- a/quantum/process_keycode/process_key_override.c
+++ b/quantum/process_keycode/process_key_override.c
@@ -106,7 +106,9 @@ void key_override_toggle(void) {
     }
 }
 
-bool key_override_is_enabled(void) { return enabled; }
+bool key_override_is_enabled(void) {
+    return enabled;
+}
 
 // Returns whether the modifiers that are pressed are such that the override should activate
 static bool key_override_matches_active_modifiers(const key_override_t *override, const uint8_t mods) {
@@ -150,7 +152,7 @@ static void schedule_deferred_register(const uint16_t keycode) {
     } else {
         // Wait a very short time when a modifier event triggers the override to avoid false activations when e.g. a modifier is pressed just before a key is released (with the intention of pairing the modifier with a different key), or a modifier is lifted shortly before the trigger key is lifted. Operating systems by default reject modifier-events that happen very close to a non-modifier event.
         defer_reference_time = timer_read32();
-        defer_delay          = 50;  // 50ms
+        defer_delay          = 50; // 50ms
     }
     deferred_register = keycode;
 }
@@ -174,8 +176,8 @@ const key_override_t *clear_active_override(const bool allow_reregister) {
 
     const uint8_t mod_free_replacement = clear_mods_from(active_override->replacement);
 
-    bool unregister_replacement = mod_free_replacement != KC_NO &&    // KC_NO is never registered
-                                  mod_free_replacement < SAFE_RANGE;  // Custom keycodes are never registered
+    bool unregister_replacement = mod_free_replacement != KC_NO &&   // KC_NO is never registered
+                                  mod_free_replacement < SAFE_RANGE; // Custom keycodes are never registered
 
     // Try firing the custom handler
     if (active_override->custom_action != NULL) {
@@ -195,11 +197,11 @@ const key_override_t *clear_active_override(const bool allow_reregister) {
 
     const uint16_t trigger = active_override->trigger;
 
-    const bool reregister_trigger = allow_reregister &&                                                   // Check if allowed from caller
-                                    (active_override->options & ko_option_no_reregister_trigger) == 0 &&  // Check if override allows
-                                    active_override_trigger_is_down &&                                    // Check if trigger is even down
-                                    trigger != KC_NO &&                                                   // KC_NO is never registered
-                                    trigger < SAFE_RANGE;                                                 // A custom keycode should not be registered
+    const bool reregister_trigger = allow_reregister &&                                                  // Check if allowed from caller
+                                    (active_override->options & ko_option_no_reregister_trigger) == 0 && // Check if override allows
+                                    active_override_trigger_is_down &&                                   // Check if trigger is even down
+                                    trigger != KC_NO &&                                                  // KC_NO is never registered
+                                    trigger < SAFE_RANGE;                                                // A custom keycode should not be registered
 
     // Optionally re-register the trigger if it is still down
     if (reregister_trigger) {
@@ -336,8 +338,8 @@ static bool try_activating_override(const uint16_t keycode, const uint8_t layer,
 
         const uint16_t mod_free_replacement = clear_mods_from(override->replacement);
 
-        bool register_replacement = mod_free_replacement != KC_NO &&    // KC_NO is never registered
-                                    mod_free_replacement < SAFE_RANGE;  // Custom keycodes are never registered
+        bool register_replacement = mod_free_replacement != KC_NO &&   // KC_NO is never registered
+                                    mod_free_replacement < SAFE_RANGE; // Custom keycodes are never registered
 
         // Try firing the custom handler
         if (override->custom_action != NULL) {
diff --git a/quantum/process_keycode/process_leader.c b/quantum/process_keycode/process_leader.c
index cf63f25141..c2fd02e5c7 100644
--- a/quantum/process_keycode/process_leader.c
+++ b/quantum/process_keycode/process_leader.c
@@ -51,13 +51,13 @@ bool process_leader(uint16_t keycode, keyrecord_t *record) {
         if (leading) {
 #    ifndef LEADER_NO_TIMEOUT
             if (timer_elapsed(leader_time) < LEADER_TIMEOUT)
-#    endif  // LEADER_NO_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;
                 }
-#    endif  // LEADER_KEY_STRICT_KEY_PROCESSING
+#    endif // LEADER_KEY_STRICT_KEY_PROCESSING
                 if (leader_sequence_size < (sizeof(leader_sequence) / sizeof(leader_sequence[0]))) {
                     leader_sequence[leader_sequence_size] = keycode;
                     leader_sequence_size++;
diff --git a/quantum/process_keycode/process_magic.c b/quantum/process_keycode/process_magic.c
index 6332be647c..10161adda3 100644
--- a/quantum/process_keycode/process_magic.c
+++ b/quantum/process_keycode/process_magic.c
@@ -76,7 +76,7 @@ bool process_magic(uint16_t keycode, keyrecord_t *record) {
                         keymap_config.swap_backslash_backspace = true;
                         break;
                     case MAGIC_HOST_NKRO:
-                        clear_keyboard();  // clear first buffer to prevent stuck keys
+                        clear_keyboard(); // clear first buffer to prevent stuck keys
                         keymap_config.nkro = true;
                         break;
                     case MAGIC_SWAP_ALT_GUI:
@@ -119,7 +119,7 @@ bool process_magic(uint16_t keycode, keyrecord_t *record) {
                         keymap_config.swap_backslash_backspace = false;
                         break;
                     case MAGIC_UNHOST_NKRO:
-                        clear_keyboard();  // clear first buffer to prevent stuck keys
+                        clear_keyboard(); // clear first buffer to prevent stuck keys
                         keymap_config.nkro = false;
                         break;
                     case MAGIC_UNSWAP_ALT_GUI:
@@ -157,7 +157,7 @@ bool process_magic(uint16_t keycode, keyrecord_t *record) {
 #endif
                         break;
                     case MAGIC_TOGGLE_NKRO:
-                        clear_keyboard();  // clear first buffer to prevent stuck keys
+                        clear_keyboard(); // clear first buffer to prevent stuck keys
                         keymap_config.nkro = !keymap_config.nkro;
                         break;
                     case MAGIC_EE_HANDS_LEFT:
@@ -175,7 +175,7 @@ bool process_magic(uint16_t keycode, keyrecord_t *record) {
                 }
 
                 eeconfig_update_keymap(keymap_config.raw);
-                clear_keyboard();  // clear to prevent stuck keys
+                clear_keyboard(); // clear to prevent stuck keys
 
                 return false;
         }
diff --git a/quantum/process_keycode/process_midi.c b/quantum/process_keycode/process_midi.c
index 9632d2b757..c49c31a525 100644
--- a/quantum/process_keycode/process_midi.c
+++ b/quantum/process_keycode/process_midi.c
@@ -22,13 +22,19 @@
 
 #    ifdef MIDI_BASIC
 
-void process_midi_basic_noteon(uint8_t note) { midi_send_noteon(&midi_device, 0, note, 127); }
+void process_midi_basic_noteon(uint8_t note) {
+    midi_send_noteon(&midi_device, 0, note, 127);
+}
 
-void process_midi_basic_noteoff(uint8_t note) { midi_send_noteoff(&midi_device, 0, note, 0); }
+void process_midi_basic_noteoff(uint8_t note) {
+    midi_send_noteoff(&midi_device, 0, note, 0);
+}
 
-void process_midi_all_notes_off(void) { midi_send_cc(&midi_device, 0, 0x7B, 0); }
+void process_midi_all_notes_off(void) {
+    midi_send_cc(&midi_device, 0, 0x7B, 0);
+}
 
-#    endif  // MIDI_BASIC
+#    endif // MIDI_BASIC
 
 #    ifdef MIDI_ADVANCED
 
@@ -41,7 +47,9 @@ static int8_t   midi_modulation_step;
 static uint16_t midi_modulation_timer;
 midi_config_t   midi_config;
 
-inline uint8_t compute_velocity(uint8_t setting) { return setting * (128 / (MIDI_VELOCITY_MAX - MIDI_VELOCITY_MIN)); }
+inline uint8_t compute_velocity(uint8_t setting) {
+    return setting * (128 / (MIDI_VELOCITY_MAX - MIDI_VELOCITY_MIN));
+}
 
 void midi_init(void) {
     midi_config.octave              = MI_OCT_2 - MIDI_OCTAVE_MIN;
@@ -60,7 +68,9 @@ void midi_init(void) {
     midi_modulation_timer = 0;
 }
 
-uint8_t midi_compute_note(uint16_t keycode) { return 12 * midi_config.octave + (keycode - MIDI_TONE_MIN) + midi_config.transpose; }
+uint8_t midi_compute_note(uint16_t keycode) {
+    return 12 * midi_config.octave + (keycode - MIDI_TONE_MIN) + midi_config.transpose;
+}
 
 bool process_midi(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
@@ -238,7 +248,7 @@ bool process_midi(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-#    endif  // MIDI_ADVANCED
+#    endif // MIDI_ADVANCED
 
 void midi_task(void) {
     midi_device_process(&midi_device);
@@ -263,4 +273,4 @@ void midi_task(void) {
 #    endif
 }
 
-#endif  // MIDI_ENABLE
+#endif // MIDI_ENABLE
diff --git a/quantum/process_keycode/process_midi.h b/quantum/process_keycode/process_midi.h
index 68c6eda666..e528c6ec0c 100644
--- a/quantum/process_keycode/process_midi.h
+++ b/quantum/process_keycode/process_midi.h
@@ -49,6 +49,6 @@ bool process_midi(uint16_t keycode, keyrecord_t *record);
 #        define MIDI_TONE_COUNT (MIDI_TONE_MAX - MIDI_TONE_MIN + 1)
 
 uint8_t midi_compute_note(uint16_t keycode);
-#    endif  // MIDI_ADVANCED
+#    endif // MIDI_ADVANCED
 
-#endif  // MIDI_ENABLE
+#endif // MIDI_ENABLE
diff --git a/quantum/process_keycode/process_music.c b/quantum/process_keycode/process_music.c
index 6822c5e289..eeec0c28a4 100644
--- a/quantum/process_keycode/process_music.c
+++ b/quantum/process_keycode/process_music.c
@@ -146,7 +146,7 @@ bool process_music(uint16_t keycode, keyrecord_t *record) {
 
     if (music_activated || midi_activated) {
         if (record->event.pressed) {
-            if (keycode == KC_LEFT_CTRL) {  // Start recording
+            if (keycode == KC_LEFT_CTRL) { // Start recording
                 music_all_notes_off();
                 music_sequence_recording = true;
                 music_sequence_recorded  = false;
@@ -155,9 +155,9 @@ bool process_music(uint16_t keycode, keyrecord_t *record) {
                 return false;
             }
 
-            if (keycode == KC_LEFT_ALT) {  // Stop recording/playing
+            if (keycode == KC_LEFT_ALT) { // Stop recording/playing
                 music_all_notes_off();
-                if (music_sequence_recording) {  // was recording
+                if (music_sequence_recording) { // was recording
                     music_sequence_recorded = true;
                 }
                 music_sequence_recording = false;
@@ -165,7 +165,7 @@ bool process_music(uint16_t keycode, keyrecord_t *record) {
                 return false;
             }
 
-            if (keycode == KC_LEFT_GUI && music_sequence_recorded) {  // Start playing
+            if (keycode == KC_LEFT_GUI && music_sequence_recorded) { // Start playing
                 music_all_notes_off();
                 music_sequence_recording = false;
                 music_sequence_playing   = true;
@@ -230,11 +230,17 @@ bool music_mask(uint16_t keycode) {
 #    endif
 }
 
-__attribute__((weak)) bool music_mask_kb(uint16_t keycode) { return music_mask_user(keycode); }
+__attribute__((weak)) bool music_mask_kb(uint16_t keycode) {
+    return music_mask_user(keycode);
+}
 
-__attribute__((weak)) bool music_mask_user(uint16_t keycode) { return keycode < 0xFF; }
+__attribute__((weak)) bool music_mask_user(uint16_t keycode) {
+    return keycode < 0xFF;
+}
 
-bool is_music_on(void) { return (music_activated != 0); }
+bool is_music_on(void) {
+    return (music_activated != 0);
+}
 
 void music_toggle(void) {
     if (!music_activated) {
@@ -260,7 +266,9 @@ void music_off(void) {
 #    endif
 }
 
-bool is_midi_on(void) { return (midi_activated != 0); }
+bool is_midi_on(void) {
+    return (midi_activated != 0);
+}
 
 void midi_toggle(void) {
     if (!midi_activated) {
@@ -315,4 +323,4 @@ __attribute__((weak)) void midi_on_user() {}
 
 __attribute__((weak)) void music_scale_user() {}
 
-#endif  // defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC))
+#endif // defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC))
diff --git a/quantum/process_keycode/process_music.h b/quantum/process_keycode/process_music.h
index e275cd9d26..83726a05ba 100644
--- a/quantum/process_keycode/process_music.h
+++ b/quantum/process_keycode/process_music.h
@@ -51,8 +51,10 @@ bool music_mask_kb(uint16_t keycode);
 bool music_mask_user(uint16_t keycode);
 
 #    ifndef SCALE
-#        define SCALE \
-            (int8_t[]) { 0 + (12 * 0), 2 + (12 * 0), 4 + (12 * 0), 5 + (12 * 0), 7 + (12 * 0), 9 + (12 * 0), 11 + (12 * 0), 0 + (12 * 1), 2 + (12 * 1), 4 + (12 * 1), 5 + (12 * 1), 7 + (12 * 1), 9 + (12 * 1), 11 + (12 * 1), 0 + (12 * 2), 2 + (12 * 2), 4 + (12 * 2), 5 + (12 * 2), 7 + (12 * 2), 9 + (12 * 2), 11 + (12 * 2), 0 + (12 * 3), 2 + (12 * 3), 4 + (12 * 3), 5 + (12 * 3), 7 + (12 * 3), 9 + (12 * 3), 11 + (12 * 3), 0 + (12 * 4), 2 + (12 * 4), 4 + (12 * 4), 5 + (12 * 4), 7 + (12 * 4), 9 + (12 * 4), 11 + (12 * 4), }
+#        define SCALE                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          \
+            (int8_t[]) {                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       \
+                0 + (12 * 0), 2 + (12 * 0), 4 + (12 * 0), 5 + (12 * 0), 7 + (12 * 0), 9 + (12 * 0), 11 + (12 * 0), 0 + (12 * 1), 2 + (12 * 1), 4 + (12 * 1), 5 + (12 * 1), 7 + (12 * 1), 9 + (12 * 1), 11 + (12 * 1), 0 + (12 * 2), 2 + (12 * 2), 4 + (12 * 2), 5 + (12 * 2), 7 + (12 * 2), 9 + (12 * 2), 11 + (12 * 2), 0 + (12 * 3), 2 + (12 * 3), 4 + (12 * 3), 5 + (12 * 3), 7 + (12 * 3), 9 + (12 * 3), 11 + (12 * 3), 0 + (12 * 4), 2 + (12 * 4), 4 + (12 * 4), 5 + (12 * 4), 7 + (12 * 4), 9 + (12 * 4), 11 + (12 * 4), \
+            }
 #    endif
 
-#endif  // defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC))
+#endif // defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC))
diff --git a/quantum/process_keycode/process_printer.c b/quantum/process_keycode/process_printer.c
index 0801f078ef..6dd1f28c9b 100644
--- a/quantum/process_keycode/process_printer.c
+++ b/quantum/process_keycode/process_printer.c
@@ -26,7 +26,9 @@ void enable_printing(void) {
     uart_init(19200);
 }
 
-void disable_printing(void) { printing_enabled = false; }
+void disable_printing(void) {
+    printing_enabled = false;
+}
 
 uint8_t shifted_numbers[10] = {0x21, 0x40, 0x23, 0x24, 0x25, 0x5E, 0x26, 0x2A, 0x28, 0x29};
 
@@ -41,7 +43,8 @@ void print_char(char c) {
 }
 
 void print_string(char c[]) {
-    for (uint8_t i = 0; i < strlen(c); i++) print_char(c[i]);
+    for (uint8_t i = 0; i < strlen(c); i++)
+        print_char(c[i]);
 }
 
 void print_box_string(const char text[]) {
diff --git a/quantum/process_keycode/process_printer_bb.c b/quantum/process_keycode/process_printer_bb.c
index 6c91bd27ef..88a9f33994 100644
--- a/quantum/process_keycode/process_printer_bb.c
+++ b/quantum/process_keycode/process_printer_bb.c
@@ -25,13 +25,21 @@ uint8_t character_shift  = 0;
 #define SERIAL_PIN_MASK _BV(PD3)
 #define SERIAL_DELAY 52
 
-inline static void serial_delay(void) { _delay_us(SERIAL_DELAY); }
+inline static void serial_delay(void) {
+    _delay_us(SERIAL_DELAY);
+}
 
-inline static void serial_high(void) { SERIAL_PIN_PORT |= SERIAL_PIN_MASK; }
+inline static void serial_high(void) {
+    SERIAL_PIN_PORT |= SERIAL_PIN_MASK;
+}
 
-inline static void serial_low(void) { SERIAL_PIN_PORT &= ~SERIAL_PIN_MASK; }
+inline static void serial_low(void) {
+    SERIAL_PIN_PORT &= ~SERIAL_PIN_MASK;
+}
 
-inline static void serial_output(void) { SERIAL_PIN_DDR |= SERIAL_PIN_MASK; }
+inline static void serial_output(void) {
+    SERIAL_PIN_DDR |= SERIAL_PIN_MASK;
+}
 
 void enable_printing() {
     printing_enabled = true;
@@ -39,7 +47,9 @@ void enable_printing() {
     serial_high();
 }
 
-void disable_printing() { printing_enabled = false; }
+void disable_printing() {
+    printing_enabled = false;
+}
 
 uint8_t shifted_numbers[10] = {0x21, 0x40, 0x23, 0x24, 0x25, 0x5E, 0x26, 0x2A, 0x28, 0x29};
 
@@ -61,7 +71,8 @@ void print_char(char c) {
 }
 
 void print_string(char c[]) {
-    for (uint8_t i = 0; i < strlen(c); i++) print_char(c[i]);
+    for (uint8_t i = 0; i < strlen(c); i++)
+        print_char(c[i]);
 }
 
 bool process_printer(uint16_t keycode, keyrecord_t *record) {
diff --git a/quantum/process_keycode/process_steno.c b/quantum/process_keycode/process_steno.c
index 5d0bb313b4..12ee898212 100644
--- a/quantum/process_keycode/process_steno.c
+++ b/quantum/process_keycode/process_steno.c
@@ -102,11 +102,17 @@ void steno_set_mode(steno_mode_t new_mode) {
 /* override to intercept chords right before they get sent.
  * return zero to suppress normal sending behavior.
  */
-__attribute__((weak)) bool send_steno_chord_user(steno_mode_t mode, uint8_t chord[6]) { return true; }
+__attribute__((weak)) bool send_steno_chord_user(steno_mode_t mode, uint8_t chord[6]) {
+    return true;
+}
 
-__attribute__((weak)) bool postprocess_steno_user(uint16_t keycode, keyrecord_t *record, steno_mode_t mode, uint8_t chord[6], int8_t pressed) { return true; }
+__attribute__((weak)) bool postprocess_steno_user(uint16_t keycode, keyrecord_t *record, steno_mode_t mode, uint8_t chord[6], int8_t pressed) {
+    return true;
+}
 
-__attribute__((weak)) bool process_steno_user(uint16_t keycode, keyrecord_t *record) { return true; }
+__attribute__((weak)) bool process_steno_user(uint16_t keycode, keyrecord_t *record) {
+    return true;
+}
 
 static void send_steno_chord(void) {
     if (send_steno_chord_user(mode, chord)) {
@@ -114,11 +120,11 @@ static void send_steno_chord(void) {
             case STENO_MODE_BOLT:
                 send_steno_state(BOLT_STATE_SIZE, false);
 #ifdef VIRTSER_ENABLE
-                virtser_send(0);  // terminating byte
+                virtser_send(0); // terminating byte
 #endif
                 break;
             case STENO_MODE_GEMINI:
-                chord[0] |= 0x80;  // Indicate start of packet
+                chord[0] |= 0x80; // Indicate start of packet
                 send_steno_state(GEMINI_STATE_SIZE, true);
                 break;
         }
@@ -126,9 +132,13 @@ static void send_steno_chord(void) {
     steno_clear_state();
 }
 
-uint8_t *steno_get_state(void) { return &state[0]; }
+uint8_t *steno_get_state(void) {
+    return &state[0];
+}
 
-uint8_t *steno_get_chord(void) { return &chord[0]; }
+uint8_t *steno_get_chord(void) {
+    return &chord[0];
+}
 
 static bool update_state_bolt(uint8_t key, bool press) {
     uint8_t boltcode = pgm_read_byte(boltmap + key);
diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c
index c707fdea30..e99119b2ae 100644
--- a/quantum/process_keycode/process_tap_dance.c
+++ b/quantum/process_keycode/process_tap_dance.c
@@ -86,7 +86,9 @@ static inline void _process_tap_dance_action_fn(qk_tap_dance_state_t *state, voi
     }
 }
 
-static inline void process_tap_dance_action_on_each_tap(qk_tap_dance_action_t *action) { _process_tap_dance_action_fn(&action->state, action->user_data, action->fn.on_each_tap); }
+static inline void process_tap_dance_action_on_each_tap(qk_tap_dance_action_t *action) {
+    _process_tap_dance_action_fn(&action->state, action->user_data, action->fn.on_each_tap);
+}
 
 static inline void process_tap_dance_action_on_dance_finished(qk_tap_dance_action_t *action) {
     if (action->state.finished) return;
@@ -173,7 +175,7 @@ void tap_dance_task() {
             tap_user_defined = action->custom_tapping_term;
         } else {
 #ifdef TAPPING_TERM_PER_KEY
-            tap_user_defined = get_tapping_term(action->state.keycode, NULL);
+            tap_user_defined = get_tapping_term(action->state.keycode, &(keyrecord_t){});
 #else
             tap_user_defined = TAPPING_TERM;
 #endif
diff --git a/quantum/process_keycode/process_terminal.c b/quantum/process_keycode/process_terminal.c
index a059f3a521..da1c4d506f 100644
--- a/quantum/process_keycode/process_terminal.c
+++ b/quantum/process_keycode/process_terminal.c
@@ -27,12 +27,12 @@
 bool terminal_enabled = false;
 char buffer[80]       = "";
 char cmd_buffer[CMD_BUFF_SIZE][80];
-bool cmd_buffer_enabled = true;  // replace with ifdef?
+bool cmd_buffer_enabled = true; // replace with ifdef?
 char newline[2]         = "\n";
 char arguments[6][20];
 bool firstTime = true;
 
-short int current_cmd_buffer_pos = 0;  // used for up/down arrows - keeps track of where you are in the command buffer
+short int current_cmd_buffer_pos = 0; // used for up/down arrows - keeps track of where you are in the command buffer
 
 __attribute__((weak)) const char terminal_prompt[8] = "> ";
 
@@ -59,7 +59,8 @@ void enable_terminal(void) {
     terminal_enabled = true;
     strcpy(buffer, "");
     memset(cmd_buffer, 0, CMD_BUFF_SIZE * 80);
-    for (int i = 0; i < 6; i++) strcpy(arguments[i], "");
+    for (int i = 0; i < 6; i++)
+        strcpy(arguments[i], "");
     // select all text to start over
     // SEND_STRING(SS_LCTL("a"));
     send_string(terminal_prompt);
@@ -160,7 +161,7 @@ void print_cmd_buff(void) {
     for (int i = 0; i < CMD_BUFF_SIZE; i++) {
         char tmpChar = ' ';
         itoa(i, &tmpChar, 10);
-        const char *tmpCnstCharStr = &tmpChar;  // because sned_string wont take a normal char *
+        const char *tmpCnstCharStr = &tmpChar; // because sned_string wont take a normal char *
         send_string(tmpCnstCharStr);
         SEND_STRING(". ");
         send_string(cmd_buffer[i]);
@@ -185,7 +186,7 @@ void terminal_help(void) {
 }
 
 void command_not_found(void) {
-    wait_ms(50);  // sometimes buffer isnt grabbed quick enough
+    wait_ms(50); // sometimes buffer isnt grabbed quick enough
     SEND_STRING("command \"");
     send_string(buffer);
     SEND_STRING("\" not found\n");
@@ -217,15 +218,16 @@ void process_terminal_command(void) {
 
     if (terminal_enabled) {
         strcpy(buffer, "");
-        for (int i = 0; i < 6; i++) strcpy(arguments[i], "");
+        for (int i = 0; i < 6; i++)
+            strcpy(arguments[i], "");
         SEND_STRING(SS_TAP(X_HOME));
         send_string(terminal_prompt);
     }
 }
 void check_pos(void) {
-    if (current_cmd_buffer_pos >= CMD_BUFF_SIZE) {  // if over the top, move it back down to the top of the buffer so you can climb back down...
+    if (current_cmd_buffer_pos >= CMD_BUFF_SIZE) { // if over the top, move it back down to the top of the buffer so you can climb back down...
         current_cmd_buffer_pos = CMD_BUFF_SIZE - 1;
-    } else if (current_cmd_buffer_pos < 0) {  //...and if you fall under the bottom of the buffer, reset back to 0 so you can climb back up
+    } else if (current_cmd_buffer_pos < 0) { //...and if you fall under the bottom of the buffer, reset back to 0 so you can climb back up
         current_cmd_buffer_pos = 0;
     }
 }
@@ -278,33 +280,33 @@ bool process_terminal(uint16_t keycode, keyrecord_t *record) {
                 case KC_RIGHT:
                     return false;
                     break;
-                case KC_UP:                                             // 0 = recent
-                    check_pos();                                        // check our current buffer position is valid
-                    if (current_cmd_buffer_pos <= CMD_BUFF_SIZE - 1) {  // once we get to the top, dont do anything
+                case KC_UP:                                            // 0 = recent
+                    check_pos();                                       // check our current buffer position is valid
+                    if (current_cmd_buffer_pos <= CMD_BUFF_SIZE - 1) { // once we get to the top, dont do anything
                         str_len = strlen(buffer);
                         for (int i = 0; i < str_len; ++i) {
-                            send_string(SS_TAP(X_BSPACE));  // clear w/e is on the line already
+                            send_string(SS_TAP(X_BSPACE)); // clear w/e is on the line already
                             // process_terminal(KC_BACKSPACE,record);
                         }
                         strncpy(buffer, cmd_buffer[current_cmd_buffer_pos], 80);
 
                         send_string(buffer);
-                        ++current_cmd_buffer_pos;  // get ready to access the above cmd if up/down is pressed again
+                        ++current_cmd_buffer_pos; // get ready to access the above cmd if up/down is pressed again
                     }
                     return false;
                     break;
                 case KC_DOWN:
                     check_pos();
-                    if (current_cmd_buffer_pos >= 0) {  // once we get to the bottom, dont do anything
+                    if (current_cmd_buffer_pos >= 0) { // once we get to the bottom, dont do anything
                         str_len = strlen(buffer);
                         for (int i = 0; i < str_len; ++i) {
-                            send_string(SS_TAP(X_BSPACE));  // clear w/e is on the line already
+                            send_string(SS_TAP(X_BSPACE)); // clear w/e is on the line already
                             // process_terminal(KC_BACKSPACE,record);
                         }
                         strncpy(buffer, cmd_buffer[current_cmd_buffer_pos], 79);
 
                         send_string(buffer);
-                        --current_cmd_buffer_pos;  // get ready to access the above cmd if down/up is pressed again
+                        --current_cmd_buffer_pos; // get ready to access the above cmd if down/up is pressed again
                     }
                     return false;
                     break;
diff --git a/quantum/process_keycode/process_ucis.c b/quantum/process_keycode/process_ucis.c
index d084d2b66c..6a8d8f0ff6 100644
--- a/quantum/process_keycode/process_ucis.c
+++ b/quantum/process_keycode/process_ucis.c
@@ -27,7 +27,7 @@ void qk_ucis_start(void) {
 
 __attribute__((weak)) void qk_ucis_start_user(void) {
     unicode_input_start();
-    register_hex(0x2328);  // ⌨
+    register_hex(0x2328); // ⌨
     unicode_input_finish();
 }
 
diff --git a/quantum/process_keycode/process_unicode_common.c b/quantum/process_keycode/process_unicode_common.c
index 7685bb1c99..46b77e14ba 100644
--- a/quantum/process_keycode/process_unicode_common.c
+++ b/quantum/process_keycode/process_unicode_common.c
@@ -54,7 +54,9 @@ void unicode_input_mode_init(void) {
     dprintf("Unicode input mode init to: %u\n", unicode_config.input_mode);
 }
 
-uint8_t get_unicode_input_mode(void) { return unicode_config.input_mode; }
+uint8_t get_unicode_input_mode(void) {
+    return unicode_config.input_mode;
+}
 
 void set_unicode_input_mode(uint8_t mode) {
     unicode_config.input_mode = mode;
@@ -76,7 +78,9 @@ void cycle_unicode_input_mode(int8_t offset) {
 #endif
 }
 
-void persist_unicode_input_mode(void) { eeprom_update_byte(EECONFIG_UNICODEMODE, unicode_config.input_mode); }
+void persist_unicode_input_mode(void) {
+    eeprom_update_byte(EECONFIG_UNICODEMODE, unicode_config.input_mode);
+}
 
 __attribute__((weak)) void unicode_input_start(void) {
     unicode_saved_caps_lock = host_keyboard_led_state().caps_lock;
@@ -90,8 +94,8 @@ __attribute__((weak)) void unicode_input_start(void) {
         tap_code(KC_CAPS_LOCK);
     }
 
-    unicode_saved_mods = get_mods();  // Save current mods
-    clear_mods();                     // Unregister mods to start from a clean state
+    unicode_saved_mods = get_mods(); // Save current mods
+    clear_mods();                    // Unregister mods to start from a clean state
 
     switch (unicode_config.input_mode) {
         case UC_MAC:
@@ -140,7 +144,7 @@ __attribute__((weak)) void unicode_input_finish(void) {
             break;
     }
 
-    set_mods(unicode_saved_mods);  // Reregister previously set mods
+    set_mods(unicode_saved_mods); // Reregister previously set mods
 }
 
 __attribute__((weak)) void unicode_input_cancel(void) {
@@ -165,7 +169,7 @@ __attribute__((weak)) void unicode_input_cancel(void) {
             break;
     }
 
-    set_mods(unicode_saved_mods);  // Reregister previously set mods
+    set_mods(unicode_saved_mods); // Reregister previously set mods
 }
 
 // clang-format off
@@ -262,16 +266,16 @@ void send_unicode_hex_string(const char *str) {
 static const char *decode_utf8(const char *str, int32_t *code_point) {
     const char *next;
 
-    if (str[0] < 0x80) {  // U+0000-007F
+    if (str[0] < 0x80) { // U+0000-007F
         *code_point = str[0];
         next        = str + 1;
-    } else if ((str[0] & 0xE0) == 0xC0) {  // U+0080-07FF
+    } else if ((str[0] & 0xE0) == 0xC0) { // U+0080-07FF
         *code_point = ((int32_t)(str[0] & 0x1F) << 6) | ((int32_t)(str[1] & 0x3F) << 0);
         next        = str + 2;
-    } else if ((str[0] & 0xF0) == 0xE0) {  // U+0800-FFFF
+    } else if ((str[0] & 0xF0) == 0xE0) { // U+0800-FFFF
         *code_point = ((int32_t)(str[0] & 0x0F) << 12) | ((int32_t)(str[1] & 0x3F) << 6) | ((int32_t)(str[2] & 0x3F) << 0);
         next        = str + 3;
-    } else if ((str[0] & 0xF8) == 0xF0 && (str[0] <= 0xF4)) {  // U+10000-10FFFF
+    } else if ((str[0] & 0xF8) == 0xF0 && (str[0] <= 0xF4)) { // U+10000-10FFFF
         *code_point = ((int32_t)(str[0] & 0x07) << 18) | ((int32_t)(str[1] & 0x3F) << 12) | ((int32_t)(str[2] & 0x3F) << 6) | ((int32_t)(str[3] & 0x3F) << 0);
         next        = str + 4;
     } else {
diff --git a/quantum/process_keycode/process_unicode_common.h b/quantum/process_keycode/process_unicode_common.h
index 72defb445e..1a6607c757 100644
--- a/quantum/process_keycode/process_unicode_common.h
+++ b/quantum/process_keycode/process_unicode_common.h
@@ -59,12 +59,12 @@
 #define UC_OSX UC_MAC
 
 enum unicode_input_modes {
-    UC_MAC,    // macOS using Unicode Hex Input
-    UC_LNX,    // Linux using IBus
-    UC_WIN,    // Windows using EnableHexNumpad
-    UC_BSD,    // BSD (not implemented)
-    UC_WINC,   // Windows using WinCompose (https://github.com/samhocevar/wincompose)
-    UC__COUNT  // Number of available input modes (always leave at the end)
+    UC_MAC,   // macOS using Unicode Hex Input
+    UC_LNX,   // Linux using IBus
+    UC_WIN,   // Windows using EnableHexNumpad
+    UC_BSD,   // BSD (not implemented)
+    UC_WINC,  // Windows using WinCompose (https://github.com/samhocevar/wincompose)
+    UC__COUNT // Number of available input modes (always leave at the end)
 };
 
 typedef union {
diff --git a/quantum/programmable_button.c b/quantum/programmable_button.c
index be828fd17c..a3ef42d82b 100644
--- a/quantum/programmable_button.c
+++ b/quantum/programmable_button.c
@@ -22,16 +22,30 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 static uint32_t programmable_button_report = 0;
 
-void programmable_button_clear(void) { programmable_button_report = 0; }
+void programmable_button_clear(void) {
+    programmable_button_report = 0;
+}
 
-void programmable_button_send(void) { host_programmable_button_send(programmable_button_report); }
+void programmable_button_send(void) {
+    host_programmable_button_send(programmable_button_report);
+}
 
-void programmable_button_on(uint8_t index) { programmable_button_report |= REPORT_BIT(index); }
+void programmable_button_on(uint8_t index) {
+    programmable_button_report |= REPORT_BIT(index);
+}
 
-void programmable_button_off(uint8_t index) { programmable_button_report &= ~REPORT_BIT(index); }
+void programmable_button_off(uint8_t index) {
+    programmable_button_report &= ~REPORT_BIT(index);
+}
 
-bool programmable_button_is_on(uint8_t index) { return !!(programmable_button_report & REPORT_BIT(index)); };
+bool programmable_button_is_on(uint8_t index) {
+    return !!(programmable_button_report & REPORT_BIT(index));
+};
 
-uint32_t programmable_button_get_report(void) { return programmable_button_report; };
+uint32_t programmable_button_get_report(void) {
+    return programmable_button_report;
+};
 
-void programmable_button_set_report(uint32_t report) { programmable_button_report = report; }
+void programmable_button_set_report(uint32_t report) {
+    programmable_button_report = report;
+}
diff --git a/quantum/quantum.c b/quantum/quantum.c
index ca3e4027dc..dce41c08ae 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -56,7 +56,7 @@ uint8_t extract_mod_bits(uint16_t code) {
 
     uint8_t mods_to_send = 0;
 
-    if (code & QK_RMODS_MIN) {  // Right mod flag is set
+    if (code & QK_RMODS_MIN) { // Right mod flag is set
         if (code & QK_LCTL) mods_to_send |= MOD_BIT(KC_RIGHT_CTRL);
         if (code & QK_LSFT) mods_to_send |= MOD_BIT(KC_RIGHT_SHIFT);
         if (code & QK_LALT) mods_to_send |= MOD_BIT(KC_RIGHT_ALT);
@@ -71,7 +71,9 @@ uint8_t extract_mod_bits(uint16_t code) {
     return mods_to_send;
 }
 
-void do_code16(uint16_t code, void (*f)(uint8_t)) { f(extract_mod_bits(code)); }
+void do_code16(uint16_t code, void (*f)(uint8_t)) {
+    f(extract_mod_bits(code));
+}
 
 __attribute__((weak)) void register_code16(uint16_t code) {
     if (IS_MOD(code) || code == KC_NO) {
@@ -101,13 +103,21 @@ __attribute__((weak)) void tap_code16(uint16_t code) {
     unregister_code16(code);
 }
 
-__attribute__((weak)) bool process_action_kb(keyrecord_t *record) { return true; }
+__attribute__((weak)) bool process_action_kb(keyrecord_t *record) {
+    return true;
+}
 
-__attribute__((weak)) bool process_record_kb(uint16_t keycode, keyrecord_t *record) { return process_record_user(keycode, record); }
+__attribute__((weak)) bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    return process_record_user(keycode, record);
+}
 
-__attribute__((weak)) bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; }
+__attribute__((weak)) bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    return true;
+}
 
-__attribute__((weak)) void post_process_record_kb(uint16_t keycode, keyrecord_t *record) { post_process_record_user(keycode, record); }
+__attribute__((weak)) void post_process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    post_process_record_user(keycode, record);
+}
 
 __attribute__((weak)) void post_process_record_user(uint16_t keycode, keyrecord_t *record) {}
 
@@ -123,7 +133,8 @@ void reset_keyboard(void) {
     uint16_t timer_start = timer_read();
     PLAY_SONG(goodbye_song);
     shutdown_user();
-    while (timer_elapsed(timer_start) < 250) wait_ms(1);
+    while (timer_elapsed(timer_start) < 250)
+        wait_ms(1);
     stop_all_notes();
 #else
     shutdown_user();
@@ -178,7 +189,7 @@ bool pre_process_record_quantum(keyrecord_t *record) {
             true)) {
         return false;
     }
-    return true;  // continue processing
+    return true; // continue processing
 }
 
 /* Get keycode, and then call keyboard function */
@@ -367,11 +378,17 @@ layer_state_t update_tri_layer_state(layer_state_t state, uint8_t layer1, uint8_
     return (state & mask12) == mask12 ? (state | mask3) : (state & ~mask3);
 }
 
-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 update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
+    layer_state_set(update_tri_layer_state(layer_state, layer1, layer2, layer3));
+}
 
 // TODO: remove legacy api
-void matrix_init_quantum() { matrix_init_kb(); }
-void matrix_scan_quantum() { matrix_scan_kb(); }
+void matrix_init_quantum() {
+    matrix_init_kb();
+}
+void matrix_scan_quantum() {
+    matrix_scan_kb();
+}
 
 //------------------------------------------------------------------------------
 // Override these functions in your keymap file to play different tunes on
@@ -381,17 +398,6 @@ __attribute__((weak)) void startup_user() {}
 
 __attribute__((weak)) void shutdown_user() {}
 
-/** \brief Run keyboard level Power down
- *
- * FIXME: needs doc
- */
-__attribute__((weak)) void suspend_power_down_user(void) {}
-/** \brief Run keyboard level Power down
- *
- * FIXME: needs doc
- */
-__attribute__((weak)) void suspend_power_down_kb(void) { suspend_power_down_user(); }
-
 void suspend_power_down_quantum(void) {
 #ifndef NO_SUSPEND_POWER_DOWN
 // Turn off backlight
@@ -439,18 +445,6 @@ void suspend_power_down_quantum(void) {
 #endif
 }
 
-/** \brief run user level code immediately after wakeup
- *
- * FIXME: needs doc
- */
-__attribute__((weak)) void suspend_wakeup_init_user(void) {}
-
-/** \brief run keyboard level code immediately after wakeup
- *
- * FIXME: needs doc
- */
-__attribute__((weak)) void suspend_wakeup_init_kb(void) { suspend_wakeup_init_user(); }
-
 __attribute__((weak)) void suspend_wakeup_init_quantum(void) {
 // Turn on backlight
 #ifdef BACKLIGHT_ENABLE
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index b5b3566786..2552c48165 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -77,421 +77,421 @@ enum quantum_keycodes {
 
     // Loose keycodes - to be used directly
     QK_BOOTLOADER = 0x5C00,
-    QK_DEBUG_TOGGLE,  // 5C01
+    QK_DEBUG_TOGGLE, // 5C01
 
     // Magic
-    MAGIC_SWAP_CONTROL_CAPSLOCK,       // 5C02
-    MAGIC_CAPSLOCK_TO_CONTROL,         // 5C03
-    MAGIC_SWAP_LALT_LGUI,              // 5C04
-    MAGIC_SWAP_RALT_RGUI,              // 5C05
-    MAGIC_NO_GUI,                      // 5C06
-    MAGIC_SWAP_GRAVE_ESC,              // 5C07
-    MAGIC_SWAP_BACKSLASH_BACKSPACE,    // 5C08
-    MAGIC_HOST_NKRO,                   // 5C09
-    MAGIC_SWAP_ALT_GUI,                // 5C0A
-    MAGIC_UNSWAP_CONTROL_CAPSLOCK,     // 5C0B
-    MAGIC_UNCAPSLOCK_TO_CONTROL,       // 5C0C
-    MAGIC_UNSWAP_LALT_LGUI,            // 5C0D
-    MAGIC_UNSWAP_RALT_RGUI,            // 5C0E
-    MAGIC_UNNO_GUI,                    // 5C0F
-    MAGIC_UNSWAP_GRAVE_ESC,            // 5C10
-    MAGIC_UNSWAP_BACKSLASH_BACKSPACE,  // 5C11
-    MAGIC_UNHOST_NKRO,                 // 5C12
-    MAGIC_UNSWAP_ALT_GUI,              // 5C13
-    MAGIC_TOGGLE_NKRO,                 // 5C14
-    MAGIC_TOGGLE_ALT_GUI,              // 5C15
+    MAGIC_SWAP_CONTROL_CAPSLOCK,      // 5C02
+    MAGIC_CAPSLOCK_TO_CONTROL,        // 5C03
+    MAGIC_SWAP_LALT_LGUI,             // 5C04
+    MAGIC_SWAP_RALT_RGUI,             // 5C05
+    MAGIC_NO_GUI,                     // 5C06
+    MAGIC_SWAP_GRAVE_ESC,             // 5C07
+    MAGIC_SWAP_BACKSLASH_BACKSPACE,   // 5C08
+    MAGIC_HOST_NKRO,                  // 5C09
+    MAGIC_SWAP_ALT_GUI,               // 5C0A
+    MAGIC_UNSWAP_CONTROL_CAPSLOCK,    // 5C0B
+    MAGIC_UNCAPSLOCK_TO_CONTROL,      // 5C0C
+    MAGIC_UNSWAP_LALT_LGUI,           // 5C0D
+    MAGIC_UNSWAP_RALT_RGUI,           // 5C0E
+    MAGIC_UNNO_GUI,                   // 5C0F
+    MAGIC_UNSWAP_GRAVE_ESC,           // 5C10
+    MAGIC_UNSWAP_BACKSLASH_BACKSPACE, // 5C11
+    MAGIC_UNHOST_NKRO,                // 5C12
+    MAGIC_UNSWAP_ALT_GUI,             // 5C13
+    MAGIC_TOGGLE_NKRO,                // 5C14
+    MAGIC_TOGGLE_ALT_GUI,             // 5C15
 
     // Grave Escape
-    QK_GRAVE_ESCAPE,  // 5C16
+    QK_GRAVE_ESCAPE, // 5C16
 
     // Auto Shift
-    KC_ASUP,   // 5C17
-    KC_ASDN,   // 5C18
-    KC_ASRP,   // 5C19
-    KC_ASTG,   // 5C1A
-    KC_ASON,   // 5C1B
-    KC_ASOFF,  // 5C1C
+    KC_ASUP,  // 5C17
+    KC_ASDN,  // 5C18
+    KC_ASRP,  // 5C19
+    KC_ASTG,  // 5C1A
+    KC_ASON,  // 5C1B
+    KC_ASOFF, // 5C1C
 
     // Audio
-    AU_ON,   // 5C1D
-    AU_OFF,  // 5C1E
-    AU_TOG,  // 5C1F
+    AU_ON,  // 5C1D
+    AU_OFF, // 5C1E
+    AU_TOG, // 5C1F
 
     // Audio Clicky
-    CLICKY_TOGGLE,   // 5C20
-    CLICKY_ENABLE,   // 5C21
-    CLICKY_DISABLE,  // 5C22
-    CLICKY_UP,       // 5C23
-    CLICKY_DOWN,     // 5C24
-    CLICKY_RESET,    // 5C25
+    CLICKY_TOGGLE,  // 5C20
+    CLICKY_ENABLE,  // 5C21
+    CLICKY_DISABLE, // 5C22
+    CLICKY_UP,      // 5C23
+    CLICKY_DOWN,    // 5C24
+    CLICKY_RESET,   // 5C25
 
     // Music mode
-    MU_ON,   // 5C26
-    MU_OFF,  // 5C27
-    MU_TOG,  // 5C28
-    MU_MOD,  // 5C29
-    MUV_IN,  // 5C2A
-    MUV_DE,  // 5C2B
+    MU_ON,  // 5C26
+    MU_OFF, // 5C27
+    MU_TOG, // 5C28
+    MU_MOD, // 5C29
+    MUV_IN, // 5C2A
+    MUV_DE, // 5C2B
 
     // MIDI
-    MI_ON,   // 5C2C
-    MI_OFF,  // 5C2D
-    MI_TOG,  // 5C2E
+    MI_ON,  // 5C2C
+    MI_OFF, // 5C2D
+    MI_TOG, // 5C2E
 
-    MI_C,   // 5C2F
-    MI_Cs,  // 5C30
+    MI_C,  // 5C2F
+    MI_Cs, // 5C30
     MI_Db = MI_Cs,
-    MI_D,   // 5C31
-    MI_Ds,  // 5C32
+    MI_D,  // 5C31
+    MI_Ds, // 5C32
     MI_Eb = MI_Ds,
-    MI_E,   // 5C33
-    MI_F,   // 5C34
-    MI_Fs,  // 5C35
+    MI_E,  // 5C33
+    MI_F,  // 5C34
+    MI_Fs, // 5C35
     MI_Gb = MI_Fs,
-    MI_G,   // 5C36
-    MI_Gs,  // 5C37
+    MI_G,  // 5C36
+    MI_Gs, // 5C37
     MI_Ab = MI_Gs,
-    MI_A,   // 5C38
-    MI_As,  // 5C39
+    MI_A,  // 5C38
+    MI_As, // 5C39
     MI_Bb = MI_As,
-    MI_B,  // 5C3A
+    MI_B, // 5C3A
 
-    MI_C_1,   // 5C3B
-    MI_Cs_1,  // 5C3C
+    MI_C_1,  // 5C3B
+    MI_Cs_1, // 5C3C
     MI_Db_1 = MI_Cs_1,
-    MI_D_1,   // 5C3D
-    MI_Ds_1,  // 5C3E
+    MI_D_1,  // 5C3D
+    MI_Ds_1, // 5C3E
     MI_Eb_1 = MI_Ds_1,
-    MI_E_1,   // 5C3F
-    MI_F_1,   // 5C40
-    MI_Fs_1,  // 5C41
+    MI_E_1,  // 5C3F
+    MI_F_1,  // 5C40
+    MI_Fs_1, // 5C41
     MI_Gb_1 = MI_Fs_1,
-    MI_G_1,   // 5C42
-    MI_Gs_1,  // 5C43
+    MI_G_1,  // 5C42
+    MI_Gs_1, // 5C43
     MI_Ab_1 = MI_Gs_1,
-    MI_A_1,   // 5C44
-    MI_As_1,  // 5C45
+    MI_A_1,  // 5C44
+    MI_As_1, // 5C45
     MI_Bb_1 = MI_As_1,
-    MI_B_1,  // 5C46
+    MI_B_1, // 5C46
 
-    MI_C_2,   // 5C47
-    MI_Cs_2,  // 5C48
+    MI_C_2,  // 5C47
+    MI_Cs_2, // 5C48
     MI_Db_2 = MI_Cs_2,
-    MI_D_2,   // 5C49
-    MI_Ds_2,  // 5C4A
+    MI_D_2,  // 5C49
+    MI_Ds_2, // 5C4A
     MI_Eb_2 = MI_Ds_2,
-    MI_E_2,   // 5C4B
-    MI_F_2,   // 5C4C
-    MI_Fs_2,  // 5C4D
+    MI_E_2,  // 5C4B
+    MI_F_2,  // 5C4C
+    MI_Fs_2, // 5C4D
     MI_Gb_2 = MI_Fs_2,
-    MI_G_2,   // 5C4E
-    MI_Gs_2,  // 5C4F
+    MI_G_2,  // 5C4E
+    MI_Gs_2, // 5C4F
     MI_Ab_2 = MI_Gs_2,
-    MI_A_2,   // 5C50
-    MI_As_2,  // 5C51
+    MI_A_2,  // 5C50
+    MI_As_2, // 5C51
     MI_Bb_2 = MI_As_2,
-    MI_B_2,  // 5C52
+    MI_B_2, // 5C52
 
-    MI_C_3,   // 5C53
-    MI_Cs_3,  // 5C54
+    MI_C_3,  // 5C53
+    MI_Cs_3, // 5C54
     MI_Db_3 = MI_Cs_3,
-    MI_D_3,   // 5C55
-    MI_Ds_3,  // 5C56
+    MI_D_3,  // 5C55
+    MI_Ds_3, // 5C56
     MI_Eb_3 = MI_Ds_3,
-    MI_E_3,   // 5C57
-    MI_F_3,   // 5C58
-    MI_Fs_3,  // 5C59
+    MI_E_3,  // 5C57
+    MI_F_3,  // 5C58
+    MI_Fs_3, // 5C59
     MI_Gb_3 = MI_Fs_3,
-    MI_G_3,   // 5C5A
-    MI_Gs_3,  // 5C5B
+    MI_G_3,  // 5C5A
+    MI_Gs_3, // 5C5B
     MI_Ab_3 = MI_Gs_3,
-    MI_A_3,   // 5C5C
-    MI_As_3,  // 5C5D
+    MI_A_3,  // 5C5C
+    MI_As_3, // 5C5D
     MI_Bb_3 = MI_As_3,
-    MI_B_3,  // 5C5E
+    MI_B_3, // 5C5E
 
-    MI_C_4,   // 5C5F
-    MI_Cs_4,  // 5C60
+    MI_C_4,  // 5C5F
+    MI_Cs_4, // 5C60
     MI_Db_4 = MI_Cs_4,
-    MI_D_4,   // 5C61
-    MI_Ds_4,  // 5C62
+    MI_D_4,  // 5C61
+    MI_Ds_4, // 5C62
     MI_Eb_4 = MI_Ds_4,
-    MI_E_4,   // 5C63
-    MI_F_4,   // 5C64
-    MI_Fs_4,  // 5C65
+    MI_E_4,  // 5C63
+    MI_F_4,  // 5C64
+    MI_Fs_4, // 5C65
     MI_Gb_4 = MI_Fs_4,
-    MI_G_4,   // 5C66
-    MI_Gs_4,  // 5C67
+    MI_G_4,  // 5C66
+    MI_Gs_4, // 5C67
     MI_Ab_4 = MI_Gs_4,
-    MI_A_4,   // 5C68
-    MI_As_4,  // 5C69
+    MI_A_4,  // 5C68
+    MI_As_4, // 5C69
     MI_Bb_4 = MI_As_4,
-    MI_B_4,  // 5C6A
+    MI_B_4, // 5C6A
 
-    MI_C_5,   // 5C6B
-    MI_Cs_5,  // 5C6C
+    MI_C_5,  // 5C6B
+    MI_Cs_5, // 5C6C
     MI_Db_5 = MI_Cs_5,
-    MI_D_5,   // 5C6D
-    MI_Ds_5,  // 5C6E
+    MI_D_5,  // 5C6D
+    MI_Ds_5, // 5C6E
     MI_Eb_5 = MI_Ds_5,
-    MI_E_5,   // 5C6F
-    MI_F_5,   // 5C70
-    MI_Fs_5,  // 5C71
+    MI_E_5,  // 5C6F
+    MI_F_5,  // 5C70
+    MI_Fs_5, // 5C71
     MI_Gb_5 = MI_Fs_5,
-    MI_G_5,   // 5C72
-    MI_Gs_5,  // 5C73
+    MI_G_5,  // 5C72
+    MI_Gs_5, // 5C73
     MI_Ab_5 = MI_Gs_5,
-    MI_A_5,   // 5C74
-    MI_As_5,  // 5C75
+    MI_A_5,  // 5C74
+    MI_As_5, // 5C75
     MI_Bb_5 = MI_As_5,
-    MI_B_5,  // 5C76
+    MI_B_5, // 5C76
 
-    MI_OCT_N2,  // 5C77
-    MI_OCT_N1,  // 5C78
-    MI_OCT_0,   // 5C79
-    MI_OCT_1,   // 5C7A
-    MI_OCT_2,   // 5C7B
-    MI_OCT_3,   // 5C7C
-    MI_OCT_4,   // 5C7D
-    MI_OCT_5,   // 5C7E
-    MI_OCT_6,   // 5C7F
-    MI_OCT_7,   // 5C80
-    MI_OCTD,    // 5C81
-    MI_OCTU,    // 5C82
+    MI_OCT_N2, // 5C77
+    MI_OCT_N1, // 5C78
+    MI_OCT_0,  // 5C79
+    MI_OCT_1,  // 5C7A
+    MI_OCT_2,  // 5C7B
+    MI_OCT_3,  // 5C7C
+    MI_OCT_4,  // 5C7D
+    MI_OCT_5,  // 5C7E
+    MI_OCT_6,  // 5C7F
+    MI_OCT_7,  // 5C80
+    MI_OCTD,   // 5C81
+    MI_OCTU,   // 5C82
 
-    MI_TRNS_N6,  // 5C83
-    MI_TRNS_N5,  // 5C84
-    MI_TRNS_N4,  // 5C85
-    MI_TRNS_N3,  // 5C86
-    MI_TRNS_N2,  // 5C87
-    MI_TRNS_N1,  // 5C88
-    MI_TRNS_0,   // 5C89
-    MI_TRNS_1,   // 5C8A
-    MI_TRNS_2,   // 5C8B
-    MI_TRNS_3,   // 5C8C
-    MI_TRNS_4,   // 5C8D
-    MI_TRNS_5,   // 5C8E
-    MI_TRNS_6,   // 5C8F
-    MI_TRNSD,    // 5C90
-    MI_TRNSU,    // 5C91
+    MI_TRNS_N6, // 5C83
+    MI_TRNS_N5, // 5C84
+    MI_TRNS_N4, // 5C85
+    MI_TRNS_N3, // 5C86
+    MI_TRNS_N2, // 5C87
+    MI_TRNS_N1, // 5C88
+    MI_TRNS_0,  // 5C89
+    MI_TRNS_1,  // 5C8A
+    MI_TRNS_2,  // 5C8B
+    MI_TRNS_3,  // 5C8C
+    MI_TRNS_4,  // 5C8D
+    MI_TRNS_5,  // 5C8E
+    MI_TRNS_6,  // 5C8F
+    MI_TRNSD,   // 5C90
+    MI_TRNSU,   // 5C91
 
-    MI_VEL_0,  // 5C92
+    MI_VEL_0, // 5C92
 #ifdef VIA_ENABLE
     MI_VEL_1 = MI_VEL_0,
 #else
-    MI_VEL_1,  // 5C93
+    MI_VEL_1, // 5C93
 #endif
-    MI_VEL_2,   // 5C94
-    MI_VEL_3,   // 5C95
-    MI_VEL_4,   // 5C96
-    MI_VEL_5,   // 5C97
-    MI_VEL_6,   // 5C98
-    MI_VEL_7,   // 5C99
-    MI_VEL_8,   // 5C9A
-    MI_VEL_9,   // 5C9B
-    MI_VEL_10,  // 5C9C
-    MI_VELD,    // 5C9D
-    MI_VELU,    // 5C9E
+    MI_VEL_2,  // 5C94
+    MI_VEL_3,  // 5C95
+    MI_VEL_4,  // 5C96
+    MI_VEL_5,  // 5C97
+    MI_VEL_6,  // 5C98
+    MI_VEL_7,  // 5C99
+    MI_VEL_8,  // 5C9A
+    MI_VEL_9,  // 5C9B
+    MI_VEL_10, // 5C9C
+    MI_VELD,   // 5C9D
+    MI_VELU,   // 5C9E
 
-    MI_CH1,   // 5C9F
-    MI_CH2,   // 5CA0
-    MI_CH3,   // 5CA1
-    MI_CH4,   // 5CA2
-    MI_CH5,   // 5CA3
-    MI_CH6,   // 5CA4
-    MI_CH7,   // 5CA5
-    MI_CH8,   // 5CA6
-    MI_CH9,   // 5CA7
-    MI_CH10,  // 5CA8
-    MI_CH11,  // 5CA9
-    MI_CH12,  // 5CAA
-    MI_CH13,  // 5CAB
-    MI_CH14,  // 5CAC
-    MI_CH15,  // 5CAD
-    MI_CH16,  // 5CAE
-    MI_CHD,   // 5CAF
-    MI_CHU,   // 5CB0
+    MI_CH1,  // 5C9F
+    MI_CH2,  // 5CA0
+    MI_CH3,  // 5CA1
+    MI_CH4,  // 5CA2
+    MI_CH5,  // 5CA3
+    MI_CH6,  // 5CA4
+    MI_CH7,  // 5CA5
+    MI_CH8,  // 5CA6
+    MI_CH9,  // 5CA7
+    MI_CH10, // 5CA8
+    MI_CH11, // 5CA9
+    MI_CH12, // 5CAA
+    MI_CH13, // 5CAB
+    MI_CH14, // 5CAC
+    MI_CH15, // 5CAD
+    MI_CH16, // 5CAE
+    MI_CHD,  // 5CAF
+    MI_CHU,  // 5CB0
 
-    MI_ALLOFF,  // 5CB1
+    MI_ALLOFF, // 5CB1
 
-    MI_SUS,   // 5CB2
-    MI_PORT,  // 5CB3
-    MI_SOST,  // 5CB4
-    MI_SOFT,  // 5CB5
-    MI_LEG,   // 5CB6
+    MI_SUS,  // 5CB2
+    MI_PORT, // 5CB3
+    MI_SOST, // 5CB4
+    MI_SOFT, // 5CB5
+    MI_LEG,  // 5CB6
 
-    MI_MOD,    // 5CB7
-    MI_MODSD,  // 5CB8
-    MI_MODSU,  // 5CB9
+    MI_MOD,   // 5CB7
+    MI_MODSD, // 5CB8
+    MI_MODSU, // 5CB9
 
-    MI_BENDD,  // 5CBA
-    MI_BENDU,  // 5CBB
+    MI_BENDD, // 5CBA
+    MI_BENDU, // 5CBB
 
     // Backlight
-    BL_ON,    // 5CBC
-    BL_OFF,   // 5CBD
-    BL_DEC,   // 5CBE
-    BL_INC,   // 5CBF
-    BL_TOGG,  // 5CC0
-    BL_STEP,  // 5CC1
-    BL_BRTG,  // 5CC2
+    BL_ON,   // 5CBC
+    BL_OFF,  // 5CBD
+    BL_DEC,  // 5CBE
+    BL_INC,  // 5CBF
+    BL_TOGG, // 5CC0
+    BL_STEP, // 5CC1
+    BL_BRTG, // 5CC2
 
     // 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
+    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
+    VLK_TOG, // 5CD7
 
     // Space Cadet
-    KC_LSPO,    // 5CD8
-    KC_RSPC,    // 5CD9
-    KC_SFTENT,  // 5CDA
+    KC_LSPO,   // 5CD8
+    KC_RSPC,   // 5CD9
+    KC_SFTENT, // 5CDA
 
     // Thermal Printer
-    PRINT_ON,   // 5CDB
-    PRINT_OFF,  // 5CDC
+    PRINT_ON,  // 5CDB
+    PRINT_OFF, // 5CDC
 
     // Bluetooth: output selection
-    OUT_AUTO,  // 5CDD
-    OUT_USB,   // 5CDE
+    OUT_AUTO, // 5CDD
+    OUT_USB,  // 5CDE
 
     // Clear EEPROM
-    QK_CLEAR_EEPROM,  // 5CDF
+    QK_CLEAR_EEPROM, // 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
+    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
+    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
+    KC_LCPO, // 5CF4
+    KC_RCPC, // 5CF5
+    KC_LAPO, // 5CF6
+    KC_RAPC, // 5CF7
 
     // Combos
-    CMB_ON,   // 5CF8
-    CMB_OFF,  // 5CF9
-    CMB_TOG,  // 5CFA
+    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
+    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,   // 5D04
-    DYN_REC_START2,   // 5D05
-    DYN_REC_STOP,     // 5D06
-    DYN_MACRO_PLAY1,  // 5D07
-    DYN_MACRO_PLAY2,  // 5D08
+    DYN_REC_START1,  // 5D04
+    DYN_REC_START2,  // 5D05
+    DYN_REC_STOP,    // 5D06
+    DYN_MACRO_PLAY1, // 5D07
+    DYN_MACRO_PLAY2, // 5D08
 
     // Joystick
-    JS_BUTTON0,   // 5D09
-    JS_BUTTON1,   // 5D0A
-    JS_BUTTON2,   // 5D0B
-    JS_BUTTON3,   // 5D0C
-    JS_BUTTON4,   // 5D0D
-    JS_BUTTON5,   // 5D0E
-    JS_BUTTON6,   // 5D0F
-    JS_BUTTON7,   // 5D10
-    JS_BUTTON8,   // 5D11
-    JS_BUTTON9,   // 5D12
-    JS_BUTTON10,  // 5D13
-    JS_BUTTON11,  // 5D14
-    JS_BUTTON12,  // 5D15
-    JS_BUTTON13,  // 5D16
-    JS_BUTTON14,  // 5D17
-    JS_BUTTON15,  // 5D18
-    JS_BUTTON16,  // 5D19
-    JS_BUTTON17,  // 5D1A
-    JS_BUTTON18,  // 5D1B
-    JS_BUTTON19,  // 5D1C
-    JS_BUTTON20,  // 5D1D
-    JS_BUTTON21,  // 5D1E
-    JS_BUTTON22,  // 5D1F
-    JS_BUTTON23,  // 5D20
-    JS_BUTTON24,  // 5D21
-    JS_BUTTON25,  // 5D22
-    JS_BUTTON26,  // 5D23
-    JS_BUTTON27,  // 5D24
-    JS_BUTTON28,  // 5D25
-    JS_BUTTON29,  // 5D26
-    JS_BUTTON30,  // 5D27
-    JS_BUTTON31,  // 5D28
+    JS_BUTTON0,  // 5D09
+    JS_BUTTON1,  // 5D0A
+    JS_BUTTON2,  // 5D0B
+    JS_BUTTON3,  // 5D0C
+    JS_BUTTON4,  // 5D0D
+    JS_BUTTON5,  // 5D0E
+    JS_BUTTON6,  // 5D0F
+    JS_BUTTON7,  // 5D10
+    JS_BUTTON8,  // 5D11
+    JS_BUTTON9,  // 5D12
+    JS_BUTTON10, // 5D13
+    JS_BUTTON11, // 5D14
+    JS_BUTTON12, // 5D15
+    JS_BUTTON13, // 5D16
+    JS_BUTTON14, // 5D17
+    JS_BUTTON15, // 5D18
+    JS_BUTTON16, // 5D19
+    JS_BUTTON17, // 5D1A
+    JS_BUTTON18, // 5D1B
+    JS_BUTTON19, // 5D1C
+    JS_BUTTON20, // 5D1D
+    JS_BUTTON21, // 5D1E
+    JS_BUTTON22, // 5D1F
+    JS_BUTTON23, // 5D20
+    JS_BUTTON24, // 5D21
+    JS_BUTTON25, // 5D22
+    JS_BUTTON26, // 5D23
+    JS_BUTTON27, // 5D24
+    JS_BUTTON28, // 5D25
+    JS_BUTTON29, // 5D26
+    JS_BUTTON30, // 5D27
+    JS_BUTTON31, // 5D28
 
     // Leader Key
-    KC_LEAD,  // 5D29
+    KC_LEAD, // 5D29
 
     // Bluetooth: output selection (continued)
-    OUT_BT,  // 5D2A
+    OUT_BT, // 5D2A
 
     // Lock Key
-    KC_LOCK,  // 5D2B
+    KC_LOCK, // 5D2B
 
     // Terminal
-    TERM_ON,   // 5D2C
-    TERM_OFF,  // 5D2D
+    TERM_ON,  // 5D2C
+    TERM_OFF, // 5D2D
 
     // Sequencer
-    SQ_ON,   // 5D2E
-    SQ_OFF,  // 5D2F
-    SQ_TOG,  // 5D30
+    SQ_ON,  // 5D2E
+    SQ_OFF, // 5D2F
+    SQ_TOG, // 5D30
 
-    SQ_TMPD,  // 5D31
-    SQ_TMPU,  // 5D32
+    SQ_TMPD, // 5D31
+    SQ_TMPU, // 5D32
 
-    SQ_RESD,  // 5D33
-    SQ_RESU,  // 5D34
+    SQ_RESD, // 5D33
+    SQ_RESU, // 5D34
 
-    SQ_SALL,  // 5D35
-    SQ_SCLR,  // 5D36
+    SQ_SALL, // 5D35
+    SQ_SCLR, // 5D36
 
-    SEQUENCER_STEP_MIN,  // 5D37
+    SEQUENCER_STEP_MIN, // 5D37
     SEQUENCER_STEP_MAX = SEQUENCER_STEP_MIN + SEQUENCER_STEPS,
 
     SEQUENCER_RESOLUTION_MIN,
@@ -636,69 +636,69 @@ enum quantum_keycodes {
 #define MOD_MEH 0x7
 
 // US ANSI shifted keycode aliases
-#define KC_TILDE LSFT(KC_GRAVE)  // ~
+#define KC_TILDE LSFT(KC_GRAVE) // ~
 #define KC_TILD KC_TILDE
 
-#define KC_EXCLAIM LSFT(KC_1)  // !
+#define KC_EXCLAIM LSFT(KC_1) // !
 #define KC_EXLM KC_EXCLAIM
 
-#define KC_AT LSFT(KC_2)  // @
+#define KC_AT LSFT(KC_2) // @
 
-#define KC_HASH LSFT(KC_3)  // #
+#define KC_HASH LSFT(KC_3) // #
 
-#define KC_DOLLAR LSFT(KC_4)  // $
+#define KC_DOLLAR LSFT(KC_4) // $
 #define KC_DLR KC_DOLLAR
 
-#define KC_PERCENT LSFT(KC_5)  // %
+#define KC_PERCENT LSFT(KC_5) // %
 #define KC_PERC KC_PERCENT
 
-#define KC_CIRCUMFLEX LSFT(KC_6)  // ^
+#define KC_CIRCUMFLEX LSFT(KC_6) // ^
 #define KC_CIRC KC_CIRCUMFLEX
 
-#define KC_AMPERSAND LSFT(KC_7)  // &
+#define KC_AMPERSAND LSFT(KC_7) // &
 #define KC_AMPR KC_AMPERSAND
 
-#define KC_ASTERISK LSFT(KC_8)  // *
+#define KC_ASTERISK LSFT(KC_8) // *
 #define KC_ASTR KC_ASTERISK
 
-#define KC_LEFT_PAREN LSFT(KC_9)  // (
+#define KC_LEFT_PAREN LSFT(KC_9) // (
 #define KC_LPRN KC_LEFT_PAREN
 
-#define KC_RIGHT_PAREN LSFT(KC_0)  // )
+#define KC_RIGHT_PAREN LSFT(KC_0) // )
 #define KC_RPRN KC_RIGHT_PAREN
 
-#define KC_UNDERSCORE LSFT(KC_MINUS)  // _
+#define KC_UNDERSCORE LSFT(KC_MINUS) // _
 #define KC_UNDS KC_UNDERSCORE
 
-#define KC_PLUS LSFT(KC_EQUAL)  // +
+#define KC_PLUS LSFT(KC_EQUAL) // +
 
-#define KC_LEFT_CURLY_BRACE LSFT(KC_LEFT_BRACKET)  // {
+#define KC_LEFT_CURLY_BRACE LSFT(KC_LEFT_BRACKET) // {
 #define KC_LCBR KC_LEFT_CURLY_BRACE
 
-#define KC_RIGHT_CURLY_BRACE LSFT(KC_RIGHT_BRACKET)  // }
+#define KC_RIGHT_CURLY_BRACE LSFT(KC_RIGHT_BRACKET) // }
 #define KC_RCBR KC_RIGHT_CURLY_BRACE
 
-#define KC_LEFT_ANGLE_BRACKET LSFT(KC_COMMA)  // <
+#define KC_LEFT_ANGLE_BRACKET LSFT(KC_COMMA) // <
 #define KC_LABK KC_LEFT_ANGLE_BRACKET
 #define KC_LT KC_LEFT_ANGLE_BRACKET
 
-#define KC_RIGHT_ANGLE_BRACKET LSFT(KC_DOT)  // >
+#define KC_RIGHT_ANGLE_BRACKET LSFT(KC_DOT) // >
 #define KC_RABK KC_RIGHT_ANGLE_BRACKET
 #define KC_GT KC_RIGHT_ANGLE_BRACKET
 
-#define KC_COLON LSFT(KC_SEMICOLON)  // :
+#define KC_COLON LSFT(KC_SEMICOLON) // :
 #define KC_COLN KC_COLON
 
-#define KC_PIPE LSFT(KC_BACKSLASH)  // |
+#define KC_PIPE LSFT(KC_BACKSLASH) // |
 
-#define KC_QUESTION LSFT(KC_SLASH)  // ?
+#define KC_QUESTION LSFT(KC_SLASH) // ?
 #define KC_QUES KC_QUESTION
 
-#define KC_DOUBLE_QUOTE LSFT(KC_QUOTE)  // "
+#define KC_DOUBLE_QUOTE LSFT(KC_QUOTE) // "
 #define KC_DQUO KC_DOUBLE_QUOTE
 #define KC_DQT KC_DOUBLE_QUOTE
 
-#define KC_DELT KC_DELETE  // Del key (four letter code)
+#define KC_DELT KC_DELETE // Del key (four letter code)
 
 // Modified keycode aliases
 #define C(kc) LCTL(kc)
@@ -841,22 +841,22 @@ enum quantum_keycodes {
 #define CMD_T(kc) LCMD_T(kc)
 #define WIN_T(kc) LWIN_T(kc)
 
-#define C_S_T(kc) MT(MOD_LCTL | MOD_LSFT, kc)                         // Left Control + Shift e.g. for gnome-terminal
-#define MEH_T(kc) MT(MOD_LCTL | MOD_LSFT | MOD_LALT, kc)              // Meh is a less hyper version of the Hyper key -- doesn't include GUI, so just Left Control + Shift + Alt
-#define LCAG_T(kc) MT(MOD_LCTL | MOD_LALT | MOD_LGUI, kc)             // Left Control + Alt + GUI
-#define RCAG_T(kc) MT(MOD_RCTL | MOD_RALT | MOD_RGUI, kc)             // Right Control + Alt + GUI
-#define HYPR_T(kc) MT(MOD_LCTL | MOD_LSFT | MOD_LALT | MOD_LGUI, kc)  // see http://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/
-#define LSG_T(kc) MT(MOD_LSFT | MOD_LGUI, kc)                         // Left Shift + GUI
+#define C_S_T(kc) MT(MOD_LCTL | MOD_LSFT, kc)                        // Left Control + Shift e.g. for gnome-terminal
+#define MEH_T(kc) MT(MOD_LCTL | MOD_LSFT | MOD_LALT, kc)             // Meh is a less hyper version of the Hyper key -- doesn't include GUI, so just Left Control + Shift + Alt
+#define LCAG_T(kc) MT(MOD_LCTL | MOD_LALT | MOD_LGUI, kc)            // Left Control + Alt + GUI
+#define RCAG_T(kc) MT(MOD_RCTL | MOD_RALT | MOD_RGUI, kc)            // Right Control + Alt + GUI
+#define HYPR_T(kc) MT(MOD_LCTL | MOD_LSFT | MOD_LALT | MOD_LGUI, kc) // see http://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/
+#define LSG_T(kc) MT(MOD_LSFT | MOD_LGUI, kc)                        // Left Shift + GUI
 #define SGUI_T(kc) LSG_T(kc)
 #define SCMD_T(kc) LSG_T(kc)
 #define SWIN_T(kc) LSG_T(kc)
-#define LAG_T(kc) MT(MOD_LALT | MOD_LGUI, kc)  // Left Alt + GUI
-#define RSG_T(kc) MT(MOD_RSFT | MOD_RGUI, kc)  // Right Shift + GUI
-#define RAG_T(kc) MT(MOD_RALT | MOD_RGUI, kc)  // Right Alt + GUI
-#define LCA_T(kc) MT(MOD_LCTL | MOD_LALT, kc)  // Left Control + Alt
-#define LSA_T(kc) MT(MOD_LSFT | MOD_LALT, kc)  // Left Shift + Alt
-#define RSA_T(kc) MT(MOD_RSFT | MOD_RALT, kc)  // Right Shift + Alt
-#define RCS_T(kc) MT(MOD_RCTL | MOD_RSFT, kc)  // Right Control + Shift
+#define LAG_T(kc) MT(MOD_LALT | MOD_LGUI, kc) // Left Alt + GUI
+#define RSG_T(kc) MT(MOD_RSFT | MOD_RGUI, kc) // Right Shift + GUI
+#define RAG_T(kc) MT(MOD_RALT | MOD_RGUI, kc) // Right Alt + GUI
+#define LCA_T(kc) MT(MOD_LCTL | MOD_LALT, kc) // Left Control + Alt
+#define LSA_T(kc) MT(MOD_LSFT | MOD_LALT, kc) // Left Shift + Alt
+#define RSA_T(kc) MT(MOD_RSFT | MOD_RALT, kc) // Right Shift + Alt
+#define RCS_T(kc) MT(MOD_RCTL | MOD_RSFT, kc) // Right Control + Shift
 #define SAGR_T(kc) RSA_T(kc)
 
 #define ALL_T(kc) HYPR_T(kc)
@@ -870,14 +870,14 @@ enum quantum_keycodes {
 #define UC(c) (QK_UNICODE | (c))
 // UNICODEMAP_ENABLE - Allows Unicode input up to 0x10FFFF, requires unicode_map
 #define X(i) (QK_UNICODEMAP | (i))
-#define XP(i, j) (QK_UNICODEMAP_PAIR | ((i)&0x7F) | (((j)&0x7F) << 7))  // 127 max i and j
+#define XP(i, j) (QK_UNICODEMAP_PAIR | ((i)&0x7F) | (((j)&0x7F) << 7)) // 127 max i and j
 
 #define UC_MOD UNICODE_MODE_FORWARD
 #define UC_RMOD UNICODE_MODE_REVERSE
 
 #define UC_M_MA UNICODE_MODE_MAC
-#define UNICODE_MODE_OSX UNICODE_MODE_MAC  // Deprecated alias
-#define UC_M_OS UNICODE_MODE_MAC           // Deprecated alias
+#define UNICODE_MODE_OSX UNICODE_MODE_MAC // Deprecated alias
+#define UC_M_OS UNICODE_MODE_MAC          // Deprecated alias
 #define UC_M_LN UNICODE_MODE_LNX
 #define UC_M_WI UNICODE_MODE_WIN
 #define UC_M_BS UNICODE_MODE_BSD
diff --git a/quantum/rgb_matrix/animations/alpha_mods_anim.h b/quantum/rgb_matrix/animations/alpha_mods_anim.h
index d6136f1ba4..59b8381d69 100644
--- a/quantum/rgb_matrix/animations/alpha_mods_anim.h
+++ b/quantum/rgb_matrix/animations/alpha_mods_anim.h
@@ -22,5 +22,5 @@ bool ALPHAS_MODS(effect_params_t* params) {
     return rgb_matrix_check_finished_leds(led_max);
 }
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_ALPHAS_MODS
diff --git a/quantum/rgb_matrix/animations/breathing_anim.h b/quantum/rgb_matrix/animations/breathing_anim.h
index 29187e1543..e9a3c96e1b 100644
--- a/quantum/rgb_matrix/animations/breathing_anim.h
+++ b/quantum/rgb_matrix/animations/breathing_anim.h
@@ -16,5 +16,5 @@ bool BREATHING(effect_params_t* params) {
     return rgb_matrix_check_finished_leds(led_max);
 }
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_BREATHING
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_BREATHING
diff --git a/quantum/rgb_matrix/animations/colorband_pinwheel_sat_anim.h b/quantum/rgb_matrix/animations/colorband_pinwheel_sat_anim.h
index 0375d4937d..06aa8b5ed5 100644
--- a/quantum/rgb_matrix/animations/colorband_pinwheel_sat_anim.h
+++ b/quantum/rgb_matrix/animations/colorband_pinwheel_sat_anim.h
@@ -7,7 +7,9 @@ static HSV BAND_PINWHEEL_SAT_math(HSV hsv, int16_t dx, int16_t dy, uint8_t time)
     return hsv;
 }
 
-bool BAND_PINWHEEL_SAT(effect_params_t* params) { return effect_runner_dx_dy(params, &BAND_PINWHEEL_SAT_math); }
+bool BAND_PINWHEEL_SAT(effect_params_t* params) {
+    return effect_runner_dx_dy(params, &BAND_PINWHEEL_SAT_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
diff --git a/quantum/rgb_matrix/animations/colorband_pinwheel_val_anim.h b/quantum/rgb_matrix/animations/colorband_pinwheel_val_anim.h
index e40bf4cd1f..bcbc319498 100644
--- a/quantum/rgb_matrix/animations/colorband_pinwheel_val_anim.h
+++ b/quantum/rgb_matrix/animations/colorband_pinwheel_val_anim.h
@@ -7,7 +7,9 @@ static HSV BAND_PINWHEEL_VAL_math(HSV hsv, int16_t dx, int16_t dy, uint8_t time)
     return hsv;
 }
 
-bool BAND_PINWHEEL_VAL(effect_params_t* params) { return effect_runner_dx_dy(params, &BAND_PINWHEEL_VAL_math); }
+bool BAND_PINWHEEL_VAL(effect_params_t* params) {
+    return effect_runner_dx_dy(params, &BAND_PINWHEEL_VAL_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
diff --git a/quantum/rgb_matrix/animations/colorband_sat_anim.h b/quantum/rgb_matrix/animations/colorband_sat_anim.h
index 1c4f7de575..cb0897ad3e 100644
--- a/quantum/rgb_matrix/animations/colorband_sat_anim.h
+++ b/quantum/rgb_matrix/animations/colorband_sat_anim.h
@@ -8,7 +8,9 @@ static HSV BAND_SAT_math(HSV hsv, uint8_t i, uint8_t time) {
     return hsv;
 }
 
-bool BAND_SAT(effect_params_t* params) { return effect_runner_i(params, &BAND_SAT_math); }
+bool BAND_SAT(effect_params_t* params) {
+    return effect_runner_i(params, &BAND_SAT_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_BAND_SAT
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_BAND_SAT
diff --git a/quantum/rgb_matrix/animations/colorband_spiral_sat_anim.h b/quantum/rgb_matrix/animations/colorband_spiral_sat_anim.h
index cdd02b3797..d26eb37855 100644
--- a/quantum/rgb_matrix/animations/colorband_spiral_sat_anim.h
+++ b/quantum/rgb_matrix/animations/colorband_spiral_sat_anim.h
@@ -7,7 +7,9 @@ static HSV BAND_SPIRAL_SAT_math(HSV hsv, int16_t dx, int16_t dy, uint8_t dist, u
     return hsv;
 }
 
-bool BAND_SPIRAL_SAT(effect_params_t* params) { return effect_runner_dx_dy_dist(params, &BAND_SPIRAL_SAT_math); }
+bool BAND_SPIRAL_SAT(effect_params_t* params) {
+    return effect_runner_dx_dy_dist(params, &BAND_SPIRAL_SAT_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
diff --git a/quantum/rgb_matrix/animations/colorband_spiral_val_anim.h b/quantum/rgb_matrix/animations/colorband_spiral_val_anim.h
index e1331eaebe..3ae34bb6f0 100644
--- a/quantum/rgb_matrix/animations/colorband_spiral_val_anim.h
+++ b/quantum/rgb_matrix/animations/colorband_spiral_val_anim.h
@@ -7,7 +7,9 @@ static HSV BAND_SPIRAL_VAL_math(HSV hsv, int16_t dx, int16_t dy, uint8_t dist, u
     return hsv;
 }
 
-bool BAND_SPIRAL_VAL(effect_params_t* params) { return effect_runner_dx_dy_dist(params, &BAND_SPIRAL_VAL_math); }
+bool BAND_SPIRAL_VAL(effect_params_t* params) {
+    return effect_runner_dx_dy_dist(params, &BAND_SPIRAL_VAL_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
diff --git a/quantum/rgb_matrix/animations/colorband_val_anim.h b/quantum/rgb_matrix/animations/colorband_val_anim.h
index 02ee4add67..69c29f53a3 100644
--- a/quantum/rgb_matrix/animations/colorband_val_anim.h
+++ b/quantum/rgb_matrix/animations/colorband_val_anim.h
@@ -8,7 +8,9 @@ static HSV BAND_VAL_math(HSV hsv, uint8_t i, uint8_t time) {
     return hsv;
 }
 
-bool BAND_VAL(effect_params_t* params) { return effect_runner_i(params, &BAND_VAL_math); }
+bool BAND_VAL(effect_params_t* params) {
+    return effect_runner_i(params, &BAND_VAL_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_BAND_VAL
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_BAND_VAL
diff --git a/quantum/rgb_matrix/animations/cycle_all_anim.h b/quantum/rgb_matrix/animations/cycle_all_anim.h
index 3b73b9d385..d8c7220d95 100644
--- a/quantum/rgb_matrix/animations/cycle_all_anim.h
+++ b/quantum/rgb_matrix/animations/cycle_all_anim.h
@@ -7,7 +7,9 @@ static HSV CYCLE_ALL_math(HSV hsv, uint8_t i, uint8_t time) {
     return hsv;
 }
 
-bool CYCLE_ALL(effect_params_t* params) { return effect_runner_i(params, &CYCLE_ALL_math); }
+bool CYCLE_ALL(effect_params_t* params) {
+    return effect_runner_i(params, &CYCLE_ALL_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_CYCLE_ALL
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_CYCLE_ALL
diff --git a/quantum/rgb_matrix/animations/cycle_left_right_anim.h b/quantum/rgb_matrix/animations/cycle_left_right_anim.h
index bf6a574069..84c2127aff 100644
--- a/quantum/rgb_matrix/animations/cycle_left_right_anim.h
+++ b/quantum/rgb_matrix/animations/cycle_left_right_anim.h
@@ -7,7 +7,9 @@ static HSV CYCLE_LEFT_RIGHT_math(HSV hsv, uint8_t i, uint8_t time) {
     return hsv;
 }
 
-bool CYCLE_LEFT_RIGHT(effect_params_t* params) { return effect_runner_i(params, &CYCLE_LEFT_RIGHT_math); }
+bool CYCLE_LEFT_RIGHT(effect_params_t* params) {
+    return effect_runner_i(params, &CYCLE_LEFT_RIGHT_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
diff --git a/quantum/rgb_matrix/animations/cycle_out_in_anim.h b/quantum/rgb_matrix/animations/cycle_out_in_anim.h
index 2bdb9d9375..9513fe9593 100644
--- a/quantum/rgb_matrix/animations/cycle_out_in_anim.h
+++ b/quantum/rgb_matrix/animations/cycle_out_in_anim.h
@@ -7,7 +7,9 @@ static HSV CYCLE_OUT_IN_math(HSV hsv, int16_t dx, int16_t dy, uint8_t dist, uint
     return hsv;
 }
 
-bool CYCLE_OUT_IN(effect_params_t* params) { return effect_runner_dx_dy_dist(params, &CYCLE_OUT_IN_math); }
+bool CYCLE_OUT_IN(effect_params_t* params) {
+    return effect_runner_dx_dy_dist(params, &CYCLE_OUT_IN_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_CYCLE_OUT_IN
diff --git a/quantum/rgb_matrix/animations/cycle_out_in_dual_anim.h b/quantum/rgb_matrix/animations/cycle_out_in_dual_anim.h
index 51979c44fe..3cca45f27a 100644
--- a/quantum/rgb_matrix/animations/cycle_out_in_dual_anim.h
+++ b/quantum/rgb_matrix/animations/cycle_out_in_dual_anim.h
@@ -9,7 +9,9 @@ static HSV CYCLE_OUT_IN_DUAL_math(HSV hsv, int16_t dx, int16_t dy, uint8_t time)
     return hsv;
 }
 
-bool CYCLE_OUT_IN_DUAL(effect_params_t* params) { return effect_runner_dx_dy(params, &CYCLE_OUT_IN_DUAL_math); }
+bool CYCLE_OUT_IN_DUAL(effect_params_t* params) {
+    return effect_runner_dx_dy(params, &CYCLE_OUT_IN_DUAL_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
diff --git a/quantum/rgb_matrix/animations/cycle_pinwheel_anim.h b/quantum/rgb_matrix/animations/cycle_pinwheel_anim.h
index 10ba2b7c2c..de5993992c 100644
--- a/quantum/rgb_matrix/animations/cycle_pinwheel_anim.h
+++ b/quantum/rgb_matrix/animations/cycle_pinwheel_anim.h
@@ -7,7 +7,9 @@ static HSV CYCLE_PINWHEEL_math(HSV hsv, int16_t dx, int16_t dy, uint8_t time) {
     return hsv;
 }
 
-bool CYCLE_PINWHEEL(effect_params_t* params) { return effect_runner_dx_dy(params, &CYCLE_PINWHEEL_math); }
+bool CYCLE_PINWHEEL(effect_params_t* params) {
+    return effect_runner_dx_dy(params, &CYCLE_PINWHEEL_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
diff --git a/quantum/rgb_matrix/animations/cycle_spiral_anim.h b/quantum/rgb_matrix/animations/cycle_spiral_anim.h
index 482c7e7da6..904450179e 100644
--- a/quantum/rgb_matrix/animations/cycle_spiral_anim.h
+++ b/quantum/rgb_matrix/animations/cycle_spiral_anim.h
@@ -7,7 +7,9 @@ static HSV CYCLE_SPIRAL_math(HSV hsv, int16_t dx, int16_t dy, uint8_t dist, uint
     return hsv;
 }
 
-bool CYCLE_SPIRAL(effect_params_t* params) { return effect_runner_dx_dy_dist(params, &CYCLE_SPIRAL_math); }
+bool CYCLE_SPIRAL(effect_params_t* params) {
+    return effect_runner_dx_dy_dist(params, &CYCLE_SPIRAL_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_CYCLE_SPIRAL
diff --git a/quantum/rgb_matrix/animations/cycle_up_down_anim.h b/quantum/rgb_matrix/animations/cycle_up_down_anim.h
index 277edccb2f..dce05fecff 100644
--- a/quantum/rgb_matrix/animations/cycle_up_down_anim.h
+++ b/quantum/rgb_matrix/animations/cycle_up_down_anim.h
@@ -7,7 +7,9 @@ static HSV CYCLE_UP_DOWN_math(HSV hsv, uint8_t i, uint8_t time) {
     return hsv;
 }
 
-bool CYCLE_UP_DOWN(effect_params_t* params) { return effect_runner_i(params, &CYCLE_UP_DOWN_math); }
+bool CYCLE_UP_DOWN(effect_params_t* params) {
+    return effect_runner_i(params, &CYCLE_UP_DOWN_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
diff --git a/quantum/rgb_matrix/animations/digital_rain_anim.h b/quantum/rgb_matrix/animations/digital_rain_anim.h
index 8ce8fd7039..4633145ff6 100644
--- a/quantum/rgb_matrix/animations/digital_rain_anim.h
+++ b/quantum/rgb_matrix/animations/digital_rain_anim.h
@@ -71,5 +71,5 @@ bool DIGITAL_RAIN(effect_params_t* params) {
     return false;
 }
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && !defined(ENABLE_RGB_MATRIX_DIGITAL_RAIN)
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && !defined(ENABLE_RGB_MATRIX_DIGITAL_RAIN)
diff --git a/quantum/rgb_matrix/animations/dual_beacon_anim.h b/quantum/rgb_matrix/animations/dual_beacon_anim.h
index dbe9b3ecf1..5585015b86 100644
--- a/quantum/rgb_matrix/animations/dual_beacon_anim.h
+++ b/quantum/rgb_matrix/animations/dual_beacon_anim.h
@@ -7,7 +7,9 @@ static HSV DUAL_BEACON_math(HSV hsv, int8_t sin, int8_t cos, uint8_t i, uint8_t
     return hsv;
 }
 
-bool DUAL_BEACON(effect_params_t* params) { return effect_runner_sin_cos_i(params, &DUAL_BEACON_math); }
+bool DUAL_BEACON(effect_params_t* params) {
+    return effect_runner_sin_cos_i(params, &DUAL_BEACON_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_DUAL_BEACON
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_DUAL_BEACON
diff --git a/quantum/rgb_matrix/animations/gradient_left_right_anim.h b/quantum/rgb_matrix/animations/gradient_left_right_anim.h
index 8bb5e570bd..ebb06f59f2 100644
--- a/quantum/rgb_matrix/animations/gradient_left_right_anim.h
+++ b/quantum/rgb_matrix/animations/gradient_left_right_anim.h
@@ -18,5 +18,5 @@ bool GRADIENT_LEFT_RIGHT(effect_params_t* params) {
     return rgb_matrix_check_finished_leds(led_max);
 }
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
diff --git a/quantum/rgb_matrix/animations/gradient_up_down_anim.h b/quantum/rgb_matrix/animations/gradient_up_down_anim.h
index a5674583e3..febc3919a8 100644
--- a/quantum/rgb_matrix/animations/gradient_up_down_anim.h
+++ b/quantum/rgb_matrix/animations/gradient_up_down_anim.h
@@ -18,5 +18,5 @@ bool GRADIENT_UP_DOWN(effect_params_t* params) {
     return rgb_matrix_check_finished_leds(led_max);
 }
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/quantum/rgb_matrix/animations/hue_breathing_anim.h b/quantum/rgb_matrix/animations/hue_breathing_anim.h
index 82be1a4424..8537762832 100644
--- a/quantum/rgb_matrix/animations/hue_breathing_anim.h
+++ b/quantum/rgb_matrix/animations/hue_breathing_anim.h
@@ -18,5 +18,5 @@ bool HUE_BREATHING(effect_params_t* params) {
     return rgb_matrix_check_finished_leds(led_max);
 }
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // DISABLE_RGB_HUE_BREATHING
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // DISABLE_RGB_HUE_BREATHING
diff --git a/quantum/rgb_matrix/animations/hue_pendulum_anim.h b/quantum/rgb_matrix/animations/hue_pendulum_anim.h
index a6e1c1074d..7d8cbcdfb2 100644
--- a/quantum/rgb_matrix/animations/hue_pendulum_anim.h
+++ b/quantum/rgb_matrix/animations/hue_pendulum_anim.h
@@ -11,7 +11,9 @@ static HSV HUE_PENDULUM_math(HSV hsv, uint8_t i, uint8_t time) {
     return hsv;
 }
 
-bool HUE_PENDULUM(effect_params_t* params) { return effect_runner_i(params, &HUE_PENDULUM_math); }
+bool HUE_PENDULUM(effect_params_t* params) {
+    return effect_runner_i(params, &HUE_PENDULUM_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // DISABLE_RGB_HUE_PENDULUM
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // DISABLE_RGB_HUE_PENDULUM
diff --git a/quantum/rgb_matrix/animations/hue_wave_anim.h b/quantum/rgb_matrix/animations/hue_wave_anim.h
index b1c72b7336..81aa7e139e 100644
--- a/quantum/rgb_matrix/animations/hue_wave_anim.h
+++ b/quantum/rgb_matrix/animations/hue_wave_anim.h
@@ -11,7 +11,9 @@ static HSV HUE_WAVE_math(HSV hsv, uint8_t i, uint8_t time) {
     return hsv;
 }
 
-bool HUE_WAVE(effect_params_t* params) { return effect_runner_i(params, &HUE_WAVE_math); }
+bool HUE_WAVE(effect_params_t* params) {
+    return effect_runner_i(params, &HUE_WAVE_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // DISABLE_RGB_HUE_WAVE
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // DISABLE_RGB_HUE_WAVE
diff --git a/quantum/rgb_matrix/animations/jellybean_raindrops_anim.h b/quantum/rgb_matrix/animations/jellybean_raindrops_anim.h
index 3ffb57eb35..31dffcbc5a 100644
--- a/quantum/rgb_matrix/animations/jellybean_raindrops_anim.h
+++ b/quantum/rgb_matrix/animations/jellybean_raindrops_anim.h
@@ -25,5 +25,5 @@ bool JELLYBEAN_RAINDROPS(effect_params_t* params) {
     return rgb_matrix_check_finished_leds(led_max);
 }
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
diff --git a/quantum/rgb_matrix/animations/pixel_flow_anim.h b/quantum/rgb_matrix/animations/pixel_flow_anim.h
new file mode 100644
index 0000000000..714f5d174e
--- /dev/null
+++ b/quantum/rgb_matrix/animations/pixel_flow_anim.h
@@ -0,0 +1,51 @@
+// Copyright 2022 @filterpaper
+// SPDX-License-Identifier: GPL-2.0+
+
+#ifdef ENABLE_RGB_MATRIX_PIXEL_FLOW
+RGB_MATRIX_EFFECT(PIXEL_FLOW)
+#    ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+
+static bool PIXEL_FLOW(effect_params_t* params) {
+    // LED state array
+    static RGB led[DRIVER_LED_TOTAL];
+
+    static uint32_t wait_timer = 0;
+    if (wait_timer > g_rgb_timer) {
+        return false;
+    }
+
+    inline uint32_t interval(void) {
+        return 3000 / scale16by8(qadd8(rgb_matrix_config.speed, 16), 16);
+    }
+
+    if (params->init) {
+        // Clear LEDs and fill the state array
+        rgb_matrix_set_color_all(0, 0, 0);
+        for (uint8_t j = 0; j < DRIVER_LED_TOTAL; ++j) {
+            led[j] = (random8() & 2) ? (RGB){0, 0, 0} : hsv_to_rgb((HSV){random8(), qadd8(random8() >> 1, 127), rgb_matrix_config.hsv.v});
+        }
+    }
+
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    // Light LEDs based on state array
+    for (uint8_t i = led_min; i < led_max; ++i) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        rgb_matrix_set_color(i, led[i].r, led[i].g, led[i].b);
+    }
+
+    if (!rgb_matrix_check_finished_leds(led_max)) {
+        // Shift LED state forward
+        for (uint8_t j = 0; j < led_max - 1; ++j) {
+            led[j] = led[j + 1];
+        }
+        // Fill last LED
+        led[led_max - 1] = (random8() & 2) ? (RGB){0, 0, 0} : hsv_to_rgb((HSV){random8(), qadd8(random8() >> 1, 127), rgb_matrix_config.hsv.v});
+        // Set pulse timer
+        wait_timer = g_rgb_timer + interval();
+    }
+
+    return rgb_matrix_check_finished_leds(led_max);
+}
+
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_PIXEL_FLOW
diff --git a/quantum/rgb_matrix/animations/pixel_fractal_anim.h b/quantum/rgb_matrix/animations/pixel_fractal_anim.h
index 35187b92de..906da1a48e 100644
--- a/quantum/rgb_matrix/animations/pixel_fractal_anim.h
+++ b/quantum/rgb_matrix/animations/pixel_fractal_anim.h
@@ -29,7 +29,9 @@ static bool PIXEL_FRACTAL(effect_params_t* params) {
         return false;
     }
 
-    inline uint32_t interval(void) { return 3000 / scale16by8(qadd8(rgb_matrix_config.speed, 16), 16); }
+    inline uint32_t interval(void) {
+        return 3000 / scale16by8(qadd8(rgb_matrix_config.speed, 16), 16);
+    }
 
     if (params->init) {
         rgb_matrix_set_color_all(0, 0, 0);
@@ -37,7 +39,7 @@ static bool PIXEL_FRACTAL(effect_params_t* params) {
 
     RGB rgb = rgb_matrix_hsv_to_rgb(rgb_matrix_config.hsv);
     for (uint8_t h = 0; h < MATRIX_ROWS; ++h) {
-        for (uint8_t l = 0; l < MID_COL - 1; ++l) {  // Light and move left columns outwards
+        for (uint8_t l = 0; l < MID_COL - 1; ++l) { // Light and move left columns outwards
             if (led[h][l]) {
                 rgb_matrix_set_color(g_led_config.matrix_co[h][l], rgb.r, rgb.g, rgb.b);
             } else {
@@ -46,7 +48,7 @@ static bool PIXEL_FRACTAL(effect_params_t* params) {
             led[h][l] = led[h][l + 1];
         }
 
-        for (uint8_t r = MATRIX_COLS - 1; r > MID_COL; --r) {  // Light and move right columns outwards
+        for (uint8_t r = MATRIX_COLS - 1; r > MID_COL; --r) { // Light and move right columns outwards
             if (led[h][r]) {
                 rgb_matrix_set_color(g_led_config.matrix_co[h][r], rgb.r, rgb.g, rgb.b);
             } else {
@@ -74,5 +76,5 @@ static bool PIXEL_FRACTAL(effect_params_t* params) {
     wait_timer = g_rgb_timer + interval();
     return false;
 }
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_PIXEL_FRACTAL
diff --git a/quantum/rgb_matrix/animations/pixel_rain_anim.h b/quantum/rgb_matrix/animations/pixel_rain_anim.h
index 001649aa6e..03488b43df 100644
--- a/quantum/rgb_matrix/animations/pixel_rain_anim.h
+++ b/quantum/rgb_matrix/animations/pixel_rain_anim.h
@@ -24,7 +24,9 @@ static bool PIXEL_RAIN(effect_params_t* params) {
         return false;
     }
 
-    inline uint32_t interval(void) { return 500 / scale16by8(qadd8(rgb_matrix_config.speed, 16), 16); }
+    inline uint32_t interval(void) {
+        return 500 / scale16by8(qadd8(rgb_matrix_config.speed, 16), 16);
+    }
 
     bool rain_pixel(uint8_t i, effect_params_t * params, bool off) {
         if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) {
@@ -44,5 +46,5 @@ static bool PIXEL_RAIN(effect_params_t* params) {
     return rain_pixel(mod8(random8(), DRIVER_LED_TOTAL), params, random8() & 2);
 }
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_PIXEL_RAIN
diff --git a/quantum/rgb_matrix/animations/rainbow_beacon_anim.h b/quantum/rgb_matrix/animations/rainbow_beacon_anim.h
index cd529958db..bdcca5530f 100644
--- a/quantum/rgb_matrix/animations/rainbow_beacon_anim.h
+++ b/quantum/rgb_matrix/animations/rainbow_beacon_anim.h
@@ -7,7 +7,9 @@ static HSV RAINBOW_BEACON_math(HSV hsv, int8_t sin, int8_t cos, uint8_t i, uint8
     return hsv;
 }
 
-bool RAINBOW_BEACON(effect_params_t* params) { return effect_runner_sin_cos_i(params, &RAINBOW_BEACON_math); }
+bool RAINBOW_BEACON(effect_params_t* params) {
+    return effect_runner_sin_cos_i(params, &RAINBOW_BEACON_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_RAINBOW_BEACON
diff --git a/quantum/rgb_matrix/animations/rainbow_moving_chevron_anim.h b/quantum/rgb_matrix/animations/rainbow_moving_chevron_anim.h
index 2f3de64e9d..f7b8f6c2f3 100644
--- a/quantum/rgb_matrix/animations/rainbow_moving_chevron_anim.h
+++ b/quantum/rgb_matrix/animations/rainbow_moving_chevron_anim.h
@@ -7,7 +7,9 @@ static HSV RAINBOW_MOVING_CHEVRON_math(HSV hsv, uint8_t i, uint8_t time) {
     return hsv;
 }
 
-bool RAINBOW_MOVING_CHEVRON(effect_params_t* params) { return effect_runner_i(params, &RAINBOW_MOVING_CHEVRON_math); }
+bool RAINBOW_MOVING_CHEVRON(effect_params_t* params) {
+    return effect_runner_i(params, &RAINBOW_MOVING_CHEVRON_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
diff --git a/quantum/rgb_matrix/animations/rainbow_pinwheels_anim.h b/quantum/rgb_matrix/animations/rainbow_pinwheels_anim.h
index dae2b5d190..91e31ea8cc 100644
--- a/quantum/rgb_matrix/animations/rainbow_pinwheels_anim.h
+++ b/quantum/rgb_matrix/animations/rainbow_pinwheels_anim.h
@@ -7,7 +7,9 @@ static HSV RAINBOW_PINWHEELS_math(HSV hsv, int8_t sin, int8_t cos, uint8_t i, ui
     return hsv;
 }
 
-bool RAINBOW_PINWHEELS(effect_params_t* params) { return effect_runner_sin_cos_i(params, &RAINBOW_PINWHEELS_math); }
+bool RAINBOW_PINWHEELS(effect_params_t* params) {
+    return effect_runner_sin_cos_i(params, &RAINBOW_PINWHEELS_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
diff --git a/quantum/rgb_matrix/animations/raindrops_anim.h b/quantum/rgb_matrix/animations/raindrops_anim.h
index 4b1b9dd9ec..2d4b53b7b0 100644
--- a/quantum/rgb_matrix/animations/raindrops_anim.h
+++ b/quantum/rgb_matrix/animations/raindrops_anim.h
@@ -35,5 +35,5 @@ bool RAINDROPS(effect_params_t* params) {
     return rgb_matrix_check_finished_leds(led_max);
 }
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_RAINDROPS
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_RAINDROPS
diff --git a/quantum/rgb_matrix/animations/rgb_matrix_effects.inc b/quantum/rgb_matrix/animations/rgb_matrix_effects.inc
index 27ce347235..ac7bac428d 100644
--- a/quantum/rgb_matrix/animations/rgb_matrix_effects.inc
+++ b/quantum/rgb_matrix/animations/rgb_matrix_effects.inc
@@ -27,6 +27,7 @@
 #include "hue_pendulum_anim.h"
 #include "hue_wave_anim.h"
 #include "pixel_rain_anim.h"
+#include "pixel_flow_anim.h"
 #include "pixel_fractal_anim.h"
 #include "typing_heatmap_anim.h"
 #include "digital_rain_anim.h"
diff --git a/quantum/rgb_matrix/animations/runners/effect_runner_reactive.h b/quantum/rgb_matrix/animations/runners/effect_runner_reactive.h
index d5c1a26cef..f9584d7071 100644
--- a/quantum/rgb_matrix/animations/runners/effect_runner_reactive.h
+++ b/quantum/rgb_matrix/animations/runners/effect_runner_reactive.h
@@ -26,4 +26,4 @@ bool effect_runner_reactive(effect_params_t* params, reactive_f effect_func) {
     return rgb_matrix_check_finished_leds(led_max);
 }
 
-#endif  // RGB_MATRIX_KEYREACTIVE_ENABLED
+#endif // RGB_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/rgb_matrix/animations/runners/effect_runner_reactive_splash.h b/quantum/rgb_matrix/animations/runners/effect_runner_reactive_splash.h
index d3a6e4e72f..41020eb47f 100644
--- a/quantum/rgb_matrix/animations/runners/effect_runner_reactive_splash.h
+++ b/quantum/rgb_matrix/animations/runners/effect_runner_reactive_splash.h
@@ -26,4 +26,4 @@ bool effect_runner_reactive_splash(uint8_t start, effect_params_t* params, react
     return rgb_matrix_check_finished_leds(led_max);
 }
 
-#endif  // RGB_MATRIX_KEYREACTIVE_ENABLED
+#endif // RGB_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/rgb_matrix/animations/solid_color_anim.h b/quantum/rgb_matrix/animations/solid_color_anim.h
index 4209959468..c8762dcbc2 100644
--- a/quantum/rgb_matrix/animations/solid_color_anim.h
+++ b/quantum/rgb_matrix/animations/solid_color_anim.h
@@ -12,4 +12,4 @@ bool SOLID_COLOR(effect_params_t* params) {
     return rgb_matrix_check_finished_leds(led_max);
 }
 
-#endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
diff --git a/quantum/rgb_matrix/animations/solid_reactive_anim.h b/quantum/rgb_matrix/animations/solid_reactive_anim.h
index 360d05a67a..d3a7ebbdf7 100644
--- a/quantum/rgb_matrix/animations/solid_reactive_anim.h
+++ b/quantum/rgb_matrix/animations/solid_reactive_anim.h
@@ -8,8 +8,10 @@ static HSV SOLID_REACTIVE_math(HSV hsv, uint16_t offset) {
     return hsv;
 }
 
-bool SOLID_REACTIVE(effect_params_t* params) { return effect_runner_reactive(params, &SOLID_REACTIVE_math); }
+bool SOLID_REACTIVE(effect_params_t* params) {
+    return effect_runner_reactive(params, &SOLID_REACTIVE_math);
+}
 
-#        endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#    endif      // ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#endif          // RGB_MATRIX_KEYREACTIVE_ENABLED
+#        endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#    endif     // ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#endif         // RGB_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/rgb_matrix/animations/solid_reactive_cross.h b/quantum/rgb_matrix/animations/solid_reactive_cross.h
index 496651f8a5..043a369b73 100644
--- a/quantum/rgb_matrix/animations/solid_reactive_cross.h
+++ b/quantum/rgb_matrix/animations/solid_reactive_cross.h
@@ -24,13 +24,17 @@ static HSV SOLID_REACTIVE_CROSS_math(HSV hsv, int16_t dx, int16_t dy, uint8_t di
 }
 
 #            ifdef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-bool SOLID_REACTIVE_CROSS(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_CROSS_math); }
+bool SOLID_REACTIVE_CROSS(effect_params_t* params) {
+    return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_CROSS_math);
+}
 #            endif
 
 #            ifdef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-bool SOLID_REACTIVE_MULTICROSS(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_CROSS_math); }
+bool SOLID_REACTIVE_MULTICROSS(effect_params_t* params) {
+    return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_CROSS_math);
+}
 #            endif
 
-#        endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#    endif      // !defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS) || defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS)
-#endif          // RGB_MATRIX_KEYREACTIVE_ENABLED
+#        endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#    endif     // !defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS) || defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS)
+#endif         // RGB_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/rgb_matrix/animations/solid_reactive_nexus.h b/quantum/rgb_matrix/animations/solid_reactive_nexus.h
index 3562e74a72..8d62a49fea 100644
--- a/quantum/rgb_matrix/animations/solid_reactive_nexus.h
+++ b/quantum/rgb_matrix/animations/solid_reactive_nexus.h
@@ -22,13 +22,17 @@ static HSV SOLID_REACTIVE_NEXUS_math(HSV hsv, int16_t dx, int16_t dy, uint8_t di
 }
 
 #            ifdef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-bool SOLID_REACTIVE_NEXUS(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_NEXUS_math); }
+bool SOLID_REACTIVE_NEXUS(effect_params_t* params) {
+    return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_NEXUS_math);
+}
 #            endif
 
 #            ifdef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-bool SOLID_REACTIVE_MULTINEXUS(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_NEXUS_math); }
+bool SOLID_REACTIVE_MULTINEXUS(effect_params_t* params) {
+    return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_NEXUS_math);
+}
 #            endif
 
-#        endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#    endif      // !defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS) || !defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS)
-#endif          // RGB_MATRIX_KEYREACTIVE_ENABLED
+#        endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#    endif     // !defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS) || !defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS)
+#endif         // RGB_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/rgb_matrix/animations/solid_reactive_simple_anim.h b/quantum/rgb_matrix/animations/solid_reactive_simple_anim.h
index 69189f636b..0d0a424cf3 100644
--- a/quantum/rgb_matrix/animations/solid_reactive_simple_anim.h
+++ b/quantum/rgb_matrix/animations/solid_reactive_simple_anim.h
@@ -8,8 +8,10 @@ static HSV SOLID_REACTIVE_SIMPLE_math(HSV hsv, uint16_t offset) {
     return hsv;
 }
 
-bool SOLID_REACTIVE_SIMPLE(effect_params_t* params) { return effect_runner_reactive(params, &SOLID_REACTIVE_SIMPLE_math); }
+bool SOLID_REACTIVE_SIMPLE(effect_params_t* params) {
+    return effect_runner_reactive(params, &SOLID_REACTIVE_SIMPLE_math);
+}
 
-#        endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#    endif      // ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#endif          // RGB_MATRIX_KEYREACTIVE_ENABLED
+#        endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#    endif     // ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#endif         // RGB_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/rgb_matrix/animations/solid_reactive_wide.h b/quantum/rgb_matrix/animations/solid_reactive_wide.h
index a613c7ff5f..7598796316 100644
--- a/quantum/rgb_matrix/animations/solid_reactive_wide.h
+++ b/quantum/rgb_matrix/animations/solid_reactive_wide.h
@@ -19,13 +19,17 @@ static HSV SOLID_REACTIVE_WIDE_math(HSV hsv, int16_t dx, int16_t dy, uint8_t dis
 }
 
 #            ifdef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-bool SOLID_REACTIVE_WIDE(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_WIDE_math); }
+bool SOLID_REACTIVE_WIDE(effect_params_t* params) {
+    return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_WIDE_math);
+}
 #            endif
 
 #            ifdef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-bool SOLID_REACTIVE_MULTIWIDE(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_WIDE_math); }
+bool SOLID_REACTIVE_MULTIWIDE(effect_params_t* params) {
+    return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_WIDE_math);
+}
 #            endif
 
-#        endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#    endif      // !defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE) || !defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE)
-#endif          // RGB_MATRIX_KEYREACTIVE_ENABLED
+#        endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#    endif     // !defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE) || !defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE)
+#endif         // RGB_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/rgb_matrix/animations/solid_splash_anim.h b/quantum/rgb_matrix/animations/solid_splash_anim.h
index bd9c1cfe2b..77d6f8c5eb 100644
--- a/quantum/rgb_matrix/animations/solid_splash_anim.h
+++ b/quantum/rgb_matrix/animations/solid_splash_anim.h
@@ -19,13 +19,17 @@ HSV SOLID_SPLASH_math(HSV hsv, int16_t dx, int16_t dy, uint8_t dist, uint16_t ti
 }
 
 #            ifdef ENABLE_RGB_MATRIX_SOLID_SPLASH
-bool SOLID_SPLASH(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_SPLASH_math); }
+bool SOLID_SPLASH(effect_params_t* params) {
+    return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_SPLASH_math);
+}
 #            endif
 
 #            ifdef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-bool SOLID_MULTISPLASH(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_SPLASH_math); }
+bool SOLID_MULTISPLASH(effect_params_t* params) {
+    return effect_runner_reactive_splash(0, params, &SOLID_SPLASH_math);
+}
 #            endif
 
-#        endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#    endif      // !defined(ENABLE_RGB_MATRIX_SPLASH) && !defined(ENABLE_RGB_MATRIX_MULTISPLASH)
-#endif          // RGB_MATRIX_KEYREACTIVE_ENABLED
+#        endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#    endif     // !defined(ENABLE_RGB_MATRIX_SPLASH) && !defined(ENABLE_RGB_MATRIX_MULTISPLASH)
+#endif         // RGB_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/rgb_matrix/animations/splash_anim.h b/quantum/rgb_matrix/animations/splash_anim.h
index 382355e9ed..06459e1b0a 100644
--- a/quantum/rgb_matrix/animations/splash_anim.h
+++ b/quantum/rgb_matrix/animations/splash_anim.h
@@ -20,13 +20,17 @@ HSV SPLASH_math(HSV hsv, int16_t dx, int16_t dy, uint8_t dist, uint16_t tick) {
 }
 
 #            ifdef ENABLE_RGB_MATRIX_SPLASH
-bool SPLASH(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SPLASH_math); }
+bool SPLASH(effect_params_t* params) {
+    return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SPLASH_math);
+}
 #            endif
 
 #            ifdef ENABLE_RGB_MATRIX_MULTISPLASH
-bool MULTISPLASH(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SPLASH_math); }
+bool MULTISPLASH(effect_params_t* params) {
+    return effect_runner_reactive_splash(0, params, &SPLASH_math);
+}
 #            endif
 
-#        endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#    endif      // !defined(ENABLE_RGB_MATRIX_SPLASH) || !defined(ENABLE_RGB_MATRIX_MULTISPLASH)
-#endif          // RGB_MATRIX_KEYREACTIVE_ENABLED
+#        endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#    endif     // !defined(ENABLE_RGB_MATRIX_SPLASH) || !defined(ENABLE_RGB_MATRIX_MULTISPLASH)
+#endif         // RGB_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/rgb_matrix/animations/typing_heatmap_anim.h b/quantum/rgb_matrix/animations/typing_heatmap_anim.h
index b66667b9b8..f3a94280c0 100644
--- a/quantum/rgb_matrix/animations/typing_heatmap_anim.h
+++ b/quantum/rgb_matrix/animations/typing_heatmap_anim.h
@@ -82,5 +82,5 @@ bool TYPING_HEATMAP(effect_params_t* params) {
     return led_max < sizeof(g_rgb_frame_buffer);
 }
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && defined(ENABLE_RGB_MATRIX_TYPING_HEATMAP)
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && defined(ENABLE_RGB_MATRIX_TYPING_HEATMAP)
diff --git a/quantum/rgb_matrix/rgb_matrix.c b/quantum/rgb_matrix/rgb_matrix.c
index 51e9554e2d..f721dfc7f2 100644
--- a/quantum/rgb_matrix/rgb_matrix.c
+++ b/quantum/rgb_matrix/rgb_matrix.c
@@ -31,7 +31,9 @@ const led_point_t k_rgb_matrix_center = {112, 32};
 const led_point_t k_rgb_matrix_center = RGB_MATRIX_CENTER;
 #endif
 
-__attribute__((weak)) RGB rgb_matrix_hsv_to_rgb(HSV hsv) { return hsv_to_rgb(hsv); }
+__attribute__((weak)) RGB rgb_matrix_hsv_to_rgb(HSV hsv) {
+    return hsv_to_rgb(hsv);
+}
 
 // Generic effect runners
 #include "rgb_matrix_runners.inc"
@@ -109,14 +111,14 @@ __attribute__((weak)) RGB rgb_matrix_hsv_to_rgb(HSV hsv) { return hsv_to_rgb(hsv
 #endif
 
 // globals
-rgb_config_t rgb_matrix_config;  // TODO: would like to prefix this with g_ for global consistancy, do this in another pr
+rgb_config_t rgb_matrix_config; // TODO: would like to prefix this with g_ for global consistancy, do this in another pr
 uint32_t     g_rgb_timer;
 #ifdef RGB_MATRIX_FRAMEBUFFER_EFFECTS
 uint8_t g_rgb_frame_buffer[MATRIX_ROWS][MATRIX_COLS] = {{0}};
-#endif  // RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#endif // RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #ifdef RGB_MATRIX_KEYREACTIVE_ENABLED
 last_hit_t g_last_hit_tracker;
-#endif  // RGB_MATRIX_KEYREACTIVE_ENABLED
+#endif // RGB_MATRIX_KEYREACTIVE_ENABLED
 
 // internals
 static bool            suspend_state     = false;
@@ -126,13 +128,13 @@ 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;
-#endif  // RGB_DISABLE_TIMEOUT > 0
+#endif // RGB_DISABLE_TIMEOUT > 0
 
 // double buffers
 static uint32_t rgb_timer_buffer;
 #ifdef RGB_MATRIX_KEYREACTIVE_ENABLED
 static last_hit_t last_hit_buffer;
-#endif  // RGB_MATRIX_KEYREACTIVE_ENABLED
+#endif // RGB_MATRIX_KEYREACTIVE_ENABLED
 
 // split rgb matrix
 #if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
@@ -141,7 +143,9 @@ const uint8_t k_rgb_matrix_split[2] = RGB_MATRIX_SPLIT;
 
 EECONFIG_DEBOUNCE_HELPER(rgb_matrix, EECONFIG_RGB_MATRIX, rgb_matrix_config);
 
-void eeconfig_update_rgb_matrix(void) { eeconfig_flush_rgb_matrix(true); }
+void eeconfig_update_rgb_matrix(void) {
+    eeconfig_flush_rgb_matrix(true);
+}
 
 void eeconfig_update_rgb_matrix_default(void) {
     dprintf("eeconfig_update_rgb_matrix_default\n");
@@ -164,7 +168,19 @@ void eeconfig_debug_rgb_matrix(void) {
     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; }
+void rgb_matrix_reload_from_eeprom(void) {
+    rgb_matrix_disable_noeeprom();
+    /* Reset back to what we have in eeprom */
+    eeconfig_init_rgb_matrix();
+    eeconfig_debug_rgb_matrix(); // display current eeprom values
+    if (rgb_matrix_config.enable) {
+        rgb_matrix_mode_noeeprom(rgb_matrix_config.mode);
+    }
+}
+
+__attribute__((weak)) uint8_t rgb_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t *led_i) {
+    return 0;
+}
 
 uint8_t rgb_matrix_map_row_column_to_led(uint8_t row, uint8_t column, uint8_t *led_i) {
     uint8_t led_count = rgb_matrix_map_row_column_to_led_kb(row, column, led_i);
@@ -176,13 +192,18 @@ uint8_t rgb_matrix_map_row_column_to_led(uint8_t row, uint8_t column, uint8_t *l
     return led_count;
 }
 
-void rgb_matrix_update_pwm_buffers(void) { rgb_matrix_driver.flush(); }
+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) {
+    rgb_matrix_driver.set_color(index, 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);
+    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
@@ -194,7 +215,7 @@ void process_rgb_matrix(uint8_t row, uint8_t col, bool pressed) {
 #endif
 #if RGB_DISABLE_TIMEOUT > 0
     rgb_anykey_timer = 0;
-#endif  // RGB_DISABLE_TIMEOUT > 0
+#endif // RGB_DISABLE_TIMEOUT > 0
 
 #ifdef RGB_MATRIX_KEYREACTIVE_ENABLED
     uint8_t led[LED_HITS_TO_REMEMBER];
@@ -204,7 +225,7 @@ void process_rgb_matrix(uint8_t row, uint8_t col, bool pressed) {
     if (!pressed)
 #    elif defined(RGB_MATRIX_KEYPRESSES)
     if (pressed)
-#    endif  // defined(RGB_MATRIX_KEYRELEASES)
+#    endif // defined(RGB_MATRIX_KEYRELEASES)
     {
         led_count = rgb_matrix_map_row_column_to_led(row, col, led);
     }
@@ -212,7 +233,7 @@ void process_rgb_matrix(uint8_t row, uint8_t col, bool pressed) {
     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.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 = LED_HITS_TO_REMEMBER - led_count;
     }
@@ -225,13 +246,13 @@ void process_rgb_matrix(uint8_t row, uint8_t col, bool pressed) {
         last_hit_buffer.tick[index]  = 0;
         last_hit_buffer.count++;
     }
-#endif  // RGB_MATRIX_KEYREACTIVE_ENABLED
+#endif // RGB_MATRIX_KEYREACTIVE_ENABLED
 
 #if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && defined(ENABLE_RGB_MATRIX_TYPING_HEATMAP)
     if (rgb_matrix_config.mode == RGB_MATRIX_TYPING_HEATMAP) {
         process_rgb_matrix_typing_heatmap(row, col);
     }
-#endif  // defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && defined(ENABLE_RGB_MATRIX_TYPING_HEATMAP)
+#endif // defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && defined(ENABLE_RGB_MATRIX_TYPING_HEATMAP)
 }
 
 void rgb_matrix_test(void) {
@@ -270,7 +291,7 @@ static bool rgb_matrix_none(effect_params_t *params) {
 static void rgb_task_timers(void) {
 #if defined(RGB_MATRIX_KEYREACTIVE_ENABLED) || RGB_DISABLE_TIMEOUT > 0
     uint32_t deltaTime = sync_timer_elapsed32(rgb_timer_buffer);
-#endif  // defined(RGB_MATRIX_KEYREACTIVE_ENABLED) || RGB_DISABLE_TIMEOUT > 0
+#endif // defined(RGB_MATRIX_KEYREACTIVE_ENABLED) || RGB_DISABLE_TIMEOUT > 0
     rgb_timer_buffer = sync_timer_read32();
 
     // Update double buffer timers
@@ -278,7 +299,7 @@ static void rgb_task_timers(void) {
     if (rgb_anykey_timer + deltaTime <= UINT32_MAX) {
         rgb_anykey_timer += deltaTime;
     }
-#endif  // RGB_DISABLE_TIMEOUT > 0
+#endif // RGB_DISABLE_TIMEOUT > 0
 
     // Update double buffer last hit timers
 #ifdef RGB_MATRIX_KEYREACTIVE_ENABLED
@@ -290,7 +311,7 @@ static void rgb_task_timers(void) {
         }
         last_hit_buffer.tick[i] += deltaTime;
     }
-#endif  // RGB_MATRIX_KEYREACTIVE_ENABLED
+#endif // RGB_MATRIX_KEYREACTIVE_ENABLED
 }
 
 static void rgb_task_sync(void) {
@@ -307,7 +328,7 @@ static void rgb_task_start(void) {
     g_rgb_timer = rgb_timer_buffer;
 #ifdef RGB_MATRIX_KEYREACTIVE_ENABLED
     g_last_hit_tracker = last_hit_buffer;
-#endif  // RGB_MATRIX_KEYREACTIVE_ENABLED
+#endif // RGB_MATRIX_KEYREACTIVE_ENABLED
 
     // next task
     rgb_task_state = RENDERING;
@@ -393,7 +414,7 @@ void rgb_matrix_task(void) {
     bool suspend_backlight = suspend_state ||
 #if RGB_DISABLE_TIMEOUT > 0
                              (rgb_anykey_timer > (uint32_t)RGB_DISABLE_TIMEOUT) ||
-#endif  // RGB_DISABLE_TIMEOUT > 0
+#endif // RGB_DISABLE_TIMEOUT > 0
                              false;
 
     uint8_t effect = suspend_backlight || !rgb_matrix_config.enable ? 0 : rgb_matrix_config.mode;
@@ -462,7 +483,7 @@ void rgb_matrix_init(void) {
     for (uint8_t i = 0; i < LED_HITS_TO_REMEMBER; ++i) {
         last_hit_buffer.tick[i] = UINT16_MAX;
     }
-#endif  // RGB_MATRIX_KEYREACTIVE_ENABLED
+#endif // RGB_MATRIX_KEYREACTIVE_ENABLED
 
     if (!eeconfig_is_enabled()) {
         dprintf("rgb_matrix_init_drivers eeconfig is not enabled.\n");
@@ -475,20 +496,22 @@ void rgb_matrix_init(void) {
         dprintf("rgb_matrix_init_drivers rgb_matrix_config.mode = 0. Write default values to EEPROM.\n");
         eeconfig_update_rgb_matrix_default();
     }
-    eeconfig_debug_rgb_matrix();  // display current eeprom values
+    eeconfig_debug_rgb_matrix(); // display current eeprom values
 }
 
 void rgb_matrix_set_suspend_state(bool state) {
 #ifdef RGB_DISABLE_WHEN_USB_SUSPENDED
-    if (state && !suspend_state) {  // only run if turning off, and only once
-        rgb_task_render(0);         // turn off all LEDs when suspending
-        rgb_task_flush(0);          // and actually flash led state to LEDs
+    if (state && !suspend_state) { // only run if turning off, and only once
+        rgb_task_render(0);        // turn off all LEDs when suspending
+        rgb_task_flush(0);         // and actually flash led state to LEDs
     }
     suspend_state = state;
 #endif
 }
 
-bool rgb_matrix_get_suspend_state(void) { return suspend_state; }
+bool rgb_matrix_get_suspend_state(void) {
+    return suspend_state;
+}
 
 void rgb_matrix_toggle_eeprom_helper(bool write_to_eeprom) {
     rgb_matrix_config.enable ^= 1;
@@ -496,8 +519,12 @@ void rgb_matrix_toggle_eeprom_helper(bool write_to_eeprom) {
     eeconfig_flag_rgb_matrix(write_to_eeprom);
     dprintf("rgb matrix toggle [%s]: rgb_matrix_config.enable = %u\n", (write_to_eeprom) ? "EEPROM" : "NOEEPROM", rgb_matrix_config.enable);
 }
-void rgb_matrix_toggle_noeeprom(void) { rgb_matrix_toggle_eeprom_helper(false); }
-void rgb_matrix_toggle(void) { rgb_matrix_toggle_eeprom_helper(true); }
+void rgb_matrix_toggle_noeeprom(void) {
+    rgb_matrix_toggle_eeprom_helper(false);
+}
+void rgb_matrix_toggle(void) {
+    rgb_matrix_toggle_eeprom_helper(true);
+}
 
 void rgb_matrix_enable(void) {
     rgb_matrix_enable_noeeprom();
@@ -519,7 +546,9 @@ void rgb_matrix_disable_noeeprom(void) {
     rgb_matrix_config.enable = 0;
 }
 
-uint8_t rgb_matrix_is_enabled(void) { return rgb_matrix_config.enable; }
+uint8_t rgb_matrix_is_enabled(void) {
+    return rgb_matrix_config.enable;
+}
 
 void rgb_matrix_mode_eeprom_helper(uint8_t mode, bool write_to_eeprom) {
     if (!rgb_matrix_config.enable) {
@@ -536,24 +565,38 @@ void rgb_matrix_mode_eeprom_helper(uint8_t mode, bool write_to_eeprom) {
     eeconfig_flag_rgb_matrix(write_to_eeprom);
     dprintf("rgb matrix mode [%s]: %u\n", (write_to_eeprom) ? "EEPROM" : "NOEEPROM", rgb_matrix_config.mode);
 }
-void rgb_matrix_mode_noeeprom(uint8_t mode) { rgb_matrix_mode_eeprom_helper(mode, false); }
-void rgb_matrix_mode(uint8_t mode) { rgb_matrix_mode_eeprom_helper(mode, true); }
+void rgb_matrix_mode_noeeprom(uint8_t mode) {
+    rgb_matrix_mode_eeprom_helper(mode, false);
+}
+void rgb_matrix_mode(uint8_t mode) {
+    rgb_matrix_mode_eeprom_helper(mode, true);
+}
 
-uint8_t rgb_matrix_get_mode(void) { return rgb_matrix_config.mode; }
+uint8_t rgb_matrix_get_mode(void) {
+    return rgb_matrix_config.mode;
+}
 
 void rgb_matrix_step_helper(bool write_to_eeprom) {
     uint8_t mode = rgb_matrix_config.mode + 1;
     rgb_matrix_mode_eeprom_helper((mode < RGB_MATRIX_EFFECT_MAX) ? mode : 1, write_to_eeprom);
 }
-void rgb_matrix_step_noeeprom(void) { rgb_matrix_step_helper(false); }
-void rgb_matrix_step(void) { rgb_matrix_step_helper(true); }
+void rgb_matrix_step_noeeprom(void) {
+    rgb_matrix_step_helper(false);
+}
+void rgb_matrix_step(void) {
+    rgb_matrix_step_helper(true);
+}
 
 void rgb_matrix_step_reverse_helper(bool write_to_eeprom) {
     uint8_t mode = rgb_matrix_config.mode - 1;
     rgb_matrix_mode_eeprom_helper((mode < 1) ? RGB_MATRIX_EFFECT_MAX - 1 : mode, write_to_eeprom);
 }
-void rgb_matrix_step_reverse_noeeprom(void) { rgb_matrix_step_reverse_helper(false); }
-void rgb_matrix_step_reverse(void) { rgb_matrix_step_reverse_helper(true); }
+void rgb_matrix_step_reverse_noeeprom(void) {
+    rgb_matrix_step_reverse_helper(false);
+}
+void rgb_matrix_step_reverse(void) {
+    rgb_matrix_step_reverse_helper(true);
+}
 
 void rgb_matrix_sethsv_eeprom_helper(uint16_t hue, uint8_t sat, uint8_t val, bool write_to_eeprom) {
     if (!rgb_matrix_config.enable) {
@@ -565,56 +608,126 @@ void rgb_matrix_sethsv_eeprom_helper(uint16_t hue, uint8_t sat, uint8_t val, boo
     eeconfig_flag_rgb_matrix(write_to_eeprom);
     dprintf("rgb matrix set hsv [%s]: %u,%u,%u\n", (write_to_eeprom) ? "EEPROM" : "NOEEPROM", rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v);
 }
-void rgb_matrix_sethsv_noeeprom(uint16_t hue, uint8_t sat, uint8_t val) { rgb_matrix_sethsv_eeprom_helper(hue, sat, val, false); }
-void rgb_matrix_sethsv(uint16_t hue, uint8_t sat, uint8_t val) { rgb_matrix_sethsv_eeprom_helper(hue, sat, val, true); }
+void rgb_matrix_sethsv_noeeprom(uint16_t hue, uint8_t sat, uint8_t val) {
+    rgb_matrix_sethsv_eeprom_helper(hue, sat, val, false);
+}
+void rgb_matrix_sethsv(uint16_t hue, uint8_t sat, uint8_t val) {
+    rgb_matrix_sethsv_eeprom_helper(hue, sat, val, true);
+}
 
-HSV     rgb_matrix_get_hsv(void) { return rgb_matrix_config.hsv; }
-uint8_t rgb_matrix_get_hue(void) { return rgb_matrix_config.hsv.h; }
-uint8_t rgb_matrix_get_sat(void) { return rgb_matrix_config.hsv.s; }
-uint8_t rgb_matrix_get_val(void) { return rgb_matrix_config.hsv.v; }
+HSV rgb_matrix_get_hsv(void) {
+    return rgb_matrix_config.hsv;
+}
+uint8_t rgb_matrix_get_hue(void) {
+    return rgb_matrix_config.hsv.h;
+}
+uint8_t rgb_matrix_get_sat(void) {
+    return rgb_matrix_config.hsv.s;
+}
+uint8_t rgb_matrix_get_val(void) {
+    return rgb_matrix_config.hsv.v;
+}
 
-void rgb_matrix_increase_hue_helper(bool write_to_eeprom) { rgb_matrix_sethsv_eeprom_helper(rgb_matrix_config.hsv.h + RGB_MATRIX_HUE_STEP, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v, write_to_eeprom); }
-void rgb_matrix_increase_hue_noeeprom(void) { rgb_matrix_increase_hue_helper(false); }
-void rgb_matrix_increase_hue(void) { rgb_matrix_increase_hue_helper(true); }
+void rgb_matrix_increase_hue_helper(bool write_to_eeprom) {
+    rgb_matrix_sethsv_eeprom_helper(rgb_matrix_config.hsv.h + RGB_MATRIX_HUE_STEP, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v, write_to_eeprom);
+}
+void rgb_matrix_increase_hue_noeeprom(void) {
+    rgb_matrix_increase_hue_helper(false);
+}
+void rgb_matrix_increase_hue(void) {
+    rgb_matrix_increase_hue_helper(true);
+}
 
-void rgb_matrix_decrease_hue_helper(bool write_to_eeprom) { rgb_matrix_sethsv_eeprom_helper(rgb_matrix_config.hsv.h - RGB_MATRIX_HUE_STEP, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v, write_to_eeprom); }
-void rgb_matrix_decrease_hue_noeeprom(void) { rgb_matrix_decrease_hue_helper(false); }
-void rgb_matrix_decrease_hue(void) { rgb_matrix_decrease_hue_helper(true); }
+void rgb_matrix_decrease_hue_helper(bool write_to_eeprom) {
+    rgb_matrix_sethsv_eeprom_helper(rgb_matrix_config.hsv.h - RGB_MATRIX_HUE_STEP, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v, write_to_eeprom);
+}
+void rgb_matrix_decrease_hue_noeeprom(void) {
+    rgb_matrix_decrease_hue_helper(false);
+}
+void rgb_matrix_decrease_hue(void) {
+    rgb_matrix_decrease_hue_helper(true);
+}
 
-void rgb_matrix_increase_sat_helper(bool write_to_eeprom) { rgb_matrix_sethsv_eeprom_helper(rgb_matrix_config.hsv.h, qadd8(rgb_matrix_config.hsv.s, RGB_MATRIX_SAT_STEP), rgb_matrix_config.hsv.v, write_to_eeprom); }
-void rgb_matrix_increase_sat_noeeprom(void) { rgb_matrix_increase_sat_helper(false); }
-void rgb_matrix_increase_sat(void) { rgb_matrix_increase_sat_helper(true); }
+void rgb_matrix_increase_sat_helper(bool write_to_eeprom) {
+    rgb_matrix_sethsv_eeprom_helper(rgb_matrix_config.hsv.h, qadd8(rgb_matrix_config.hsv.s, RGB_MATRIX_SAT_STEP), rgb_matrix_config.hsv.v, write_to_eeprom);
+}
+void rgb_matrix_increase_sat_noeeprom(void) {
+    rgb_matrix_increase_sat_helper(false);
+}
+void rgb_matrix_increase_sat(void) {
+    rgb_matrix_increase_sat_helper(true);
+}
 
-void rgb_matrix_decrease_sat_helper(bool write_to_eeprom) { rgb_matrix_sethsv_eeprom_helper(rgb_matrix_config.hsv.h, qsub8(rgb_matrix_config.hsv.s, RGB_MATRIX_SAT_STEP), rgb_matrix_config.hsv.v, write_to_eeprom); }
-void rgb_matrix_decrease_sat_noeeprom(void) { rgb_matrix_decrease_sat_helper(false); }
-void rgb_matrix_decrease_sat(void) { rgb_matrix_decrease_sat_helper(true); }
+void rgb_matrix_decrease_sat_helper(bool write_to_eeprom) {
+    rgb_matrix_sethsv_eeprom_helper(rgb_matrix_config.hsv.h, qsub8(rgb_matrix_config.hsv.s, RGB_MATRIX_SAT_STEP), rgb_matrix_config.hsv.v, write_to_eeprom);
+}
+void rgb_matrix_decrease_sat_noeeprom(void) {
+    rgb_matrix_decrease_sat_helper(false);
+}
+void rgb_matrix_decrease_sat(void) {
+    rgb_matrix_decrease_sat_helper(true);
+}
 
-void rgb_matrix_increase_val_helper(bool write_to_eeprom) { rgb_matrix_sethsv_eeprom_helper(rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, qadd8(rgb_matrix_config.hsv.v, RGB_MATRIX_VAL_STEP), write_to_eeprom); }
-void rgb_matrix_increase_val_noeeprom(void) { rgb_matrix_increase_val_helper(false); }
-void rgb_matrix_increase_val(void) { rgb_matrix_increase_val_helper(true); }
+void rgb_matrix_increase_val_helper(bool write_to_eeprom) {
+    rgb_matrix_sethsv_eeprom_helper(rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, qadd8(rgb_matrix_config.hsv.v, RGB_MATRIX_VAL_STEP), write_to_eeprom);
+}
+void rgb_matrix_increase_val_noeeprom(void) {
+    rgb_matrix_increase_val_helper(false);
+}
+void rgb_matrix_increase_val(void) {
+    rgb_matrix_increase_val_helper(true);
+}
 
-void rgb_matrix_decrease_val_helper(bool write_to_eeprom) { rgb_matrix_sethsv_eeprom_helper(rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, qsub8(rgb_matrix_config.hsv.v, RGB_MATRIX_VAL_STEP), write_to_eeprom); }
-void rgb_matrix_decrease_val_noeeprom(void) { rgb_matrix_decrease_val_helper(false); }
-void rgb_matrix_decrease_val(void) { rgb_matrix_decrease_val_helper(true); }
+void rgb_matrix_decrease_val_helper(bool write_to_eeprom) {
+    rgb_matrix_sethsv_eeprom_helper(rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, qsub8(rgb_matrix_config.hsv.v, RGB_MATRIX_VAL_STEP), write_to_eeprom);
+}
+void rgb_matrix_decrease_val_noeeprom(void) {
+    rgb_matrix_decrease_val_helper(false);
+}
+void rgb_matrix_decrease_val(void) {
+    rgb_matrix_decrease_val_helper(true);
+}
 
 void rgb_matrix_set_speed_eeprom_helper(uint8_t speed, bool write_to_eeprom) {
     rgb_matrix_config.speed = speed;
     eeconfig_flag_rgb_matrix(write_to_eeprom);
     dprintf("rgb matrix set speed [%s]: %u\n", (write_to_eeprom) ? "EEPROM" : "NOEEPROM", rgb_matrix_config.speed);
 }
-void rgb_matrix_set_speed_noeeprom(uint8_t speed) { rgb_matrix_set_speed_eeprom_helper(speed, false); }
-void rgb_matrix_set_speed(uint8_t speed) { rgb_matrix_set_speed_eeprom_helper(speed, true); }
+void rgb_matrix_set_speed_noeeprom(uint8_t speed) {
+    rgb_matrix_set_speed_eeprom_helper(speed, false);
+}
+void rgb_matrix_set_speed(uint8_t speed) {
+    rgb_matrix_set_speed_eeprom_helper(speed, true);
+}
 
-uint8_t rgb_matrix_get_speed(void) { return rgb_matrix_config.speed; }
+uint8_t rgb_matrix_get_speed(void) {
+    return rgb_matrix_config.speed;
+}
 
-void rgb_matrix_increase_speed_helper(bool write_to_eeprom) { rgb_matrix_set_speed_eeprom_helper(qadd8(rgb_matrix_config.speed, RGB_MATRIX_SPD_STEP), write_to_eeprom); }
-void rgb_matrix_increase_speed_noeeprom(void) { rgb_matrix_increase_speed_helper(false); }
-void rgb_matrix_increase_speed(void) { rgb_matrix_increase_speed_helper(true); }
+void rgb_matrix_increase_speed_helper(bool write_to_eeprom) {
+    rgb_matrix_set_speed_eeprom_helper(qadd8(rgb_matrix_config.speed, RGB_MATRIX_SPD_STEP), write_to_eeprom);
+}
+void rgb_matrix_increase_speed_noeeprom(void) {
+    rgb_matrix_increase_speed_helper(false);
+}
+void rgb_matrix_increase_speed(void) {
+    rgb_matrix_increase_speed_helper(true);
+}
 
-void rgb_matrix_decrease_speed_helper(bool write_to_eeprom) { rgb_matrix_set_speed_eeprom_helper(qsub8(rgb_matrix_config.speed, RGB_MATRIX_SPD_STEP), write_to_eeprom); }
-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); }
+void rgb_matrix_decrease_speed_helper(bool write_to_eeprom) {
+    rgb_matrix_set_speed_eeprom_helper(qsub8(rgb_matrix_config.speed, RGB_MATRIX_SPD_STEP), write_to_eeprom);
+}
+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_matrix_config.flags; }
+led_flags_t rgb_matrix_get_flags(void) {
+    return rgb_matrix_config.flags;
+}
 
-void rgb_matrix_set_flags(led_flags_t flags) { rgb_matrix_config.flags = flags; }
+void rgb_matrix_set_flags(led_flags_t flags) {
+    rgb_matrix_config.flags = flags;
+}
diff --git a/quantum/rgb_matrix/rgb_matrix.h b/quantum/rgb_matrix/rgb_matrix.h
index a804d99abc..359d507a4d 100644
--- a/quantum/rgb_matrix/rgb_matrix.h
+++ b/quantum/rgb_matrix/rgb_matrix.h
@@ -32,6 +32,8 @@
 #    include "is31fl3737.h"
 #elif defined(IS31FL3741)
 #    include "is31fl3741.h"
+#elif defined(IS31FLCOMMON)
+#    include "is31flcommon.h"
 #elif defined(CKLED2001)
 #    include "ckled2001.h"
 #elif defined(AW20216)
@@ -136,6 +138,8 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max);
 
 void rgb_matrix_init(void);
 
+void rgb_matrix_reload_from_eeprom(void);
+
 void        rgb_matrix_set_suspend_state(bool state);
 bool        rgb_matrix_get_suspend_state(void);
 void        rgb_matrix_toggle(void);
@@ -182,6 +186,7 @@ void        rgb_matrix_set_flags(led_flags_t flags);
 
 #ifndef RGBLIGHT_ENABLE
 #    define eeconfig_update_rgblight_current eeconfig_update_rgb_matrix
+#    define rgblight_reload_from_eeprom rgb_matrix_reload_from_eeprom
 #    define rgblight_toggle rgb_matrix_toggle
 #    define rgblight_toggle_noeeprom rgb_matrix_toggle_noeeprom
 #    define rgblight_enable rgb_matrix_enable
diff --git a/quantum/rgb_matrix/rgb_matrix_drivers.c b/quantum/rgb_matrix/rgb_matrix_drivers.c
index 130ca47a63..27fa7369bf 100644
--- a/quantum/rgb_matrix/rgb_matrix_drivers.c
+++ b/quantum/rgb_matrix/rgb_matrix_drivers.c
@@ -23,7 +23,7 @@
  * be here if shared between boards.
  */
 
-#if defined(IS31FL3731) || defined(IS31FL3733) || defined(IS31FL3737) || defined(IS31FL3741) || defined(CKLED2001)
+#if defined(IS31FL3731) || defined(IS31FL3733) || defined(IS31FL3737) || defined(IS31FL3741) || defined(IS31FLCOMMON) || defined(CKLED2001)
 #    include "i2c_master.h"
 
 // TODO: Remove this at some later date
@@ -81,6 +81,18 @@ static void init(void) {
 #    elif defined(IS31FL3741)
     IS31FL3741_init(DRIVER_ADDR_1);
 
+#    elif defined(IS31FLCOMMON)
+    IS31FL_common_init(DRIVER_ADDR_1, ISSI_SSR_1);
+#        if defined(DRIVER_ADDR_2)
+    IS31FL_common_init(DRIVER_ADDR_2, ISSI_SSR_2);
+#            if defined(DRIVER_ADDR_3)
+    IS31FL_common_init(DRIVER_ADDR_3, ISSI_SSR_3);
+#                if defined(DRIVER_ADDR_4)
+    IS31FL_common_init(DRIVER_ADDR_4, ISSI_SSR_4);
+#                endif
+#            endif
+#        endif
+
 #    elif defined(CKLED2001)
     CKLED2001_init(DRIVER_ADDR_1);
 #        if defined(DRIVER_ADDR_2)
@@ -106,6 +118,8 @@ static void init(void) {
         IS31FL3737_set_led_control_register(index, enabled, enabled, enabled);
 #    elif defined(IS31FL3741)
         IS31FL3741_set_led_control_register(index, enabled, enabled, enabled);
+#    elif defined(IS31FLCOMMON)
+        IS31FL_RGB_set_scaling_buffer(index, enabled, enabled, enabled);
 #    elif defined(CKLED2001)
         CKLED2001_set_led_control_register(index, enabled, enabled, enabled);
 #    endif
@@ -145,6 +159,21 @@ static void init(void) {
 #    elif defined(IS31FL3741)
     IS31FL3741_update_led_control_registers(DRIVER_ADDR_1, 0);
 
+#    elif defined(IS31FLCOMMON)
+#        ifdef ISSI_MANUAL_SCALING
+    IS31FL_set_manual_scaling_buffer();
+#        endif
+    IS31FL_common_update_scaling_register(DRIVER_ADDR_1, 0);
+#        if defined(DRIVER_ADDR_2)
+    IS31FL_common_update_scaling_register(DRIVER_ADDR_2, 1);
+#            if defined(DRIVER_ADDR_3)
+    IS31FL_common_update_scaling_register(DRIVER_ADDR_3, 2);
+#                if defined(DRIVER_ADDR_4)
+    IS31FL_common_update_scaling_register(DRIVER_ADDR_4, 3);
+#                endif
+#            endif
+#        endif
+
 #    elif defined(CKLED2001)
     CKLED2001_update_led_control_registers(DRIVER_ADDR_1, 0);
 #        if defined(DRIVER_ADDR_2)
@@ -231,6 +260,27 @@ const rgb_matrix_driver_t rgb_matrix_driver = {
     .set_color_all = IS31FL3741_set_color_all,
 };
 
+#    elif defined(IS31FLCOMMON)
+static void flush(void) {
+    IS31FL_common_update_pwm_register(DRIVER_ADDR_1, 0);
+#        if defined(DRIVER_ADDR_2)
+    IS31FL_common_update_pwm_register(DRIVER_ADDR_2, 1);
+#            if defined(DRIVER_ADDR_3)
+    IS31FL_common_update_pwm_register(DRIVER_ADDR_3, 2);
+#                if defined(DRIVER_ADDR_4)
+    IS31FL_common_update_pwm_register(DRIVER_ADDR_4, 3);
+#                endif
+#            endif
+#        endif
+}
+
+const rgb_matrix_driver_t rgb_matrix_driver = {
+    .init = init,
+    .flush = flush,
+    .set_color = IS31FL_RGB_set_color,
+    .set_color_all = IS31FL_RGB_set_color_all,
+};
+
 #    elif defined(CKLED2001)
 static void flush(void) {
     CKLED2001_update_pwm_buffers(DRIVER_ADDR_1, 0);
@@ -299,10 +349,15 @@ static void flush(void) {
 static inline void setled(int i, uint8_t r, uint8_t g, uint8_t b) {
 #    if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
     const uint8_t k_rgb_matrix_split[2] = RGB_MATRIX_SPLIT;
-    if (!is_keyboard_left() && (i >= k_rgb_matrix_split[0])) {
-        i -= k_rgb_matrix_split[0];
-    } else if (is_keyboard_left() && (i >= k_rgb_matrix_split[0]))
+    if (!is_keyboard_left()) {
+        if (i >= k_rgb_matrix_split[0]) {
+            i -= k_rgb_matrix_split[0];
+        } else {
+            return;
+        }
+    } else if (i >= k_rgb_matrix_split[0]) {
         return;
+    }
 #    endif
 
     rgb_matrix_ws2812_array[i].r = r;
diff --git a/quantum/rgb_matrix/rgb_matrix_types.h b/quantum/rgb_matrix/rgb_matrix_types.h
index df575d6577..d0ac4e4466 100644
--- a/quantum/rgb_matrix/rgb_matrix_types.h
+++ b/quantum/rgb_matrix/rgb_matrix_types.h
@@ -37,7 +37,7 @@
 // Last led hit
 #ifndef LED_HITS_TO_REMEMBER
 #    define LED_HITS_TO_REMEMBER 8
-#endif  // LED_HITS_TO_REMEMBER
+#endif // LED_HITS_TO_REMEMBER
 
 #ifdef RGB_MATRIX_KEYREACTIVE_ENABLED
 typedef struct PACKED {
@@ -47,7 +47,7 @@ typedef struct PACKED {
     uint8_t  index[LED_HITS_TO_REMEMBER];
     uint16_t tick[LED_HITS_TO_REMEMBER];
 } last_hit_t;
-#endif  // RGB_MATRIX_KEYREACTIVE_ENABLED
+#endif // RGB_MATRIX_KEYREACTIVE_ENABLED
 
 typedef enum rgb_task_states { STARTING, RENDERING, FLUSHING, SYNCING } rgb_task_states;
 
@@ -88,7 +88,7 @@ typedef union {
         uint8_t     enable : 2;
         uint8_t     mode : 6;
         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/rgblight/rgblight.c b/quantum/rgblight/rgblight.c
index 148dae78f4..8f933a6e51 100644
--- a/quantum/rgblight/rgblight.c
+++ b/quantum/rgblight/rgblight.c
@@ -72,7 +72,7 @@ static uint8_t static_effect_table[] = {
 #define _RGBM_TMP_STATIC(sym, msym) RGBLIGHT_MODE_##msym,
 #define _RGBM_TMP_DYNAMIC(sym, msym) RGBLIGHT_MODE_##msym,
 static uint8_t mode_base_table[] = {
-    0,  // RGBLIGHT_MODE_zero
+    0, // RGBLIGHT_MODE_zero
 #include "rgblight_modes.h"
 };
 
@@ -96,7 +96,9 @@ static uint8_t mode_base_table[] = {
 #    define RGBLIGHT_DEFAULT_SPD 0
 #endif
 
-static inline int is_static_effect(uint8_t mode) { return memchr(static_effect_table, mode, sizeof(static_effect_table)) != NULL; }
+static inline int is_static_effect(uint8_t mode) {
+    return memchr(static_effect_table, mode, sizeof(static_effect_table)) != NULL;
+}
 
 #ifdef RGBLIGHT_LED_MAP
 const uint8_t led_map[] PROGMEM = RGBLIGHT_LED_MAP;
@@ -143,7 +145,9 @@ void rgblight_set_effect_range(uint8_t start_pos, uint8_t num_leds) {
     rgblight_ranges.effect_num_leds  = num_leds;
 }
 
-__attribute__((weak)) RGB rgblight_hsv_to_rgb(HSV hsv) { return hsv_to_rgb(hsv); }
+__attribute__((weak)) RGB rgblight_hsv_to_rgb(HSV hsv) {
+    return hsv_to_rgb(hsv);
+}
 
 void sethsv_raw(uint8_t hue, uint8_t sat, uint8_t val, LED_TYPE *led1) {
     HSV hsv = {hue, sat, val};
@@ -151,7 +155,9 @@ void sethsv_raw(uint8_t hue, uint8_t sat, uint8_t val, LED_TYPE *led1) {
     setrgb(rgb.r, rgb.g, rgb.b, led1);
 }
 
-void sethsv(uint8_t hue, uint8_t sat, uint8_t val, LED_TYPE *led1) { sethsv_raw(hue, sat, val > RGBLIGHT_LIMIT_VAL ? RGBLIGHT_LIMIT_VAL : val, led1); }
+void sethsv(uint8_t hue, uint8_t sat, uint8_t val, LED_TYPE *led1) {
+    sethsv_raw(hue, sat, val > RGBLIGHT_LIMIT_VAL ? RGBLIGHT_LIMIT_VAL : val, led1);
+}
 
 void setrgb(uint8_t r, uint8_t g, uint8_t b, LED_TYPE *led1) {
     led1->r = r;
@@ -191,7 +197,9 @@ void eeconfig_update_rgblight(uint32_t val) {
 #endif
 }
 
-void eeconfig_update_rgblight_current(void) { eeconfig_update_rgblight(rgblight_config.raw); }
+void eeconfig_update_rgblight_current(void) {
+    eeconfig_update_rgblight(rgblight_config.raw);
+}
 
 void eeconfig_update_rgblight_default(void) {
     rgblight_config.enable = 1;
@@ -238,9 +246,9 @@ void rgblight_init(void) {
     }
     rgblight_check_config();
 
-    eeconfig_debug_rgblight();  // display current eeprom values
+    eeconfig_debug_rgblight(); // display current eeprom values
 
-    rgblight_timer_init();  // setup the timer
+    rgblight_timer_init(); // setup the timer
 
     if (rgblight_config.enable) {
         rgblight_mode_noeeprom(rgblight_config.mode);
@@ -254,13 +262,15 @@ void rgblight_reload_from_eeprom(void) {
     rgblight_config.raw = eeconfig_read_rgblight();
     RGBLIGHT_SPLIT_SET_CHANGE_MODEHSVS;
     rgblight_check_config();
-    eeconfig_debug_rgblight();  // display current eeprom values
+    eeconfig_debug_rgblight(); // display current eeprom values
     if (rgblight_config.enable) {
         rgblight_mode_noeeprom(rgblight_config.mode);
     }
 }
 
-uint32_t rgblight_read_dword(void) { return rgblight_config.raw; }
+uint32_t rgblight_read_dword(void) {
+    return rgblight_config.raw;
+}
 
 void rgblight_update_dword(uint32_t dword) {
     RGBLIGHT_SPLIT_SET_CHANGE_MODEHSVS;
@@ -296,8 +306,12 @@ void rgblight_step_helper(bool write_to_eeprom) {
     }
     rgblight_mode_eeprom_helper(mode, write_to_eeprom);
 }
-void rgblight_step_noeeprom(void) { rgblight_step_helper(false); }
-void rgblight_step(void) { rgblight_step_helper(true); }
+void rgblight_step_noeeprom(void) {
+    rgblight_step_helper(false);
+}
+void rgblight_step(void) {
+    rgblight_step_helper(true);
+}
 void rgblight_step_reverse_helper(bool write_to_eeprom) {
     uint8_t mode = 0;
     mode         = rgblight_config.mode - 1;
@@ -306,8 +320,12 @@ void rgblight_step_reverse_helper(bool write_to_eeprom) {
     }
     rgblight_mode_eeprom_helper(mode, write_to_eeprom);
 }
-void rgblight_step_reverse_noeeprom(void) { rgblight_step_reverse_helper(false); }
-void rgblight_step_reverse(void) { rgblight_step_reverse_helper(true); }
+void rgblight_step_reverse_noeeprom(void) {
+    rgblight_step_reverse_helper(false);
+}
+void rgblight_step_reverse(void) {
+    rgblight_step_reverse_helper(true);
+}
 
 uint8_t rgblight_get_mode(void) {
     if (!rgblight_config.enable) {
@@ -346,9 +364,13 @@ void rgblight_mode_eeprom_helper(uint8_t mode, bool write_to_eeprom) {
     rgblight_sethsv_noeeprom(rgblight_config.hue, rgblight_config.sat, rgblight_config.val);
 }
 
-void rgblight_mode(uint8_t mode) { rgblight_mode_eeprom_helper(mode, true); }
+void rgblight_mode(uint8_t mode) {
+    rgblight_mode_eeprom_helper(mode, true);
+}
 
-void rgblight_mode_noeeprom(uint8_t mode) { rgblight_mode_eeprom_helper(mode, false); }
+void rgblight_mode_noeeprom(uint8_t mode) {
+    rgblight_mode_eeprom_helper(mode, false);
+}
 
 void rgblight_toggle(void) {
     dprintf("rgblight toggle [EEPROM]: rgblight_config.enable = %u\n", !rgblight_config.enable);
@@ -401,64 +423,98 @@ void rgblight_disable_noeeprom(void) {
     rgblight_set();
 }
 
-bool rgblight_is_enabled(void) { return rgblight_config.enable; }
+bool rgblight_is_enabled(void) {
+    return rgblight_config.enable;
+}
 
 void rgblight_increase_hue_helper(bool write_to_eeprom) {
     uint8_t hue = rgblight_config.hue + RGBLIGHT_HUE_STEP;
     rgblight_sethsv_eeprom_helper(hue, rgblight_config.sat, rgblight_config.val, write_to_eeprom);
 }
-void rgblight_increase_hue_noeeprom(void) { rgblight_increase_hue_helper(false); }
-void rgblight_increase_hue(void) { rgblight_increase_hue_helper(true); }
+void rgblight_increase_hue_noeeprom(void) {
+    rgblight_increase_hue_helper(false);
+}
+void rgblight_increase_hue(void) {
+    rgblight_increase_hue_helper(true);
+}
 void rgblight_decrease_hue_helper(bool write_to_eeprom) {
     uint8_t hue = rgblight_config.hue - RGBLIGHT_HUE_STEP;
     rgblight_sethsv_eeprom_helper(hue, rgblight_config.sat, rgblight_config.val, write_to_eeprom);
 }
-void rgblight_decrease_hue_noeeprom(void) { rgblight_decrease_hue_helper(false); }
-void rgblight_decrease_hue(void) { rgblight_decrease_hue_helper(true); }
+void rgblight_decrease_hue_noeeprom(void) {
+    rgblight_decrease_hue_helper(false);
+}
+void rgblight_decrease_hue(void) {
+    rgblight_decrease_hue_helper(true);
+}
 void rgblight_increase_sat_helper(bool write_to_eeprom) {
     uint8_t sat = qadd8(rgblight_config.sat, RGBLIGHT_SAT_STEP);
     rgblight_sethsv_eeprom_helper(rgblight_config.hue, sat, rgblight_config.val, write_to_eeprom);
 }
-void rgblight_increase_sat_noeeprom(void) { rgblight_increase_sat_helper(false); }
-void rgblight_increase_sat(void) { rgblight_increase_sat_helper(true); }
+void rgblight_increase_sat_noeeprom(void) {
+    rgblight_increase_sat_helper(false);
+}
+void rgblight_increase_sat(void) {
+    rgblight_increase_sat_helper(true);
+}
 void rgblight_decrease_sat_helper(bool write_to_eeprom) {
     uint8_t sat = qsub8(rgblight_config.sat, RGBLIGHT_SAT_STEP);
     rgblight_sethsv_eeprom_helper(rgblight_config.hue, sat, rgblight_config.val, write_to_eeprom);
 }
-void rgblight_decrease_sat_noeeprom(void) { rgblight_decrease_sat_helper(false); }
-void rgblight_decrease_sat(void) { rgblight_decrease_sat_helper(true); }
+void rgblight_decrease_sat_noeeprom(void) {
+    rgblight_decrease_sat_helper(false);
+}
+void rgblight_decrease_sat(void) {
+    rgblight_decrease_sat_helper(true);
+}
 void rgblight_increase_val_helper(bool write_to_eeprom) {
     uint8_t val = qadd8(rgblight_config.val, RGBLIGHT_VAL_STEP);
     rgblight_sethsv_eeprom_helper(rgblight_config.hue, rgblight_config.sat, val, write_to_eeprom);
 }
-void rgblight_increase_val_noeeprom(void) { rgblight_increase_val_helper(false); }
-void rgblight_increase_val(void) { rgblight_increase_val_helper(true); }
+void rgblight_increase_val_noeeprom(void) {
+    rgblight_increase_val_helper(false);
+}
+void rgblight_increase_val(void) {
+    rgblight_increase_val_helper(true);
+}
 void rgblight_decrease_val_helper(bool write_to_eeprom) {
     uint8_t val = qsub8(rgblight_config.val, RGBLIGHT_VAL_STEP);
     rgblight_sethsv_eeprom_helper(rgblight_config.hue, rgblight_config.sat, val, write_to_eeprom);
 }
-void rgblight_decrease_val_noeeprom(void) { rgblight_decrease_val_helper(false); }
-void rgblight_decrease_val(void) { rgblight_decrease_val_helper(true); }
+void rgblight_decrease_val_noeeprom(void) {
+    rgblight_decrease_val_helper(false);
+}
+void rgblight_decrease_val(void) {
+    rgblight_decrease_val_helper(true);
+}
 
 void rgblight_increase_speed_helper(bool write_to_eeprom) {
     if (rgblight_config.speed < 3) rgblight_config.speed++;
     // RGBLIGHT_SPLIT_SET_CHANGE_HSVS; // NEED?
     if (write_to_eeprom) {
-        eeconfig_update_rgblight(rgblight_config.raw);  // EECONFIG needs to be increased to support this
+        eeconfig_update_rgblight(rgblight_config.raw); // EECONFIG needs to be increased to support this
     }
 }
-void rgblight_increase_speed(void) { rgblight_increase_speed_helper(true); }
-void rgblight_increase_speed_noeeprom(void) { rgblight_increase_speed_helper(false); }
+void rgblight_increase_speed(void) {
+    rgblight_increase_speed_helper(true);
+}
+void rgblight_increase_speed_noeeprom(void) {
+    rgblight_increase_speed_helper(false);
+}
 
 void rgblight_decrease_speed_helper(bool write_to_eeprom) {
     if (rgblight_config.speed > 0) rgblight_config.speed--;
     // RGBLIGHT_SPLIT_SET_CHANGE_HSVS; // NEED??
     if (write_to_eeprom) {
-        eeconfig_update_rgblight(rgblight_config.raw);  // EECONFIG needs to be increased to support this
+        eeconfig_update_rgblight(rgblight_config.raw); // EECONFIG needs to be increased to support this
     }
 }
-void rgblight_decrease_speed(void) { rgblight_decrease_speed_helper(true); }
-void rgblight_decrease_speed_noeeprom(void) { rgblight_decrease_speed_helper(false); }
+void rgblight_decrease_speed(void) {
+    rgblight_decrease_speed_helper(true);
+}
+void rgblight_decrease_speed_noeeprom(void) {
+    rgblight_decrease_speed_helper(false);
+}
 
 void rgblight_sethsv_noeeprom_old(uint8_t hue, uint8_t sat, uint8_t val) {
     if (rgblight_config.enable) {
@@ -478,7 +534,7 @@ void rgblight_sethsv_eeprom_helper(uint8_t hue, uint8_t sat, uint8_t val, bool w
             rgblight_setrgb(tmp_led.r, tmp_led.g, tmp_led.b);
         } else {
             // all LEDs in same color
-            if (1 == 0) {  // dummy
+            if (1 == 0) { // dummy
             }
 #ifdef RGBLIGHT_EFFECT_BREATHING
             else if (rgblight_status.base_mode == RGBLIGHT_MODE_BREATHING) {
@@ -540,33 +596,51 @@ void rgblight_sethsv_eeprom_helper(uint8_t hue, uint8_t sat, uint8_t val, bool w
     }
 }
 
-void rgblight_sethsv(uint8_t hue, uint8_t sat, uint8_t val) { rgblight_sethsv_eeprom_helper(hue, sat, val, true); }
+void rgblight_sethsv(uint8_t hue, uint8_t sat, uint8_t val) {
+    rgblight_sethsv_eeprom_helper(hue, sat, val, true);
+}
 
-void rgblight_sethsv_noeeprom(uint8_t hue, uint8_t sat, uint8_t val) { rgblight_sethsv_eeprom_helper(hue, sat, val, false); }
+void rgblight_sethsv_noeeprom(uint8_t hue, uint8_t sat, uint8_t val) {
+    rgblight_sethsv_eeprom_helper(hue, sat, val, false);
+}
 
-uint8_t rgblight_get_speed(void) { return rgblight_config.speed; }
+uint8_t rgblight_get_speed(void) {
+    return rgblight_config.speed;
+}
 
 void rgblight_set_speed_eeprom_helper(uint8_t speed, bool write_to_eeprom) {
     rgblight_config.speed = speed;
     if (write_to_eeprom) {
-        eeconfig_update_rgblight(rgblight_config.raw);  // EECONFIG needs to be increased to support this
+        eeconfig_update_rgblight(rgblight_config.raw); // EECONFIG needs to be increased to support this
         dprintf("rgblight set speed [EEPROM]: %u\n", rgblight_config.speed);
     } else {
         dprintf("rgblight set speed [NOEEPROM]: %u\n", rgblight_config.speed);
     }
 }
 
-void rgblight_set_speed(uint8_t speed) { rgblight_set_speed_eeprom_helper(speed, true); }
+void rgblight_set_speed(uint8_t speed) {
+    rgblight_set_speed_eeprom_helper(speed, true);
+}
 
-void rgblight_set_speed_noeeprom(uint8_t speed) { rgblight_set_speed_eeprom_helper(speed, false); }
+void rgblight_set_speed_noeeprom(uint8_t speed) {
+    rgblight_set_speed_eeprom_helper(speed, false);
+}
 
-uint8_t rgblight_get_hue(void) { return rgblight_config.hue; }
+uint8_t rgblight_get_hue(void) {
+    return rgblight_config.hue;
+}
 
-uint8_t rgblight_get_sat(void) { return rgblight_config.sat; }
+uint8_t rgblight_get_sat(void) {
+    return rgblight_config.sat;
+}
 
-uint8_t rgblight_get_val(void) { return rgblight_config.val; }
+uint8_t rgblight_get_val(void) {
+    return rgblight_config.val;
+}
 
-HSV rgblight_get_hsv(void) { return (HSV){rgblight_config.hue, rgblight_config.sat, rgblight_config.val}; }
+HSV rgblight_get_hsv(void) {
+    return (HSV){rgblight_config.hue, rgblight_config.sat, rgblight_config.val};
+}
 
 void rgblight_setrgb(uint8_t r, uint8_t g, uint8_t b) {
     if (!rgblight_config.enable) {
@@ -648,14 +722,22 @@ void rgblight_sethsv_range(uint8_t hue, uint8_t sat, uint8_t val, uint8_t start,
 }
 
 #ifndef RGBLIGHT_SPLIT
-void rgblight_setrgb_master(uint8_t r, uint8_t g, uint8_t b) { rgblight_setrgb_range(r, g, b, 0, (uint8_t)RGBLED_NUM / 2); }
+void rgblight_setrgb_master(uint8_t r, uint8_t g, uint8_t b) {
+    rgblight_setrgb_range(r, g, b, 0, (uint8_t)RGBLED_NUM / 2);
+}
 
-void rgblight_setrgb_slave(uint8_t r, uint8_t g, uint8_t b) { rgblight_setrgb_range(r, g, b, (uint8_t)RGBLED_NUM / 2, (uint8_t)RGBLED_NUM); }
+void rgblight_setrgb_slave(uint8_t r, uint8_t g, uint8_t b) {
+    rgblight_setrgb_range(r, g, b, (uint8_t)RGBLED_NUM / 2, (uint8_t)RGBLED_NUM);
+}
 
-void rgblight_sethsv_master(uint8_t hue, uint8_t sat, uint8_t val) { rgblight_sethsv_range(hue, sat, val, 0, (uint8_t)RGBLED_NUM / 2); }
+void rgblight_sethsv_master(uint8_t hue, uint8_t sat, uint8_t val) {
+    rgblight_sethsv_range(hue, sat, val, 0, (uint8_t)RGBLED_NUM / 2);
+}
 
-void rgblight_sethsv_slave(uint8_t hue, uint8_t sat, uint8_t val) { rgblight_sethsv_range(hue, sat, val, (uint8_t)RGBLED_NUM / 2, (uint8_t)RGBLED_NUM); }
-#endif  // ifndef RGBLIGHT_SPLIT
+void rgblight_sethsv_slave(uint8_t hue, uint8_t sat, uint8_t val) {
+    rgblight_sethsv_range(hue, sat, val, (uint8_t)RGBLED_NUM / 2, (uint8_t)RGBLED_NUM);
+}
+#endif // ifndef RGBLIGHT_SPLIT
 
 #ifdef RGBLIGHT_LAYERS
 void rgblight_set_layer_state(uint8_t layer, bool enabled) {
@@ -693,18 +775,18 @@ static void rgblight_layers_write(void) {
     // For each layer
     for (const rgblight_segment_t *const *layer_ptr = rgblight_layers; i < RGBLIGHT_MAX_LAYERS; layer_ptr++, i++) {
         if (!rgblight_get_layer_state(i)) {
-            continue;  // Layer is disabled
+            continue; // Layer is disabled
         }
         const rgblight_segment_t *segment_ptr = pgm_read_ptr(layer_ptr);
         if (segment_ptr == NULL) {
-            break;  // No more layers
+            break; // No more layers
         }
         // For each segment
         while (1) {
             rgblight_segment_t segment;
             memcpy_P(&segment, segment_ptr, sizeof(rgblight_segment_t));
             if (segment.index == RGBLIGHT_END_SEGMENT_INDEX) {
-                break;  // No more segments
+                break; // No more segments
             }
             // Write segment.count LEDs
             LED_TYPE *const limit = &led[MIN(segment.index + segment.count, RGBLED_NUM)];
@@ -726,7 +808,9 @@ static uint16_t       _repeat_timer;
 static uint8_t        _times_remaining;
 static uint16_t       _dur;
 
-void rgblight_blink_layer(uint8_t layer, uint16_t duration_ms) { rgblight_blink_layer_repeat(layer, duration_ms, 1); }
+void rgblight_blink_layer(uint8_t layer, uint16_t duration_ms) {
+    rgblight_blink_layer_repeat(layer, duration_ms, 1);
+}
 
 void rgblight_blink_layer_repeat(uint8_t layer, uint16_t duration_ms, uint8_t times) {
     _times_remaining = times * 2;
@@ -796,7 +880,9 @@ void rgblight_wakeup(void) {
 
 #endif
 
-__attribute__((weak)) void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds) { ws2812_setleds(start_led, num_leds); }
+__attribute__((weak)) void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds) {
+    ws2812_setleds(start_led, num_leds);
+}
 
 #ifndef RGBLIGHT_CUSTOM_DRIVER
 
@@ -848,9 +934,13 @@ void rgblight_set(void) {
 
 #ifdef RGBLIGHT_SPLIT
 /* for split keyboard master side */
-uint8_t rgblight_get_change_flags(void) { return rgblight_status.change_flags; }
+uint8_t rgblight_get_change_flags(void) {
+    return rgblight_status.change_flags;
+}
 
-void rgblight_clear_change_flags(void) { rgblight_status.change_flags = 0; }
+void rgblight_clear_change_flags(void) {
+    rgblight_status.change_flags = 0;
+}
 
 void rgblight_get_syncinfo(rgblight_syncinfo_t *syncinfo) {
     syncinfo->config = rgblight_config;
@@ -866,7 +956,7 @@ void rgblight_update_sync(rgblight_syncinfo_t *syncinfo, bool write_to_eeprom) {
 #    endif
     if (syncinfo->status.change_flags & RGBLIGHT_STATUS_CHANGE_MODE) {
         if (syncinfo->config.enable) {
-            rgblight_config.enable = 1;  // == rgblight_enable_noeeprom();
+            rgblight_config.enable = 1; // == rgblight_enable_noeeprom();
             rgblight_mode_eeprom_helper(syncinfo->config.mode, write_to_eeprom);
         } else {
             rgblight_disable_noeeprom();
@@ -945,12 +1035,12 @@ static void rgblight_effect_dummy(animation_status_t *anim) {
 void rgblight_task(void) {
     if (rgblight_status.timer_enabled) {
         effect_func_t effect_func   = rgblight_effect_dummy;
-        uint16_t      interval_time = 2000;  // dummy interval
+        uint16_t      interval_time = 2000; // dummy interval
         uint8_t       delta         = rgblight_config.mode - rgblight_status.base_mode;
         animation_status.delta      = delta;
 
         // static light mode, do nothing here
-        if (1 == 0) {  // dummy
+        if (1 == 0) { // dummy
         }
 #    ifdef RGBLIGHT_EFFECT_BREATHING
         else if (rgblight_status.base_mode == RGBLIGHT_MODE_BREATHING) {
@@ -1016,7 +1106,7 @@ void rgblight_task(void) {
         if (animation_status.restart) {
             animation_status.restart    = false;
             animation_status.last_timer = sync_timer_read();
-            animation_status.pos16      = 0;  // restart signal to local each effect
+            animation_status.pos16      = 0; // restart signal to local each effect
         }
         uint16_t now = sync_timer_read();
         if (timer_expired(now, animation_status.last_timer)) {
@@ -1055,7 +1145,7 @@ void rgblight_task(void) {
 
 #    ifndef RGBLIGHT_EFFECT_BREATHE_CENTER
 #        ifndef RGBLIGHT_BREATHE_TABLE_SIZE
-#            define RGBLIGHT_BREATHE_TABLE_SIZE 256  // 256 or 128 or 64
+#            define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256 or 128 or 64
 #        endif
 #        include <rgblight_breathe_table.h>
 #    endif
@@ -1131,7 +1221,7 @@ void rgblight_effect_snake(animation_status_t *anim) {
     }
 
 #    if defined(RGBLIGHT_SPLIT) && !defined(RGBLIGHT_SPLIT_NO_ANIMATION_SYNC)
-    if (anim->pos == 0) {  // restart signal
+    if (anim->pos == 0) { // restart signal
         if (increment == 1) {
             pos = rgblight_ranges.effect_num_leds - 1;
         } else {
@@ -1194,7 +1284,7 @@ void rgblight_effect_knight(animation_status_t *anim) {
     uint8_t       i, cur;
 
 #    if defined(RGBLIGHT_SPLIT) && !defined(RGBLIGHT_SPLIT_NO_ANIMATION_SYNC)
-    if (anim->pos == 0) {  // restart signal
+    if (anim->pos == 0) { // restart signal
         anim->pos  = 1;
         low_bound  = 0;
         high_bound = RGBLIGHT_EFFECT_KNIGHT_LENGTH - 1;
@@ -1347,8 +1437,12 @@ void rgblight_effect_twinkle(animation_status_t *anim) {
     const uint8_t bottom = breathe_calc(0);
     const uint8_t top    = breathe_calc(127);
 
-    uint8_t frac(uint8_t n, uint8_t d) { return (uint16_t)255 * n / d; }
-    uint8_t scale(uint16_t v, uint8_t scale) { return (v * scale) >> 8; }
+    uint8_t frac(uint8_t n, uint8_t d) {
+        return (uint16_t)255 * n / d;
+    }
+    uint8_t scale(uint16_t v, uint8_t scale) {
+        return (v * scale) >> 8;
+    }
 
     for (uint8_t i = 0; i < rgblight_ranges.effect_num_leds; i++) {
         TwinkleState *t = &(led_twinkle_state[i]);
diff --git a/quantum/rgblight/rgblight.h b/quantum/rgblight/rgblight.h
index 5b90b8f49e..7076dc41ac 100644
--- a/quantum/rgblight/rgblight.h
+++ b/quantum/rgblight/rgblight.h
@@ -119,7 +119,7 @@ enum RGBLIGHT_EFFECT_MODE {
 // sample: #define RGBLIGHT_EFFECT_BREATHE_CENTER   1.85
 
 #ifndef RGBLIGHT_EFFECT_BREATHE_MAX
-#    define RGBLIGHT_EFFECT_BREATHE_MAX 255  // 0-255
+#    define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0-255
 #endif
 
 #ifndef RGBLIGHT_EFFECT_SNAKE_LENGTH
@@ -177,8 +177,8 @@ enum RGBLIGHT_EFFECT_MODE {
 
 #ifdef RGBLIGHT_LAYERS
 typedef struct {
-    uint8_t index;  // The first LED to light
-    uint8_t count;  // The number of LEDs to light
+    uint8_t index; // The first LED to light
+    uint8_t count; // The number of LEDs to light
     uint8_t hue;
     uint8_t sat;
     uint8_t val;
@@ -241,7 +241,7 @@ typedef union {
         uint8_t hue : 8;
         uint8_t sat : 8;
         uint8_t val : 8;
-        uint8_t speed : 8;  // EECONFIG needs to be increased to support this
+        uint8_t speed : 8; // EECONFIG needs to be increased to support this
     };
 } rgblight_config_t;
 
@@ -271,7 +271,7 @@ extern rgblight_ranges_t rgblight_ranges;
 
 /* === Utility Functions ===*/
 void sethsv(uint8_t hue, uint8_t sat, uint8_t val, LED_TYPE *led1);
-void sethsv_raw(uint8_t hue, uint8_t sat, uint8_t val, LED_TYPE *led1);  // without RGBLIGHT_LIMIT_VAL check
+void sethsv_raw(uint8_t hue, uint8_t sat, uint8_t val, LED_TYPE *led1); // without RGBLIGHT_LIMIT_VAL check
 void setrgb(uint8_t r, uint8_t g, uint8_t b, LED_TYPE *led1);
 
 /* === Low level Functions === */
diff --git a/quantum/ring_buffer.h b/quantum/ring_buffer.h
index 284745ca8e..85419de11b 100644
--- a/quantum/ring_buffer.h
+++ b/quantum/ring_buffer.h
@@ -36,9 +36,13 @@ static inline uint8_t rbuf_dequeue(void) {
 }
 static inline bool rbuf_has_data(void) {
     bool has_data;
-    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { has_data = (rbuf_head != rbuf_tail); }
+    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
+        has_data = (rbuf_head != rbuf_tail);
+    }
     return has_data;
 }
 static inline void rbuf_clear(void) {
-    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { rbuf_head = rbuf_tail = 0; }
+    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
+        rbuf_head = rbuf_tail = 0;
+    }
 }
diff --git a/quantum/send_string.c b/quantum/send_string.c
index 1a7f7a1315..0de12ba12d 100644
--- a/quantum/send_string.c
+++ b/quantum/send_string.c
@@ -142,9 +142,13 @@ __attribute__((weak)) const uint8_t ascii_to_keycode_lut[128] PROGMEM = {
 // Note: we bit-pack in "reverse" order to optimize loading
 #define PGM_LOADBIT(mem, pos) ((pgm_read_byte(&((mem)[(pos) / 8])) >> ((pos) % 8)) & 0x01)
 
-void send_string(const char *str) { send_string_with_delay(str, 0); }
+void send_string(const char *str) {
+    send_string_with_delay(str, 0);
+}
 
-void send_string_P(const char *str) { send_string_with_delay_P(str, 0); }
+void send_string_P(const char *str) {
+    send_string_with_delay_P(str, 0);
+}
 
 void send_string_with_delay(const char *str, uint8_t interval) {
     while (1) {
@@ -173,7 +177,8 @@ void send_string_with_delay(const char *str, uint8_t interval) {
                     ms += keycode - '0';
                     keycode = *(++str);
                 }
-                while (ms--) wait_ms(1);
+                while (ms--)
+                    wait_ms(1);
             }
         } else {
             send_char(ascii_code);
@@ -182,7 +187,8 @@ void send_string_with_delay(const char *str, uint8_t interval) {
         // interval
         {
             uint8_t ms = interval;
-            while (ms--) wait_ms(1);
+            while (ms--)
+                wait_ms(1);
         }
     }
 }
@@ -214,7 +220,8 @@ void send_string_with_delay_P(const char *str, uint8_t interval) {
                     ms += keycode - '0';
                     keycode = pgm_read_byte(++str);
                 }
-                while (ms--) wait_ms(1);
+                while (ms--)
+                    wait_ms(1);
             }
         } else {
             send_char(ascii_code);
@@ -223,14 +230,15 @@ void send_string_with_delay_P(const char *str, uint8_t interval) {
         // interval
         {
             uint8_t ms = interval;
-            while (ms--) wait_ms(1);
+            while (ms--)
+                wait_ms(1);
         }
     }
 }
 
 void send_char(char ascii_code) {
 #if defined(AUDIO_ENABLE) && defined(SENDSTRING_BELL)
-    if (ascii_code == '\a') {  // BEL
+    if (ascii_code == '\a') { // BEL
         PLAY_SONG(bell_song);
         return;
     }
diff --git a/quantum/sequencer/sequencer.c b/quantum/sequencer/sequencer.c
index 18a83661ec..2e92f7b3eb 100644
--- a/quantum/sequencer/sequencer.c
+++ b/quantum/sequencer/sequencer.c
@@ -25,16 +25,18 @@
 #endif
 
 sequencer_config_t sequencer_config = {
-    false,     // enabled
-    {false},   // steps
-    {0},       // track notes
-    60,        // tempo
-    SQ_RES_4,  // resolution
+    false,    // enabled
+    {false},  // steps
+    {0},      // track notes
+    60,       // tempo
+    SQ_RES_4, // resolution
 };
 
 sequencer_state_t sequencer_internal_state = {0, 0, 0, 0, SEQUENCER_PHASE_ATTACK};
 
-bool is_sequencer_on(void) { return sequencer_config.enabled; }
+bool is_sequencer_on(void) {
+    return sequencer_config.enabled;
+}
 
 void sequencer_on(void) {
     dprintln("sequencer on");
@@ -65,7 +67,9 @@ void sequencer_set_track_notes(const uint16_t track_notes[SEQUENCER_TRACKS]) {
     }
 }
 
-bool is_sequencer_track_active(uint8_t track) { return (sequencer_internal_state.active_tracks >> track) & true; }
+bool is_sequencer_track_active(uint8_t track) {
+    return (sequencer_internal_state.active_tracks >> track) & true;
+}
 
 void sequencer_set_track_activation(uint8_t track, bool value) {
     if (value) {
@@ -76,7 +80,9 @@ void sequencer_set_track_activation(uint8_t track, bool value) {
     dprintf("sequencer: track %d is %s\n", track, value ? "active" : "inactive");
 }
 
-void sequencer_toggle_track_activation(uint8_t track) { sequencer_set_track_activation(track, !is_sequencer_track_active(track)); }
+void sequencer_toggle_track_activation(uint8_t track) {
+    sequencer_set_track_activation(track, !is_sequencer_track_active(track));
+}
 
 void sequencer_toggle_single_active_track(uint8_t track) {
     if (is_sequencer_track_active(track)) {
@@ -86,9 +92,13 @@ void sequencer_toggle_single_active_track(uint8_t track) {
     }
 }
 
-bool is_sequencer_step_on(uint8_t step) { return step < SEQUENCER_STEPS && (sequencer_config.steps[step] & sequencer_internal_state.active_tracks) > 0; }
+bool is_sequencer_step_on(uint8_t step) {
+    return step < SEQUENCER_STEPS && (sequencer_config.steps[step] & sequencer_internal_state.active_tracks) > 0;
+}
 
-bool is_sequencer_step_on_for_track(uint8_t step, uint8_t track) { return step < SEQUENCER_STEPS && (sequencer_config.steps[step] >> track) & true; }
+bool is_sequencer_step_on_for_track(uint8_t step, uint8_t track) {
+    return step < SEQUENCER_STEPS && (sequencer_config.steps[step] >> track) & true;
+}
 
 void sequencer_set_step(uint8_t step, bool value) {
     if (step < SEQUENCER_STEPS) {
@@ -122,7 +132,9 @@ void sequencer_set_all_steps(bool value) {
     dprintf("sequencer: all steps are %s\n", value ? "on" : "off");
 }
 
-uint8_t sequencer_get_tempo(void) { return sequencer_config.tempo; }
+uint8_t sequencer_get_tempo(void) {
+    return sequencer_config.tempo;
+}
 
 void sequencer_set_tempo(uint8_t tempo) {
     if (tempo > 0) {
@@ -142,9 +154,13 @@ void sequencer_increase_tempo(void) {
     }
 }
 
-void sequencer_decrease_tempo(void) { sequencer_set_tempo(sequencer_config.tempo - 1); }
+void sequencer_decrease_tempo(void) {
+    sequencer_set_tempo(sequencer_config.tempo - 1);
+}
 
-sequencer_resolution_t sequencer_get_resolution(void) { return sequencer_config.resolution; }
+sequencer_resolution_t sequencer_get_resolution(void) {
+    return sequencer_config.resolution;
+}
 
 void sequencer_set_resolution(sequencer_resolution_t resolution) {
     if (resolution >= 0 && resolution < SEQUENCER_RESOLUTIONS) {
@@ -155,11 +171,17 @@ void sequencer_set_resolution(sequencer_resolution_t resolution) {
     }
 }
 
-void sequencer_increase_resolution(void) { sequencer_set_resolution(sequencer_config.resolution + 1); }
+void sequencer_increase_resolution(void) {
+    sequencer_set_resolution(sequencer_config.resolution + 1);
+}
 
-void sequencer_decrease_resolution(void) { sequencer_set_resolution(sequencer_config.resolution - 1); }
+void sequencer_decrease_resolution(void) {
+    sequencer_set_resolution(sequencer_config.resolution - 1);
+}
 
-uint8_t sequencer_get_current_step(void) { return sequencer_internal_state.current_step; }
+uint8_t sequencer_get_current_step(void) {
+    return sequencer_internal_state.current_step;
+}
 
 void sequencer_phase_attack(void) {
     dprintf("sequencer: step %d\n", sequencer_internal_state.current_step);
@@ -229,9 +251,13 @@ void sequencer_task(void) {
     }
 }
 
-uint16_t sequencer_get_beat_duration(void) { return get_beat_duration(sequencer_config.tempo); }
+uint16_t sequencer_get_beat_duration(void) {
+    return get_beat_duration(sequencer_config.tempo);
+}
 
-uint16_t sequencer_get_step_duration(void) { return get_step_duration(sequencer_config.tempo, sequencer_config.resolution); }
+uint16_t sequencer_get_step_duration(void) {
+    return get_step_duration(sequencer_config.tempo, sequencer_config.resolution);
+}
 
 uint16_t get_beat_duration(uint8_t tempo) {
     // Don’t crash in the unlikely case where the given tempo is 0
diff --git a/quantum/sequencer/sequencer.h b/quantum/sequencer/sequencer.h
index 4017ae764e..a8ea16eece 100644
--- a/quantum/sequencer/sequencer.h
+++ b/quantum/sequencer/sequencer.h
@@ -48,7 +48,7 @@ typedef struct {
     bool                   enabled;
     uint8_t                steps[SEQUENCER_STEPS];
     uint16_t               track_notes[SEQUENCER_TRACKS];
-    uint8_t                tempo;  // Is a maximum tempo of 255 reasonable?
+    uint8_t                tempo; // Is a maximum tempo of 255 reasonable?
     sequencer_resolution_t resolution;
 } sequencer_config_t;
 
@@ -57,9 +57,9 @@ typedef struct {
  * We use a "phase" state machine to delay some of the events.
  */
 typedef enum sequencer_phase_t {
-    SEQUENCER_PHASE_ATTACK,   // t=0ms, send the MIDI note on signal
-    SEQUENCER_PHASE_RELEASE,  // t=SEQUENCER_PHASE_RELEASE_TIMEOUT ms, send the MIDI note off signal
-    SEQUENCER_PHASE_PAUSE     // t=step duration ms, loop
+    SEQUENCER_PHASE_ATTACK,  // t=0ms, send the MIDI note on signal
+    SEQUENCER_PHASE_RELEASE, // t=SEQUENCER_PHASE_RELEASE_TIMEOUT ms, send the MIDI note off signal
+    SEQUENCER_PHASE_PAUSE    // t=step duration ms, loop
 } sequencer_phase_t;
 
 typedef struct {
diff --git a/quantum/sequencer/tests/midi_mock.c b/quantum/sequencer/tests/midi_mock.c
index 236e16f9d7..5bd945d615 100644
--- a/quantum/sequencer/tests/midi_mock.c
+++ b/quantum/sequencer/tests/midi_mock.c
@@ -19,8 +19,14 @@
 uint16_t last_noteon  = 0;
 uint16_t last_noteoff = 0;
 
-uint16_t midi_compute_note(uint16_t keycode) { return keycode; }
+uint16_t midi_compute_note(uint16_t keycode) {
+    return keycode;
+}
 
-void process_midi_basic_noteon(uint16_t note) { last_noteon = note; }
+void process_midi_basic_noteon(uint16_t note) {
+    last_noteon = note;
+}
 
-void process_midi_basic_noteoff(uint16_t note) { last_noteoff = note; }
+void process_midi_basic_noteoff(uint16_t note) {
+    last_noteoff = note;
+}
diff --git a/quantum/sequencer/tests/sequencer_tests.cpp b/quantum/sequencer/tests/sequencer_tests.cpp
index 290605a52a..05e58e4111 100644
--- a/quantum/sequencer/tests/sequencer_tests.cpp
+++ b/quantum/sequencer/tests/sequencer_tests.cpp
@@ -78,7 +78,9 @@ class SequencerTest : public ::testing::Test {
     sequencer_state_t  state_copy;
 };
 
-TEST_F(SequencerTest, TestOffByDefault) { EXPECT_EQ(is_sequencer_on(), false); }
+TEST_F(SequencerTest, TestOffByDefault) {
+    EXPECT_EQ(is_sequencer_on(), false);
+}
 
 TEST_F(SequencerTest, TestOn) {
     sequencer_config.enabled = false;
diff --git a/quantum/split_common/post_config.h b/quantum/split_common/post_config.h
index a4c0a1956b..8f79beb6ed 100644
--- a/quantum/split_common/post_config.h
+++ b/quantum/split_common/post_config.h
@@ -5,6 +5,6 @@
 #    endif
 
 #    ifndef F_SCL
-#        define F_SCL 100000UL  // SCL frequency
+#        define F_SCL 100000UL // SCL frequency
 #    endif
 #endif
diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c
index 35f0a9d181..7d50adf758 100644
--- a/quantum/split_common/split_util.c
+++ b/quantum/split_common/split_util.c
@@ -43,14 +43,14 @@
 // Set to 0 to disable the disconnection check altogether.
 #ifndef SPLIT_MAX_CONNECTION_ERRORS
 #    define SPLIT_MAX_CONNECTION_ERRORS 10
-#endif  // SPLIT_MAX_CONNECTION_ERRORS
+#endif // SPLIT_MAX_CONNECTION_ERRORS
 
 // How long (in milliseconds) to block all connection attempts after the communication has been flagged as disconnected.
 // One communication attempt will be allowed everytime this amount of time has passed since the last attempt. If that attempt succeeds, the communication is seen as working again.
 // Set to 0 to disable communication throttling while disconnected
 #ifndef SPLIT_CONNECTION_CHECK_TIMEOUT
 #    define SPLIT_CONNECTION_CHECK_TIMEOUT 500
-#endif  // SPLIT_CONNECTION_CHECK_TIMEOUT
+#endif // SPLIT_CONNECTION_CHECK_TIMEOUT
 
 static uint8_t connection_errors = 0;
 
@@ -68,7 +68,9 @@ static bool usbIsActive(void) {
     return false;
 }
 #else
-static inline bool usbIsActive(void) { return usb_vbus_state(); }
+static inline bool usbIsActive(void) {
+    return usb_vbus_state();
+}
 #endif
 
 #ifdef SPLIT_HAND_MATRIX_GRID
@@ -83,7 +85,7 @@ static uint8_t peek_matrix_intersection(pin_t out_pin, pin_t in_pin) {
     uint8_t pin_state = readPin(in_pin);
     // Set out_pin to a setting that is less susceptible to noise.
     setPinInputHigh(out_pin);
-    matrix_io_delay();  // Wait for the pull-up to go HIGH.
+    matrix_io_delay(); // Wait for the pull-up to go HIGH.
     return pin_state;
 }
 #endif
@@ -158,7 +160,9 @@ void split_post_init(void) {
     }
 }
 
-bool is_transport_connected(void) { return connection_errors < SPLIT_MAX_CONNECTION_ERRORS; }
+bool is_transport_connected(void) {
+    return connection_errors < SPLIT_MAX_CONNECTION_ERRORS;
+}
 
 bool transport_master_if_connected(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
 #if SPLIT_MAX_CONNECTION_ERRORS > 0 && SPLIT_CONNECTION_CHECK_TIMEOUT > 0
@@ -169,7 +173,7 @@ bool transport_master_if_connected(matrix_row_t master_matrix[], matrix_row_t sl
     if (is_disconnected && timer_elapsed(connection_check_timer) < SPLIT_CONNECTION_CHECK_TIMEOUT) {
         return false;
     }
-#endif  // SPLIT_MAX_CONNECTION_ERRORS > 0 && SPLIT_CONNECTION_CHECK_TIMEOUT > 0
+#endif // SPLIT_MAX_CONNECTION_ERRORS > 0 && SPLIT_CONNECTION_CHECK_TIMEOUT > 0
 
     __attribute__((unused)) bool okay = transport_master(master_matrix, slave_matrix);
 #if SPLIT_MAX_CONNECTION_ERRORS > 0
@@ -186,10 +190,10 @@ bool transport_master_if_connected(matrix_row_t master_matrix[], matrix_row_t sl
         return connected;
     } else if (is_disconnected) {
         dprintln("Target connected");
-#    endif  // SPLIT_CONNECTION_CHECK_TIMEOUT > 0
+#    endif // SPLIT_CONNECTION_CHECK_TIMEOUT > 0
     }
 
     connection_errors = 0;
-#endif  // SPLIT_MAX_CONNECTION_ERRORS > 0
+#endif // SPLIT_MAX_CONNECTION_ERRORS > 0
     return true;
 }
diff --git a/quantum/split_common/transaction_id_define.h b/quantum/split_common/transaction_id_define.h
index aa71c3621e..761a8884f4 100644
--- a/quantum/split_common/transaction_id_define.h
+++ b/quantum/split_common/transaction_id_define.h
@@ -19,87 +19,87 @@
 enum serial_transaction_id {
 #ifdef USE_I2C
     I2C_EXECUTE_CALLBACK,
-#endif  // USE_I2C
+#endif // USE_I2C
 
     GET_SLAVE_MATRIX_CHECKSUM,
     GET_SLAVE_MATRIX_DATA,
 
 #ifdef SPLIT_TRANSPORT_MIRROR
     PUT_MASTER_MATRIX,
-#endif  // SPLIT_TRANSPORT_MIRROR
+#endif // SPLIT_TRANSPORT_MIRROR
 
 #ifdef ENCODER_ENABLE
     GET_ENCODERS_CHECKSUM,
     GET_ENCODERS_DATA,
-#endif  // ENCODER_ENABLE
+#endif // ENCODER_ENABLE
 
 #ifndef DISABLE_SYNC_TIMER
     PUT_SYNC_TIMER,
-#endif  // DISABLE_SYNC_TIMER
+#endif // DISABLE_SYNC_TIMER
 
 #if !defined(NO_ACTION_LAYER) && defined(SPLIT_LAYER_STATE_ENABLE)
     PUT_LAYER_STATE,
     PUT_DEFAULT_LAYER_STATE,
-#endif  // !defined(NO_ACTION_LAYER) && defined(SPLIT_LAYER_STATE_ENABLE)
+#endif // !defined(NO_ACTION_LAYER) && defined(SPLIT_LAYER_STATE_ENABLE)
 
 #ifdef SPLIT_LED_STATE_ENABLE
     PUT_LED_STATE,
-#endif  // SPLIT_LED_STATE_ENABLE
+#endif // SPLIT_LED_STATE_ENABLE
 
 #ifdef SPLIT_MODS_ENABLE
     PUT_MODS,
-#endif  // SPLIT_MODS_ENABLE
+#endif // SPLIT_MODS_ENABLE
 
 #ifdef BACKLIGHT_ENABLE
     PUT_BACKLIGHT,
-#endif  // BACKLIGHT_ENABLE
+#endif // BACKLIGHT_ENABLE
 
 #if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
     PUT_RGBLIGHT,
-#endif  // defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
+#endif // defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
 
 #if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
     PUT_LED_MATRIX,
-#endif  // defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
+#endif // defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
 
 #if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
     PUT_RGB_MATRIX,
-#endif  // defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
+#endif // defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
 
 #if defined(WPM_ENABLE) && defined(SPLIT_WPM_ENABLE)
     PUT_WPM,
-#endif  // defined(WPM_ENABLE) && defined(SPLIT_WPM_ENABLE)
+#endif // defined(WPM_ENABLE) && defined(SPLIT_WPM_ENABLE)
 
 #if defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
     PUT_OLED,
-#endif  // defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
+#endif // defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
 
 #if defined(ST7565_ENABLE) && defined(SPLIT_ST7565_ENABLE)
     PUT_ST7565,
-#endif  // defined(ST7565_ENABLE) && defined(SPLIT_ST7565_ENABLE)
+#endif // defined(ST7565_ENABLE) && defined(SPLIT_ST7565_ENABLE)
 
 #if defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
     GET_POINTING_CHECKSUM,
     GET_POINTING_DATA,
     PUT_POINTING_CPI,
-#endif  // defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
+#endif // defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
 
 #if defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
     PUT_RPC_INFO,
     PUT_RPC_REQ_DATA,
     EXECUTE_RPC,
     GET_RPC_RESP_DATA,
-#endif  // defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
+#endif // defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
 
 // keyboard-specific
 #ifdef SPLIT_TRANSACTION_IDS_KB
     SPLIT_TRANSACTION_IDS_KB,
-#endif  // SPLIT_TRANSACTION_IDS_KB
+#endif // SPLIT_TRANSACTION_IDS_KB
 
 // user/keymap-specific
 #ifdef SPLIT_TRANSACTION_IDS_USER
     SPLIT_TRANSACTION_IDS_USER,
-#endif  // SPLIT_TRANSACTION_IDS_USER
+#endif // SPLIT_TRANSACTION_IDS_USER
 
     NUM_TOTAL_TRANSACTIONS
 };
diff --git a/quantum/split_common/transactions.c b/quantum/split_common/transactions.c
index 4b059a2b8a..cffbccaeee 100644
--- a/quantum/split_common/transactions.c
+++ b/quantum/split_common/transactions.c
@@ -30,7 +30,7 @@
 
 #ifndef FORCED_SYNC_THROTTLE_MS
 #    define FORCED_SYNC_THROTTLE_MS 100
-#endif  // FORCED_SYNC_THROTTLE_MS
+#endif // FORCED_SYNC_THROTTLE_MS
 
 #define sizeof_member(type, member) sizeof(((type *)NULL)->member)
 
@@ -49,7 +49,7 @@
 // Forward-declare the RPC callback handlers
 void slave_rpc_info_callback(uint8_t initiator2target_buffer_size, const void *initiator2target_buffer, uint8_t target2initiator_buffer_size, void *target2initiator_buffer);
 void slave_rpc_exec_callback(uint8_t initiator2target_buffer_size, const void *initiator2target_buffer, uint8_t target2initiator_buffer_size, void *target2initiator_buffer);
-#endif  // defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
+#endif // defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
 
 ////////////////////////////////////////////////////
 // Helpers
@@ -63,7 +63,9 @@ static bool transaction_handler_master(matrix_row_t master_matrix[], matrix_row_
             }
         }
         bool this_okay = true;
-        ATOMIC_BLOCK_FORCEON { this_okay = handler(master_matrix, slave_matrix); };
+        ATOMIC_BLOCK_FORCEON {
+            this_okay = handler(master_matrix, slave_matrix);
+        };
         if (this_okay) return true;
     }
     dprintf("Failed to execute %s\n", prefix);
@@ -75,9 +77,11 @@ static bool transaction_handler_master(matrix_row_t master_matrix[], matrix_row_
         if (!transaction_handler_master(master_matrix, slave_matrix, #prefix, &prefix##_handlers_master)) return false; \
     } while (0)
 
-#define TRANSACTION_HANDLER_SLAVE(prefix)                                               \
-    do {                                                                                \
-        ATOMIC_BLOCK_FORCEON { prefix##_handlers_slave(master_matrix, slave_matrix); }; \
+#define TRANSACTION_HANDLER_SLAVE(prefix)                         \
+    do {                                                          \
+        ATOMIC_BLOCK_FORCEON {                                    \
+            prefix##_handlers_slave(master_matrix, slave_matrix); \
+        };                                                        \
     } while (0)
 
 inline static bool read_if_checksum_mismatch(int8_t trans_id_checksum, int8_t trans_id_retrieve, uint32_t *last_update, void *destination, const void *equiv_shmem, size_t length) {
@@ -116,8 +120,8 @@ inline static bool send_if_data_mismatch(int8_t trans_id, uint32_t *last_update,
 
 static bool slave_matrix_handlers_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
     static uint32_t     last_update                    = 0;
-    static matrix_row_t last_matrix[(MATRIX_ROWS) / 2] = {0};  // last successfully-read matrix, so we can replicate if there are checksum errors
-    matrix_row_t        temp_matrix[(MATRIX_ROWS) / 2];        // holding area while we test whether or not checksum is correct
+    static matrix_row_t last_matrix[(MATRIX_ROWS) / 2] = {0}; // last successfully-read matrix, so we can replicate if there are checksum errors
+    matrix_row_t        temp_matrix[(MATRIX_ROWS) / 2];       // holding area while we test whether or not checksum is correct
 
     bool okay = read_if_checksum_mismatch(GET_SLAVE_MATRIX_CHECKSUM, GET_SLAVE_MATRIX_DATA, &last_update, temp_matrix, split_shmem->smatrix.matrix, sizeof(split_shmem->smatrix.matrix));
     if (okay) {
@@ -161,13 +165,13 @@ static void master_matrix_handlers_slave(matrix_row_t master_matrix[], matrix_ro
 #    define TRANSACTIONS_MASTER_MATRIX_SLAVE() TRANSACTION_HANDLER_SLAVE(master_matrix)
 #    define TRANSACTIONS_MASTER_MATRIX_REGISTRATIONS [PUT_MASTER_MATRIX] = trans_initiator2target_initializer(mmatrix.matrix),
 
-#else  // SPLIT_TRANSPORT_MIRROR
+#else // SPLIT_TRANSPORT_MIRROR
 
 #    define TRANSACTIONS_MASTER_MATRIX_MASTER()
 #    define TRANSACTIONS_MASTER_MATRIX_SLAVE()
 #    define TRANSACTIONS_MASTER_MATRIX_REGISTRATIONS
 
-#endif  // SPLIT_TRANSPORT_MIRROR
+#endif // SPLIT_TRANSPORT_MIRROR
 
 ////////////////////////////////////////////////////
 // Encoders
@@ -200,13 +204,13 @@ static void encoder_handlers_slave(matrix_row_t master_matrix[], matrix_row_t sl
     [GET_ENCODERS_DATA]     = trans_target2initiator_initializer(encoders.state),
 // clang-format on
 
-#else  // ENCODER_ENABLE
+#else // ENCODER_ENABLE
 
 #    define TRANSACTIONS_ENCODERS_MASTER()
 #    define TRANSACTIONS_ENCODERS_SLAVE()
 #    define TRANSACTIONS_ENCODERS_REGISTRATIONS
 
-#endif  // ENCODER_ENABLE
+#endif // ENCODER_ENABLE
 
 ////////////////////////////////////////////////////
 // Sync timer
@@ -239,13 +243,13 @@ static void sync_timer_handlers_slave(matrix_row_t master_matrix[], matrix_row_t
 #    define TRANSACTIONS_SYNC_TIMER_SLAVE() TRANSACTION_HANDLER_SLAVE(sync_timer)
 #    define TRANSACTIONS_SYNC_TIMER_REGISTRATIONS [PUT_SYNC_TIMER] = trans_initiator2target_initializer(sync_timer),
 
-#else  // DISABLE_SYNC_TIMER
+#else // DISABLE_SYNC_TIMER
 
 #    define TRANSACTIONS_SYNC_TIMER_MASTER()
 #    define TRANSACTIONS_SYNC_TIMER_SLAVE()
 #    define TRANSACTIONS_SYNC_TIMER_REGISTRATIONS
 
-#endif  // DISABLE_SYNC_TIMER
+#endif // DISABLE_SYNC_TIMER
 
 ////////////////////////////////////////////////////
 // Layer state
@@ -276,13 +280,13 @@ static void layer_state_handlers_slave(matrix_row_t master_matrix[], matrix_row_
     [PUT_DEFAULT_LAYER_STATE] = trans_initiator2target_initializer(layers.default_layer_state),
 // clang-format on
 
-#else  // !defined(NO_ACTION_LAYER) && defined(SPLIT_LAYER_STATE_ENABLE)
+#else // !defined(NO_ACTION_LAYER) && defined(SPLIT_LAYER_STATE_ENABLE)
 
 #    define TRANSACTIONS_LAYER_STATE_MASTER()
 #    define TRANSACTIONS_LAYER_STATE_SLAVE()
 #    define TRANSACTIONS_LAYER_STATE_REGISTRATIONS
 
-#endif  // !defined(NO_ACTION_LAYER) && defined(SPLIT_LAYER_STATE_ENABLE)
+#endif // !defined(NO_ACTION_LAYER) && defined(SPLIT_LAYER_STATE_ENABLE)
 
 ////////////////////////////////////////////////////
 // LED state
@@ -304,13 +308,13 @@ static void led_state_handlers_slave(matrix_row_t master_matrix[], matrix_row_t
 #    define TRANSACTIONS_LED_STATE_SLAVE() TRANSACTION_HANDLER_SLAVE(led_state)
 #    define TRANSACTIONS_LED_STATE_REGISTRATIONS [PUT_LED_STATE] = trans_initiator2target_initializer(led_state),
 
-#else  // SPLIT_LED_STATE_ENABLE
+#else // SPLIT_LED_STATE_ENABLE
 
 #    define TRANSACTIONS_LED_STATE_MASTER()
 #    define TRANSACTIONS_LED_STATE_SLAVE()
 #    define TRANSACTIONS_LED_STATE_REGISTRATIONS
 
-#endif  // SPLIT_LED_STATE_ENABLE
+#endif // SPLIT_LED_STATE_ENABLE
 
 ////////////////////////////////////////////////////
 // Mods
@@ -336,7 +340,7 @@ static bool mods_handlers_master(matrix_row_t master_matrix[], matrix_row_t slav
     if (!mods_need_sync && new_mods.oneshot_mods != split_shmem->mods.oneshot_mods) {
         mods_need_sync = true;
     }
-#    endif  // NO_ACTION_ONESHOT
+#    endif // NO_ACTION_ONESHOT
 
     bool okay = true;
     if (mods_need_sync) {
@@ -361,13 +365,13 @@ static void mods_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave
 #    define TRANSACTIONS_MODS_SLAVE() TRANSACTION_HANDLER_SLAVE(mods)
 #    define TRANSACTIONS_MODS_REGISTRATIONS [PUT_MODS] = trans_initiator2target_initializer(mods),
 
-#else  // SPLIT_MODS_ENABLE
+#else // SPLIT_MODS_ENABLE
 
 #    define TRANSACTIONS_MODS_MASTER()
 #    define TRANSACTIONS_MODS_SLAVE()
 #    define TRANSACTIONS_MODS_REGISTRATIONS
 
-#endif  // SPLIT_MODS_ENABLE
+#endif // SPLIT_MODS_ENABLE
 
 ////////////////////////////////////////////////////
 // Backlight
@@ -380,19 +384,21 @@ static bool backlight_handlers_master(matrix_row_t master_matrix[], matrix_row_t
     return send_if_condition(PUT_BACKLIGHT, &last_update, (level != split_shmem->backlight_level), &level, sizeof(level));
 }
 
-static void backlight_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) { backlight_set(split_shmem->backlight_level); }
+static void backlight_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
+    backlight_set(split_shmem->backlight_level);
+}
 
 #    define TRANSACTIONS_BACKLIGHT_MASTER() TRANSACTION_HANDLER_MASTER(backlight)
 #    define TRANSACTIONS_BACKLIGHT_SLAVE() TRANSACTION_HANDLER_SLAVE(backlight)
 #    define TRANSACTIONS_BACKLIGHT_REGISTRATIONS [PUT_BACKLIGHT] = trans_initiator2target_initializer(backlight_level),
 
-#else  // BACKLIGHT_ENABLE
+#else // BACKLIGHT_ENABLE
 
 #    define TRANSACTIONS_BACKLIGHT_MASTER()
 #    define TRANSACTIONS_BACKLIGHT_SLAVE()
 #    define TRANSACTIONS_BACKLIGHT_REGISTRATIONS
 
-#endif  // BACKLIGHT_ENABLE
+#endif // BACKLIGHT_ENABLE
 
 ////////////////////////////////////////////////////
 // RGBLIGHT
@@ -423,13 +429,13 @@ static void rgblight_handlers_slave(matrix_row_t master_matrix[], matrix_row_t s
 #    define TRANSACTIONS_RGBLIGHT_SLAVE() TRANSACTION_HANDLER_SLAVE(rgblight)
 #    define TRANSACTIONS_RGBLIGHT_REGISTRATIONS [PUT_RGBLIGHT] = trans_initiator2target_initializer(rgblight_sync),
 
-#else  // defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
+#else // defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
 
 #    define TRANSACTIONS_RGBLIGHT_MASTER()
 #    define TRANSACTIONS_RGBLIGHT_SLAVE()
 #    define TRANSACTIONS_RGBLIGHT_REGISTRATIONS
 
-#endif  // defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
+#endif // defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
 
 ////////////////////////////////////////////////////
 // LED Matrix
@@ -453,13 +459,13 @@ static void led_matrix_handlers_slave(matrix_row_t master_matrix[], matrix_row_t
 #    define TRANSACTIONS_LED_MATRIX_SLAVE() TRANSACTION_HANDLER_SLAVE(led_matrix)
 #    define TRANSACTIONS_LED_MATRIX_REGISTRATIONS [PUT_LED_MATRIX] = trans_initiator2target_initializer(led_matrix_sync),
 
-#else  // defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
+#else // defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
 
 #    define TRANSACTIONS_LED_MATRIX_MASTER()
 #    define TRANSACTIONS_LED_MATRIX_SLAVE()
 #    define TRANSACTIONS_LED_MATRIX_REGISTRATIONS
 
-#endif  // defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
+#endif // defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
 
 ////////////////////////////////////////////////////
 // RGB Matrix
@@ -483,13 +489,13 @@ static void rgb_matrix_handlers_slave(matrix_row_t master_matrix[], matrix_row_t
 #    define TRANSACTIONS_RGB_MATRIX_SLAVE() TRANSACTION_HANDLER_SLAVE(rgb_matrix)
 #    define TRANSACTIONS_RGB_MATRIX_REGISTRATIONS [PUT_RGB_MATRIX] = trans_initiator2target_initializer(rgb_matrix_sync),
 
-#else  // defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
+#else // defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
 
 #    define TRANSACTIONS_RGB_MATRIX_MASTER()
 #    define TRANSACTIONS_RGB_MATRIX_SLAVE()
 #    define TRANSACTIONS_RGB_MATRIX_REGISTRATIONS
 
-#endif  // defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
+#endif // defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
 
 ////////////////////////////////////////////////////
 // WPM
@@ -502,19 +508,21 @@ static bool wpm_handlers_master(matrix_row_t master_matrix[], matrix_row_t slave
     return send_if_condition(PUT_WPM, &last_update, (current_wpm != split_shmem->current_wpm), &current_wpm, sizeof(current_wpm));
 }
 
-static void wpm_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) { set_current_wpm(split_shmem->current_wpm); }
+static void wpm_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
+    set_current_wpm(split_shmem->current_wpm);
+}
 
 #    define TRANSACTIONS_WPM_MASTER() TRANSACTION_HANDLER_MASTER(wpm)
 #    define TRANSACTIONS_WPM_SLAVE() TRANSACTION_HANDLER_SLAVE(wpm)
 #    define TRANSACTIONS_WPM_REGISTRATIONS [PUT_WPM] = trans_initiator2target_initializer(current_wpm),
 
-#else  // defined(WPM_ENABLE) && defined(SPLIT_WPM_ENABLE)
+#else // defined(WPM_ENABLE) && defined(SPLIT_WPM_ENABLE)
 
 #    define TRANSACTIONS_WPM_MASTER()
 #    define TRANSACTIONS_WPM_SLAVE()
 #    define TRANSACTIONS_WPM_REGISTRATIONS
 
-#endif  // defined(WPM_ENABLE) && defined(SPLIT_WPM_ENABLE)
+#endif // defined(WPM_ENABLE) && defined(SPLIT_WPM_ENABLE)
 
 ////////////////////////////////////////////////////
 // OLED
@@ -539,13 +547,13 @@ static void oled_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave
 #    define TRANSACTIONS_OLED_SLAVE() TRANSACTION_HANDLER_SLAVE(oled)
 #    define TRANSACTIONS_OLED_REGISTRATIONS [PUT_OLED] = trans_initiator2target_initializer(current_oled_state),
 
-#else  // defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
+#else // defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
 
 #    define TRANSACTIONS_OLED_MASTER()
 #    define TRANSACTIONS_OLED_SLAVE()
 #    define TRANSACTIONS_OLED_REGISTRATIONS
 
-#endif  // defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
+#endif // defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
 
 ////////////////////////////////////////////////////
 // ST7565
@@ -570,13 +578,13 @@ static void st7565_handlers_slave(matrix_row_t master_matrix[], matrix_row_t sla
 #    define TRANSACTIONS_ST7565_SLAVE() TRANSACTION_HANDLER_SLAVE(st7565)
 #    define TRANSACTIONS_ST7565_REGISTRATIONS [PUT_ST7565] = trans_initiator2target_initializer(current_st7565_state),
 
-#else  // defined(ST7565_ENABLE) && defined(SPLIT_ST7565_ENABLE)
+#else // defined(ST7565_ENABLE) && defined(SPLIT_ST7565_ENABLE)
 
 #    define TRANSACTIONS_ST7565_MASTER()
 #    define TRANSACTIONS_ST7565_SLAVE()
 #    define TRANSACTIONS_ST7565_REGISTRATIONS
 
-#endif  // defined(ST7565_ENABLE) && defined(SPLIT_ST7565_ENABLE)
+#endif // defined(ST7565_ENABLE) && defined(SPLIT_ST7565_ENABLE)
 
 ////////////////////////////////////////////////////
 // POINTING
@@ -631,7 +639,7 @@ static void pointing_handlers_slave(matrix_row_t master_matrix[], matrix_row_t s
     }
     last_exec = timer_read32();
 #    endif
-    temp_cpi = !pointing_device_driver.get_cpi ? 0 : pointing_device_driver.get_cpi();  // check for NULL
+    temp_cpi = !pointing_device_driver.get_cpi ? 0 : pointing_device_driver.get_cpi(); // check for NULL
     if (split_shmem->pointing.cpi && memcmp(&split_shmem->pointing.cpi, &temp_cpi, sizeof(temp_cpi)) != 0) {
         if (pointing_device_driver.set_cpi) {
             pointing_device_driver.set_cpi(split_shmem->pointing.cpi);
@@ -648,13 +656,13 @@ static void pointing_handlers_slave(matrix_row_t master_matrix[], matrix_row_t s
 #    define TRANSACTIONS_POINTING_SLAVE() TRANSACTION_HANDLER_SLAVE(pointing)
 #    define TRANSACTIONS_POINTING_REGISTRATIONS [GET_POINTING_CHECKSUM] = trans_target2initiator_initializer(pointing.checksum), [GET_POINTING_DATA] = trans_target2initiator_initializer(pointing.report), [PUT_POINTING_CPI] = trans_initiator2target_initializer(pointing.cpi),
 
-#else  // defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
+#else // defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
 
 #    define TRANSACTIONS_POINTING_MASTER()
 #    define TRANSACTIONS_POINTING_SLAVE()
 #    define TRANSACTIONS_POINTING_REGISTRATIONS
 
-#endif  // defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
+#endif // defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
 
 ////////////////////////////////////////////////////
 
@@ -664,7 +672,7 @@ split_transaction_desc_t split_transaction_table[NUM_TOTAL_TRANSACTIONS] = {
 
 #ifdef USE_I2C
     [I2C_EXECUTE_CALLBACK] = trans_initiator2target_initializer(transaction_id),
-#endif  // USE_I2C
+#endif // USE_I2C
 
     // clang-format off
     TRANSACTIONS_SLAVE_MATRIX_REGISTRATIONS
@@ -689,7 +697,7 @@ split_transaction_desc_t split_transaction_table[NUM_TOTAL_TRANSACTIONS] = {
     [PUT_RPC_REQ_DATA]  = trans_initiator2target_initializer(rpc_m2s_buffer),
     [EXECUTE_RPC]       = trans_initiator2target_initializer_cb(rpc_info.transaction_id, slave_rpc_exec_callback),
     [GET_RPC_RESP_DATA] = trans_target2initiator_initializer(rpc_s2m_buffer),
-#endif  // defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
+#endif // defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
 };
 
 bool transactions_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
@@ -800,4 +808,4 @@ void slave_rpc_exec_callback(uint8_t initiator2target_buffer_size, const void *i
     }
 }
 
-#endif  // defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
+#endif // defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
diff --git a/quantum/split_common/transport.c b/quantum/split_common/transport.c
index 060ba8a927..aade3c98d7 100644
--- a/quantum/split_common/transport.c
+++ b/quantum/split_common/transport.c
@@ -26,7 +26,7 @@
 
 #    ifndef SLAVE_I2C_TIMEOUT
 #        define SLAVE_I2C_TIMEOUT 100
-#    endif  // SLAVE_I2C_TIMEOUT
+#    endif // SLAVE_I2C_TIMEOUT
 
 #    ifndef SLAVE_I2C_ADDRESS
 #        define SLAVE_I2C_ADDRESS 0x32
@@ -40,8 +40,12 @@ _Static_assert(sizeof(split_shared_memory_t) <= I2C_SLAVE_REG_COUNT, "split_shar
 
 split_shared_memory_t *const split_shmem = (split_shared_memory_t *)i2c_slave_reg;
 
-void transport_master_init(void) { i2c_init(); }
-void transport_slave_init(void) { i2c_slave_init(SLAVE_I2C_ADDRESS); }
+void transport_master_init(void) {
+    i2c_init();
+}
+void transport_slave_init(void) {
+    i2c_slave_init(SLAVE_I2C_ADDRESS);
+}
 
 i2c_status_t transport_trigger_callback(int8_t id) {
     // If there's no callback, indicate that we were successful
@@ -82,15 +86,19 @@ bool transport_execute_transaction(int8_t id, const void *initiator2target_buf,
     return true;
 }
 
-#else  // USE_I2C
+#else // USE_I2C
 
 #    include "serial.h"
 
 static split_shared_memory_t shared_memory;
 split_shared_memory_t *const split_shmem = &shared_memory;
 
-void transport_master_init(void) { soft_serial_initiator_init(); }
-void transport_slave_init(void) { soft_serial_target_init(); }
+void transport_master_init(void) {
+    soft_serial_initiator_init();
+}
+void transport_slave_init(void) {
+    soft_serial_target_init();
+}
 
 bool transport_execute_transaction(int8_t id, const void *initiator2target_buf, uint16_t initiator2target_length, void *target2initiator_buf, uint16_t target2initiator_length) {
     split_transaction_desc_t *trans = &split_transaction_table[id];
@@ -111,8 +119,12 @@ bool transport_execute_transaction(int8_t id, const void *initiator2target_buf,
     return true;
 }
 
-#endif  // USE_I2C
+#endif // USE_I2C
 
-bool transport_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) { return transactions_master(master_matrix, slave_matrix); }
+bool transport_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
+    return transactions_master(master_matrix, slave_matrix);
+}
 
-void transport_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) { transactions_slave(master_matrix, slave_matrix); }
+void transport_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
+    transactions_slave(master_matrix, slave_matrix);
+}
diff --git a/quantum/split_common/transport.h b/quantum/split_common/transport.h
index 31b804908b..26bd136728 100644
--- a/quantum/split_common/transport.h
+++ b/quantum/split_common/transport.h
@@ -25,11 +25,11 @@
 
 #ifndef RPC_M2S_BUFFER_SIZE
 #    define RPC_M2S_BUFFER_SIZE 32
-#endif  // RPC_M2S_BUFFER_SIZE
+#endif // RPC_M2S_BUFFER_SIZE
 
 #ifndef RPC_S2M_BUFFER_SIZE
 #    define RPC_S2M_BUFFER_SIZE 32
-#endif  // RPC_S2M_BUFFER_SIZE
+#endif // RPC_S2M_BUFFER_SIZE
 
 void transport_master_init(void);
 void transport_slave_init(void);
@@ -43,15 +43,15 @@ bool transport_execute_transaction(int8_t id, const void *initiator2target_buf,
 #ifdef ENCODER_ENABLE
 #    include "encoder.h"
 #    define NUMBER_OF_ENCODERS (sizeof((pin_t[])ENCODERS_PAD_A) / sizeof(pin_t))
-#endif  // ENCODER_ENABLE
+#endif // ENCODER_ENABLE
 
 #ifdef BACKLIGHT_ENABLE
 #    include "backlight.h"
-#endif  // BACKLIGHT_ENABLE
+#endif // BACKLIGHT_ENABLE
 
 #ifdef RGBLIGHT_ENABLE
 #    include "rgblight.h"
-#endif  // RGBLIGHT_ENABLE
+#endif // RGBLIGHT_ENABLE
 
 typedef struct _split_slave_matrix_sync_t {
     uint8_t      checksum;
@@ -62,21 +62,21 @@ typedef struct _split_slave_matrix_sync_t {
 typedef struct _split_master_matrix_sync_t {
     matrix_row_t matrix[(MATRIX_ROWS) / 2];
 } split_master_matrix_sync_t;
-#endif  // SPLIT_TRANSPORT_MIRROR
+#endif // SPLIT_TRANSPORT_MIRROR
 
 #ifdef ENCODER_ENABLE
 typedef struct _split_slave_encoder_sync_t {
     uint8_t checksum;
     uint8_t state[NUMBER_OF_ENCODERS];
 } split_slave_encoder_sync_t;
-#endif  // ENCODER_ENABLE
+#endif // ENCODER_ENABLE
 
 #if !defined(NO_ACTION_LAYER) && defined(SPLIT_LAYER_STATE_ENABLE)
 typedef struct _split_layers_sync_t {
     layer_state_t layer_state;
     layer_state_t default_layer_state;
 } split_layers_sync_t;
-#endif  // !defined(NO_ACTION_LAYER) && defined(SPLIT_LAYER_STATE_ENABLE)
+#endif // !defined(NO_ACTION_LAYER) && defined(SPLIT_LAYER_STATE_ENABLE)
 
 #if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
 #    include "led_matrix.h"
@@ -85,7 +85,7 @@ typedef struct _led_matrix_sync_t {
     led_eeconfig_t led_matrix;
     bool           led_suspend_state;
 } led_matrix_sync_t;
-#endif  // defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
+#endif // defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
 
 #if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
 #    include "rgb_matrix.h"
@@ -94,7 +94,7 @@ typedef struct _rgb_matrix_sync_t {
     rgb_config_t rgb_matrix;
     bool         rgb_suspend_state;
 } rgb_matrix_sync_t;
-#endif  // defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
+#endif // defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
 
 #ifdef SPLIT_MODS_ENABLE
 typedef struct _split_mods_sync_t {
@@ -102,9 +102,9 @@ typedef struct _split_mods_sync_t {
     uint8_t weak_mods;
 #    ifndef NO_ACTION_ONESHOT
     uint8_t oneshot_mods;
-#    endif  // NO_ACTION_ONESHOT
+#    endif // NO_ACTION_ONESHOT
 } split_mods_sync_t;
-#endif  // SPLIT_MODS_ENABLE
+#endif // SPLIT_MODS_ENABLE
 
 #if defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
 #    include "pointing_device.h"
@@ -113,7 +113,7 @@ typedef struct _split_slave_pointing_sync_t {
     report_mouse_t report;
     uint16_t       cpi;
 } split_slave_pointing_sync_t;
-#endif  // defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
+#endif // defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
 
 #if defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
 typedef struct _rpc_sync_info_t {
@@ -121,76 +121,76 @@ typedef struct _rpc_sync_info_t {
     uint8_t m2s_length;
     uint8_t s2m_length;
 } rpc_sync_info_t;
-#endif  // defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
+#endif // defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
 
 typedef struct _split_shared_memory_t {
 #ifdef USE_I2C
     int8_t transaction_id;
-#endif  // USE_I2C
+#endif // USE_I2C
 
     split_slave_matrix_sync_t smatrix;
 
 #ifdef SPLIT_TRANSPORT_MIRROR
     split_master_matrix_sync_t mmatrix;
-#endif  // SPLIT_TRANSPORT_MIRROR
+#endif // SPLIT_TRANSPORT_MIRROR
 
 #ifdef ENCODER_ENABLE
     split_slave_encoder_sync_t encoders;
-#endif  // ENCODER_ENABLE
+#endif // ENCODER_ENABLE
 
 #ifndef DISABLE_SYNC_TIMER
     uint32_t sync_timer;
-#endif  // DISABLE_SYNC_TIMER
+#endif // DISABLE_SYNC_TIMER
 
 #if !defined(NO_ACTION_LAYER) && defined(SPLIT_LAYER_STATE_ENABLE)
     split_layers_sync_t layers;
-#endif  // !defined(NO_ACTION_LAYER) && defined(SPLIT_LAYER_STATE_ENABLE)
+#endif // !defined(NO_ACTION_LAYER) && defined(SPLIT_LAYER_STATE_ENABLE)
 
 #ifdef SPLIT_LED_STATE_ENABLE
     uint8_t led_state;
-#endif  // SPLIT_LED_STATE_ENABLE
+#endif // SPLIT_LED_STATE_ENABLE
 
 #ifdef SPLIT_MODS_ENABLE
     split_mods_sync_t mods;
-#endif  // SPLIT_MODS_ENABLE
+#endif // SPLIT_MODS_ENABLE
 
 #ifdef BACKLIGHT_ENABLE
     uint8_t backlight_level;
-#endif  // BACKLIGHT_ENABLE
+#endif // BACKLIGHT_ENABLE
 
 #if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
     rgblight_syncinfo_t rgblight_sync;
-#endif  // defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
+#endif // defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
 
 #if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
     led_matrix_sync_t led_matrix_sync;
-#endif  // defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
+#endif // defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
 
 #if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
     rgb_matrix_sync_t rgb_matrix_sync;
-#endif  // defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
+#endif // defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
 
 #if defined(WPM_ENABLE) && defined(SPLIT_WPM_ENABLE)
     uint8_t current_wpm;
-#endif  // defined(WPM_ENABLE) && defined(SPLIT_WPM_ENABLE)
+#endif // defined(WPM_ENABLE) && defined(SPLIT_WPM_ENABLE)
 
 #if defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
     uint8_t current_oled_state;
-#endif  // defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
+#endif // defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
 
 #if defined(ST7565_ENABLE) && defined(SPLIT_ST7565_ENABLE)
     uint8_t current_st7565_state;
-#endif  // ST7565_ENABLE(OLED_ENABLE) && defined(SPLIT_ST7565_ENABLE)
+#endif // ST7565_ENABLE(OLED_ENABLE) && defined(SPLIT_ST7565_ENABLE)
 
 #if defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
     split_slave_pointing_sync_t pointing;
-#endif  // defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
+#endif // defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
 
 #if defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
     rpc_sync_info_t rpc_info;
     uint8_t         rpc_m2s_buffer[RPC_M2S_BUFFER_SIZE];
     uint8_t         rpc_s2m_buffer[RPC_S2M_BUFFER_SIZE];
-#endif  // defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
+#endif // defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
 } split_shared_memory_t;
 
 extern split_shared_memory_t *const split_shmem;
diff --git a/quantum/sync_timer.c b/quantum/sync_timer.c
index de24b463b6..217891233f 100644
--- a/quantum/sync_timer.c
+++ b/quantum/sync_timer.c
@@ -29,7 +29,9 @@ SOFTWARE.
 #if defined(SPLIT_KEYBOARD) && !defined(DISABLE_SYNC_TIMER)
 volatile int32_t sync_timer_ms;
 
-void sync_timer_init(void) { sync_timer_ms = 0; }
+void sync_timer_init(void) {
+    sync_timer_ms = 0;
+}
 
 void sync_timer_update(uint32_t time) {
     if (is_keyboard_master()) return;
diff --git a/quantum/velocikey.c b/quantum/velocikey.c
index 6b7f82d950..58e14215bb 100644
--- a/quantum/velocikey.c
+++ b/quantum/velocikey.c
@@ -13,7 +13,9 @@
 #define TYPING_SPEED_MAX_VALUE 200
 uint8_t typing_speed = 0;
 
-bool velocikey_enabled(void) { return eeprom_read_byte(EECONFIG_VELOCIKEY) == 1; }
+bool velocikey_enabled(void) {
+    return eeprom_read_byte(EECONFIG_VELOCIKEY) == 1;
+}
 
 void velocikey_toggle(void) {
     if (velocikey_enabled())
@@ -39,4 +41,6 @@ void velocikey_decelerate(void) {
     }
 }
 
-uint8_t velocikey_match_speed(uint8_t minValue, uint8_t maxValue) { return MAX(minValue, maxValue - (maxValue - minValue) * ((float)typing_speed / TYPING_SPEED_MAX_VALUE)); }
+uint8_t velocikey_match_speed(uint8_t minValue, uint8_t maxValue) {
+    return MAX(minValue, maxValue - (maxValue - minValue) * ((float)typing_speed / TYPING_SPEED_MAX_VALUE));
+}
diff --git a/quantum/via.c b/quantum/via.c
index 7c8aa753e7..05ab799cbb 100644
--- a/quantum/via.c
+++ b/quantum/via.c
@@ -45,7 +45,7 @@
 #include "raw_hid.h"
 #include "dynamic_keymap.h"
 #include "eeprom.h"
-#include "version.h"  // for QMK_BUILDDATE used in EEPROM magic
+#include "version.h" // for QMK_BUILDDATE used in EEPROM magic
 #include "via_ensure_keycode.h"
 
 // Forward declare some helpers.
@@ -62,7 +62,7 @@ void via_qmk_rgblight_get_value(uint8_t *data);
 // Can be called in an overriding via_init_kb() to test if keyboard level code usage of
 // EEPROM is invalid and use/save defaults.
 bool via_eeprom_is_valid(void) {
-    char *  p      = QMK_BUILDDATE;  // e.g. "2019-11-05-11:29:54"
+    char *  p      = QMK_BUILDDATE; // e.g. "2019-11-05-11:29:54"
     uint8_t magic0 = ((p[2] & 0x0F) << 4) | (p[3] & 0x0F);
     uint8_t magic1 = ((p[5] & 0x0F) << 4) | (p[6] & 0x0F);
     uint8_t magic2 = ((p[8] & 0x0F) << 4) | (p[9] & 0x0F);
@@ -73,7 +73,7 @@ bool via_eeprom_is_valid(void) {
 // Sets VIA/keyboard level usage of EEPROM to valid/invalid
 // Keyboard level code (eg. via_init_kb()) should not call this
 void via_eeprom_set_valid(bool valid) {
-    char *  p      = QMK_BUILDDATE;  // e.g. "2019-11-05-11:29:54"
+    char *  p      = QMK_BUILDDATE; // e.g. "2019-11-05-11:29:54"
     uint8_t magic0 = ((p[2] & 0x0F) << 4) | (p[3] & 0x0F);
     uint8_t magic1 = ((p[5] & 0x0F) << 4) | (p[6] & 0x0F);
     uint8_t magic2 = ((p[8] & 0x0F) << 4) | (p[9] & 0x0F);
@@ -96,6 +96,7 @@ void via_init(void) {
     // Let keyboard level test EEPROM valid state,
     // but not set it valid, it is done here.
     via_init_kb();
+    via_set_layout_options_kb(via_get_layout_options());
 
     // If the EEPROM has the magic, the data is good.
     // OK to load from EEPROM.
@@ -131,7 +132,10 @@ uint32_t via_get_layout_options(void) {
     return value;
 }
 
+__attribute__((weak)) void via_set_layout_options_kb(uint32_t value) {}
+
 void via_set_layout_options(uint32_t value) {
+    via_set_layout_options_kb(value);
     // Start at the least significant byte
     void *target = (void *)(VIA_EEPROM_LAYOUT_OPTIONS_ADDR + VIA_EEPROM_LAYOUT_OPTIONS_SIZE - 1);
     for (uint8_t i = 0; i < VIA_EEPROM_LAYOUT_OPTIONS_SIZE; i++) {
@@ -343,13 +347,13 @@ void raw_hid_receive(uint8_t *data, uint8_t length) {
         }
         case id_dynamic_keymap_macro_get_buffer: {
             uint16_t offset = (command_data[0] << 8) | command_data[1];
-            uint16_t size   = command_data[2];  // size <= 28
+            uint16_t size   = command_data[2]; // size <= 28
             dynamic_keymap_macro_get_buffer(offset, size, &command_data[3]);
             break;
         }
         case id_dynamic_keymap_macro_set_buffer: {
             uint16_t offset = (command_data[0] << 8) | command_data[1];
-            uint16_t size   = command_data[2];  // size <= 28
+            uint16_t size   = command_data[2]; // size <= 28
             dynamic_keymap_macro_set_buffer(offset, size, &command_data[3]);
             break;
         }
@@ -363,13 +367,13 @@ void raw_hid_receive(uint8_t *data, uint8_t length) {
         }
         case id_dynamic_keymap_get_buffer: {
             uint16_t offset = (command_data[0] << 8) | command_data[1];
-            uint16_t size   = command_data[2];  // size <= 28
+            uint16_t size   = command_data[2]; // size <= 28
             dynamic_keymap_get_buffer(offset, size, &command_data[3]);
             break;
         }
         case id_dynamic_keymap_set_buffer: {
             uint16_t offset = (command_data[0] << 8) | command_data[1];
-            uint16_t size   = command_data[2];  // size <= 28
+            uint16_t size   = command_data[2]; // size <= 28
             dynamic_keymap_set_buffer(offset, size, &command_data[3]);
             break;
         }
@@ -434,7 +438,7 @@ void via_qmk_backlight_set_value(uint8_t *data) {
     }
 }
 
-#endif  // #if defined(VIA_QMK_BACKLIGHT_ENABLE)
+#endif // #if defined(VIA_QMK_BACKLIGHT_ENABLE)
 
 #if defined(VIA_QMK_RGBLIGHT_ENABLE)
 
@@ -490,4 +494,4 @@ void via_qmk_rgblight_set_value(uint8_t *data) {
     }
 }
 
-#endif  // #if defined(VIA_QMK_RGBLIGHT_ENABLE)
+#endif // #if defined(VIA_QMK_RGBLIGHT_ENABLE)
diff --git a/quantum/via.h b/quantum/via.h
index 3db318a454..ac29a58902 100644
--- a/quantum/via.h
+++ b/quantum/via.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "eeconfig.h"  // for EECONFIG_SIZE
+#include "eeconfig.h" // for EECONFIG_SIZE
 
 // Keyboard level code can change where VIA stores the magic.
 // The magic is the build date YYMMDD encoded as BCD in 3 bytes,
@@ -59,7 +59,7 @@
 #define VIA_PROTOCOL_VERSION 0x0009
 
 enum via_command_id {
-    id_get_protocol_version                 = 0x01,  // always 0x01
+    id_get_protocol_version                 = 0x01, // always 0x01
     id_get_keyboard_value                   = 0x02,
     id_set_keyboard_value                   = 0x03,
     id_dynamic_keymap_get_keycode           = 0x04,
@@ -82,7 +82,7 @@ enum via_command_id {
 };
 
 enum via_keyboard_value_id {
-    id_uptime              = 0x01,  //
+    id_uptime              = 0x01, //
     id_layout_options      = 0x02,
     id_switch_matrix_state = 0x03
 };
@@ -159,6 +159,7 @@ void via_init(void);
 // Used by VIA to store and retrieve the layout options.
 uint32_t via_get_layout_options(void);
 void     via_set_layout_options(uint32_t value);
+void     via_set_layout_options_kb(uint32_t value);
 
 // Called by QMK core to process VIA-specific keycodes.
 bool process_record_via(uint16_t keycode, keyrecord_t *record);
diff --git a/quantum/wpm.c b/quantum/wpm.c
index 62d4128b8e..b2e6fe0430 100644
--- a/quantum/wpm.c
+++ b/quantum/wpm.c
@@ -55,12 +55,20 @@ static uint8_t  prev_wpm        = 0;
 static uint8_t  next_wpm        = 0;
 #endif
 
-void    set_current_wpm(uint8_t new_wpm) { current_wpm = new_wpm; }
-uint8_t get_current_wpm(void) { return current_wpm; }
+void set_current_wpm(uint8_t new_wpm) {
+    current_wpm = new_wpm;
+}
+uint8_t get_current_wpm(void) {
+    return current_wpm;
+}
 
-bool wpm_keycode(uint16_t keycode) { return wpm_keycode_kb(keycode); }
+bool wpm_keycode(uint16_t keycode) {
+    return wpm_keycode_kb(keycode);
+}
 
-__attribute__((weak)) bool wpm_keycode_kb(uint16_t keycode) { return wpm_keycode_user(keycode); }
+__attribute__((weak)) bool wpm_keycode_kb(uint16_t keycode) {
+    return wpm_keycode_user(keycode);
+}
 
 __attribute__((weak)) 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)) {
@@ -122,7 +130,7 @@ void decay_wpm(void) {
     uint32_t duration = (((periods)*PERIOD_DURATION) + elapsed);
     int32_t  wpm_now  = (60000 * presses) / (duration * WPM_ESTIMATED_WORD_SIZE);
 
-    if (wpm_now < 0)  // set some reasonable WPM measurement limits
+    if (wpm_now < 0) // set some reasonable WPM measurement limits
         wpm_now = 0;
     if (wpm_now > 240) wpm_now = 240;
 
@@ -133,7 +141,7 @@ void decay_wpm(void) {
         elapsed                        = 0;
         wpm_timer                      = timer_read32();
     }
-    if (presses < 2)  // don't guess high WPM based on a single keypress.
+    if (presses < 2) // don't guess high WPM based on a single keypress.
         wpm_now = 0;
 
 #if defined(WPM_LAUNCH_CONTROL)
@@ -150,7 +158,7 @@ void decay_wpm(void) {
         wpm_now           = 0;
         period_presses[0] = 0;
     }
-#endif  // WPM_LAUNCH_CONTROL
+#endif // WPM_LAUNCH_CONTROL
 
 #if defined(WPM_UNFILTERED)
     current_wpm = wpm_now;
diff --git a/tests/test_common/keyboard_report_util.cpp b/tests/test_common/keyboard_report_util.cpp
index e148c76beb..7908e64f7f 100644
--- a/tests/test_common/keyboard_report_util.cpp
+++ b/tests/test_common/keyboard_report_util.cpp
@@ -36,7 +36,7 @@ std::vector<uint8_t> get_keys(const report_keyboard_t& report) {
     std::sort(result.begin(), result.end());
     return result;
 }
-}  // namespace
+} // namespace
 
 bool operator==(const report_keyboard_t& lhs, const report_keyboard_t& rhs) {
     auto lhskeys = get_keys(lhs);
@@ -72,8 +72,14 @@ KeyboardReportMatcher::KeyboardReportMatcher(const std::vector<uint8_t>& keys) {
     }
 }
 
-bool KeyboardReportMatcher::MatchAndExplain(report_keyboard_t& report, MatchResultListener* listener) const { return m_report == report; }
+bool KeyboardReportMatcher::MatchAndExplain(report_keyboard_t& report, MatchResultListener* listener) const {
+    return m_report == report;
+}
 
-void KeyboardReportMatcher::DescribeTo(::std::ostream* os) const { *os << "is equal to " << m_report; }
+void KeyboardReportMatcher::DescribeTo(::std::ostream* os) const {
+    *os << "is equal to " << m_report;
+}
 
-void KeyboardReportMatcher::DescribeNegationTo(::std::ostream* os) const { *os << "is not equal to " << m_report; }
+void KeyboardReportMatcher::DescribeNegationTo(::std::ostream* os) const {
+    *os << "is not equal to " << m_report;
+}
diff --git a/tests/test_common/matrix.c b/tests/test_common/matrix.c
index 9a92a801c7..7b24d560e3 100644
--- a/tests/test_common/matrix.c
+++ b/tests/test_common/matrix.c
@@ -30,7 +30,9 @@ uint8_t matrix_scan(void) {
     return 1;
 }
 
-matrix_row_t matrix_get_row(uint8_t row) { return matrix[row]; }
+matrix_row_t matrix_get_row(uint8_t row) {
+    return matrix[row];
+}
 
 void matrix_print(void) {}
 
@@ -38,10 +40,16 @@ void matrix_init_kb(void) {}
 
 void matrix_scan_kb(void) {}
 
-void press_key(uint8_t col, uint8_t row) { matrix[row] |= 1 << col; }
+void press_key(uint8_t col, uint8_t row) {
+    matrix[row] |= 1 << col;
+}
 
-void release_key(uint8_t col, uint8_t row) { matrix[row] &= ~(1 << col); }
+void release_key(uint8_t col, uint8_t row) {
+    matrix[row] &= ~(1 << col);
+}
 
-void clear_all_keys(void) { memset(matrix, 0, sizeof(matrix)); }
+void clear_all_keys(void) {
+    memset(matrix, 0, sizeof(matrix));
+}
 
 void led_set(uint8_t usb_led) {}
diff --git a/tests/test_common/test_driver.cpp b/tests/test_common/test_driver.cpp
index 2fa2b6a2e7..68f1dfd17d 100644
--- a/tests/test_common/test_driver.cpp
+++ b/tests/test_common/test_driver.cpp
@@ -23,17 +23,27 @@ TestDriver::TestDriver() : m_driver{&TestDriver::keyboard_leds, &TestDriver::sen
     m_this = this;
 }
 
-TestDriver::~TestDriver() { m_this = nullptr; }
+TestDriver::~TestDriver() {
+    m_this = nullptr;
+}
 
-uint8_t TestDriver::keyboard_leds(void) { return m_this->m_leds; }
+uint8_t TestDriver::keyboard_leds(void) {
+    return m_this->m_leds;
+}
 
 void TestDriver::send_keyboard(report_keyboard_t* report) {
     test_logger.trace() << *report;
     m_this->send_keyboard_mock(*report);
 }
 
-void TestDriver::send_mouse(report_mouse_t* report) { m_this->send_mouse_mock(*report); }
+void TestDriver::send_mouse(report_mouse_t* report) {
+    m_this->send_mouse_mock(*report);
+}
 
-void TestDriver::send_system(uint16_t data) { m_this->send_system_mock(data); }
+void TestDriver::send_system(uint16_t data) {
+    m_this->send_system_mock(data);
+}
 
-void TestDriver::send_consumer(uint16_t data) { m_this->send_consumer(data); }
+void TestDriver::send_consumer(uint16_t data) {
+    m_this->send_consumer(data);
+}
diff --git a/tests/test_common/test_fixture.cpp b/tests/test_common/test_fixture.cpp
index 91bf3e779e..c98a679554 100644
--- a/tests/test_common/test_fixture.cpp
+++ b/tests/test_common/test_fixture.cpp
@@ -55,7 +55,9 @@ void TestFixture::SetUpTestCase() {
 
 void TestFixture::TearDownTestCase() {}
 
-TestFixture::TestFixture() { m_this = this; }
+TestFixture::TestFixture() {
+    m_this = this;
+}
 
 TestFixture::~TestFixture() {
     test_logger.info() << "TestFixture clean-up start." << std::endl;
diff --git a/tests/test_common/test_logger.cpp b/tests/test_common/test_logger.cpp
index 959fdde5ec..efc7719d13 100644
--- a/tests/test_common/test_logger.cpp
+++ b/tests/test_common/test_logger.cpp
@@ -34,6 +34,10 @@ TestLogger& TestLogger::error() {
     return *this;
 }
 
-void TestLogger::reset() { this->m_log.str(""); };
+void TestLogger::reset() {
+    this->m_log.str("");
+};
 
-void TestLogger::print_log() { std::cerr << this->m_log.str(); }
+void TestLogger::print_log() {
+    std::cerr << this->m_log.str();
+}
diff --git a/tmk_core/protocol.mk b/tmk_core/protocol.mk
index 31a6de76f1..19fd7d2425 100644
--- a/tmk_core/protocol.mk
+++ b/tmk_core/protocol.mk
@@ -28,6 +28,11 @@ ifeq ($(strip $(EXTRAKEY_ENABLE)), yes)
     SHARED_EP_ENABLE = yes
 endif
 
+ifeq ($(strip $(PROGRAMMABLE_BUTTON_ENABLE)), yes)
+    TMK_COMMON_DEFS += -DPROGRAMMABLE_BUTTON_ENABLE
+    SHARED_EP_ENABLE = yes
+endif
+
 ifeq ($(strip $(RAW_ENABLE)), yes)
     TMK_COMMON_DEFS += -DRAW_ENABLE
 endif
diff --git a/tmk_core/protocol/arm_atsam/adc.c b/tmk_core/protocol/arm_atsam/adc.c
index 1ef1b11d57..3afcbddf10 100644
--- a/tmk_core/protocol/arm_atsam/adc.c
+++ b/tmk_core/protocol/arm_atsam/adc.c
@@ -27,10 +27,10 @@ uint16_t v_con_2_boot;
 void ADC0_clock_init(void) {
     DBGC(DC_ADC0_CLOCK_INIT_BEGIN);
 
-    MCLK->APBDMASK.bit.ADC0_ = 1;  // ADC0 Clock Enable
+    MCLK->APBDMASK.bit.ADC0_ = 1; // ADC0 Clock Enable
 
-    GCLK->PCHCTRL[ADC0_GCLK_ID].bit.GEN  = GEN_OSC0;  // Select generator clock
-    GCLK->PCHCTRL[ADC0_GCLK_ID].bit.CHEN = 1;         // Enable peripheral clock
+    GCLK->PCHCTRL[ADC0_GCLK_ID].bit.GEN  = GEN_OSC0; // Select generator clock
+    GCLK->PCHCTRL[ADC0_GCLK_ID].bit.CHEN = 1;        // Enable peripheral clock
 
     DBGC(DC_ADC0_CLOCK_INIT_COMPLETE);
 }
@@ -39,15 +39,15 @@ void ADC0_init(void) {
     DBGC(DC_ADC0_INIT_BEGIN);
 
     // MCU
-    PORT->Group[1].DIRCLR.reg           = 1 << 0;  // PB00 as input 5V
-    PORT->Group[1].DIRCLR.reg           = 1 << 1;  // PB01 as input CON2
-    PORT->Group[1].DIRCLR.reg           = 1 << 2;  // PB02 as input CON1
-    PORT->Group[1].PMUX[0].bit.PMUXE    = 1;       // PB00 mux select B ADC 5V
-    PORT->Group[1].PMUX[0].bit.PMUXO    = 1;       // PB01 mux select B ADC CON2
-    PORT->Group[1].PMUX[1].bit.PMUXE    = 1;       // PB02 mux select B ADC CON1
-    PORT->Group[1].PINCFG[0].bit.PMUXEN = 1;       // PB01 mux ADC Enable 5V
-    PORT->Group[1].PINCFG[1].bit.PMUXEN = 1;       // PB01 mux ADC Enable CON2
-    PORT->Group[1].PINCFG[2].bit.PMUXEN = 1;       // PB02 mux ADC Enable CON1
+    PORT->Group[1].DIRCLR.reg           = 1 << 0; // PB00 as input 5V
+    PORT->Group[1].DIRCLR.reg           = 1 << 1; // PB01 as input CON2
+    PORT->Group[1].DIRCLR.reg           = 1 << 2; // PB02 as input CON1
+    PORT->Group[1].PMUX[0].bit.PMUXE    = 1;      // PB00 mux select B ADC 5V
+    PORT->Group[1].PMUX[0].bit.PMUXO    = 1;      // PB01 mux select B ADC CON2
+    PORT->Group[1].PMUX[1].bit.PMUXE    = 1;      // PB02 mux select B ADC CON1
+    PORT->Group[1].PINCFG[0].bit.PMUXEN = 1;      // PB01 mux ADC Enable 5V
+    PORT->Group[1].PINCFG[1].bit.PMUXEN = 1;      // PB01 mux ADC Enable CON2
+    PORT->Group[1].PINCFG[2].bit.PMUXEN = 1;      // PB02 mux ADC Enable CON1
 
     // ADC
     ADC0->CTRLA.bit.SWRST = 1;
@@ -81,7 +81,7 @@ void ADC0_init(void) {
     }
 
     // Settling
-    ADC0->SAMPCTRL.bit.SAMPLEN = 45;  // Sampling Time Length: 1-63, 1 ADC CLK per
+    ADC0->SAMPCTRL.bit.SAMPLEN = 45; // Sampling Time Length: 1-63, 1 ADC CLK per
     while (ADC0->SYNCBUSY.bit.SAMPCTRL) {
         DBGC(DC_ADC0_SAMPCTRL_SYNCING_1);
     }
diff --git a/tmk_core/protocol/arm_atsam/adc.h b/tmk_core/protocol/arm_atsam/adc.h
index 9ab653e5a2..74fbb0e66f 100644
--- a/tmk_core/protocol/arm_atsam/adc.h
+++ b/tmk_core/protocol/arm_atsam/adc.h
@@ -34,4 +34,4 @@ extern uint16_t v_con_2_boot;
 void ADC0_clock_init(void);
 void ADC0_init(void);
 
-#endif  //_ADC_H_
+#endif //_ADC_H_
diff --git a/tmk_core/protocol/arm_atsam/arm_atsam_protocol.h b/tmk_core/protocol/arm_atsam/arm_atsam_protocol.h
index 319ff8487d..db9827f6a2 100644
--- a/tmk_core/protocol/arm_atsam/arm_atsam_protocol.h
+++ b/tmk_core/protocol/arm_atsam/arm_atsam_protocol.h
@@ -42,6 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    include "./usb/udc.h"
 #    include "./usb/udi_cdc.h"
 
-#endif  // MD_BOOTLOADER
+#endif // MD_BOOTLOADER
 
-#endif  //_ARM_ATSAM_PROTOCOL_H_
+#endif //_ARM_ATSAM_PROTOCOL_H_
diff --git a/tmk_core/protocol/arm_atsam/clks.c b/tmk_core/protocol/arm_atsam/clks.c
index 84ed6d83af..9b9475c616 100644
--- a/tmk_core/protocol/arm_atsam/clks.c
+++ b/tmk_core/protocol/arm_atsam/clks.c
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 volatile clk_t    system_clks;
 volatile uint64_t ms_clk;
 uint32_t          usec_delay_mult;
-#define USEC_DELAY_LOOP_CYCLES 3  // Sum of instruction cycles in us delay loop
+#define USEC_DELAY_LOOP_CYCLES 3 // Sum of instruction cycles in us delay loop
 
 const uint32_t sercom_apbbase[] = {(uint32_t)SERCOM0, (uint32_t)SERCOM1, (uint32_t)SERCOM2, (uint32_t)SERCOM3, (uint32_t)SERCOM4, (uint32_t)SERCOM5};
 const uint8_t  sercom_pchan[]   = {7, 8, 23, 24, 34, 35};
@@ -59,9 +59,9 @@ void CLK_oscctrl_init(void) {
     while (posctrl->Dpll[USE_DPLL_IND].DPLLSYNCBUSY.bit.ENABLE) {
         DBGC(DC_CLK_OSC_INIT_DPLL_SYNC_DISABLE);
     }
-    posctrl->Dpll[USE_DPLL_IND].DPLLCTRLB.bit.REFCLK = 2;          // select XOSC0 (16MHz)
-    posctrl->Dpll[USE_DPLL_IND].DPLLCTRLB.bit.DIV    = 7;          // 16 MHz / (2 * (7 + 1)) = 1 MHz
-    posctrl->Dpll[USE_DPLL_IND].DPLLRATIO.bit.LDR    = PLL_RATIO;  // 1 MHz * (PLL_RATIO(47) + 1) = 48MHz
+    posctrl->Dpll[USE_DPLL_IND].DPLLCTRLB.bit.REFCLK = 2;         // select XOSC0 (16MHz)
+    posctrl->Dpll[USE_DPLL_IND].DPLLCTRLB.bit.DIV    = 7;         // 16 MHz / (2 * (7 + 1)) = 1 MHz
+    posctrl->Dpll[USE_DPLL_IND].DPLLRATIO.bit.LDR    = PLL_RATIO; // 1 MHz * (PLL_RATIO(47) + 1) = 48MHz
     while (posctrl->Dpll[USE_DPLL_IND].DPLLSYNCBUSY.bit.DPLLRATIO) {
         DBGC(DC_CLK_OSC_INIT_DPLL_SYNC_RATIO);
     }
@@ -87,7 +87,7 @@ void CLK_oscctrl_init(void) {
     system_clks.freq_gclk[0] = system_clks.freq_dpll[0];
 
     usec_delay_mult = system_clks.freq_gclk[0] / (USEC_DELAY_LOOP_CYCLES * 1000000);
-    if (usec_delay_mult < 1) usec_delay_mult = 1;  // Never allow a multiplier of zero
+    if (usec_delay_mult < 1) usec_delay_mult = 1; // Never allow a multiplier of zero
 
     DBGC(DC_CLK_OSC_INIT_COMPLETE);
 }
@@ -240,7 +240,7 @@ uint32_t CLK_enable_timebase(void) {
     // ptc4->COUNT16.DBGCTRL.bit.DBGRUN = 1;
 
     // wave mode
-    ptc4->COUNT16.WAVE.bit.WAVEGEN = 1;  // MFRQ match frequency mode, toggle each CC match
+    ptc4->COUNT16.WAVE.bit.WAVEGEN = 1; // MFRQ match frequency mode, toggle each CC match
     // generate event for next stage
     ptc4->COUNT16.EVCTRL.bit.MCEO0 = 1;
 
@@ -272,9 +272,9 @@ uint32_t CLK_enable_timebase(void) {
         DBGC(DC_CLK_ENABLE_TIMEBASE_TC0_SYNC_SWRST_2);
     }
     // CTRLA as default
-    ptc0->COUNT32.CTRLA.bit.MODE   = 2;  // 32 bit mode
-    ptc0->COUNT32.EVCTRL.bit.TCEI  = 1;  // enable incoming events
-    ptc0->COUNT32.EVCTRL.bit.EVACT = 2;  // count events
+    ptc0->COUNT32.CTRLA.bit.MODE   = 2; // 32 bit mode
+    ptc0->COUNT32.EVCTRL.bit.TCEI  = 1; // enable incoming events
+    ptc0->COUNT32.EVCTRL.bit.EVACT = 2; // count events
 
     DBGC(DC_CLK_ENABLE_TIMEBASE_TC0_COMPLETE);
 
@@ -284,10 +284,10 @@ uint32_t CLK_enable_timebase(void) {
     pmclk->APBBMASK.bit.EVSYS_               = 1;
     pgclk->PCHCTRL[EVSYS_GCLK_ID_0].bit.GEN  = GEN_TC45;
     pgclk->PCHCTRL[EVSYS_GCLK_ID_0].bit.CHEN = 1;
-    pevsys->USER[44].reg                     = EVSYS_ID_USER_PORT_EV_0;               // TC0 will get event channel 0
-    pevsys->Channel[0].CHANNEL.bit.EDGSEL    = EVSYS_CHANNEL_EDGSEL_RISING_EDGE_Val;  // Rising edge
-    pevsys->Channel[0].CHANNEL.bit.PATH      = EVSYS_CHANNEL_PATH_SYNCHRONOUS_Val;    // Synchronous
-    pevsys->Channel[0].CHANNEL.bit.EVGEN     = EVSYS_ID_GEN_TC4_MCX_0;                // TC4 MC0
+    pevsys->USER[44].reg                     = EVSYS_ID_USER_PORT_EV_0;              // TC0 will get event channel 0
+    pevsys->Channel[0].CHANNEL.bit.EDGSEL    = EVSYS_CHANNEL_EDGSEL_RISING_EDGE_Val; // Rising edge
+    pevsys->Channel[0].CHANNEL.bit.PATH      = EVSYS_CHANNEL_PATH_SYNCHRONOUS_Val;   // Synchronous
+    pevsys->Channel[0].CHANNEL.bit.EVGEN     = EVSYS_ID_GEN_TC4_MCX_0;               // TC4 MC0
 
     DBGC(DC_CLK_ENABLE_TIMEBASE_EVSYS_COMPLETE);
 
@@ -301,15 +301,15 @@ uint32_t CLK_enable_timebase(void) {
 }
 
 void CLK_delay_us(uint32_t usec) {
-    asm("CBZ R0, return\n\t"  // If usec == 0, branch to return label
+    asm("CBZ R0, return\n\t" // If usec == 0, branch to return label
     );
-    asm("MULS R0, %0\n\t"        // Multiply R0(usec) by usec_delay_mult and store in R0
-        ".balign 16\n\t"         // Ensure loop is aligned for fastest performance
-        "loop: SUBS R0, #1\n\t"  // Subtract 1 from R0 and update flags (1 cycle)
-        "BNE loop\n\t"           // Branch if non-zero to loop label (2 cycles)  NOTE: USEC_DELAY_LOOP_CYCLES is the sum of loop cycles
-        "return:\n\t"            // Return label
-        :                        // No output registers
-        : "r"(usec_delay_mult)   // For %0
+    asm("MULS R0, %0\n\t"       // Multiply R0(usec) by usec_delay_mult and store in R0
+        ".balign 16\n\t"        // Ensure loop is aligned for fastest performance
+        "loop: SUBS R0, #1\n\t" // Subtract 1 from R0 and update flags (1 cycle)
+        "BNE loop\n\t"          // Branch if non-zero to loop label (2 cycles)  NOTE: USEC_DELAY_LOOP_CYCLES is the sum of loop cycles
+        "return:\n\t"           // Return label
+        :                       // No output registers
+        : "r"(usec_delay_mult)  // For %0
     );
     // Note: BX LR generated
 }
diff --git a/tmk_core/protocol/arm_atsam/clks.h b/tmk_core/protocol/arm_atsam/clks.h
index 72df3a8e3f..6ee71aff8f 100644
--- a/tmk_core/protocol/arm_atsam/clks.h
+++ b/tmk_core/protocol/arm_atsam/clks.h
@@ -24,14 +24,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    include "config_led.h"
 #    include "config.h"
 
-#endif  // MD_BOOTLOADER
+#endif // MD_BOOTLOADER
 
-#define PLL_RATIO 47                // mcu frequency ((X+1)MHz)
-#define FREQ_DFLL_DEFAULT 48000000  // DFLL frequency / usb clock
-#define FREQ_SPI_DEFAULT 1000000    // spi to 595 shift regs
-#define FREQ_I2C0_DEFAULT 100000    // i2c to hub
-#define FREQ_I2C1_DEFAULT I2C_HZ    // i2c to LED drivers
-#define FREQ_TC45_DEFAULT 1000000   // 1 usec resolution
+#define PLL_RATIO 47               // mcu frequency ((X+1)MHz)
+#define FREQ_DFLL_DEFAULT 48000000 // DFLL frequency / usb clock
+#define FREQ_SPI_DEFAULT 1000000   // spi to 595 shift regs
+#define FREQ_I2C0_DEFAULT 100000   // i2c to hub
+#define FREQ_I2C1_DEFAULT I2C_HZ   // i2c to LED drivers
+#define FREQ_TC45_DEFAULT 1000000  // 1 usec resolution
 
 // I2C1 Set      ~Result     PWM Time (2x Drivers)
 //     1000000  1090000
@@ -44,10 +44,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define FREQ_XOSC0 16000000
 
-#define CHAN_SERCOM_SPI 2   // shift regs
-#define CHAN_SERCOM_I2C0 0  // hub
-#define CHAN_SERCOM_I2C1 1  // led drivers
-#define CHAN_SERCOM_UART 3  // debug util
+#define CHAN_SERCOM_SPI 2  // shift regs
+#define CHAN_SERCOM_I2C0 0 // hub
+#define CHAN_SERCOM_I2C1 1 // led drivers
+#define CHAN_SERCOM_UART 3 // debug util
 
 // Generator clock channels
 #define GEN_DPLL0 0
@@ -86,4 +86,4 @@ uint32_t CLK_set_i2c0_freq(uint8_t sercomn, uint32_t freq);
 uint32_t CLK_set_i2c1_freq(uint8_t sercomn, uint32_t freq);
 void     CLK_init(void);
 
-#endif  // _CLKS_H_
+#endif // _CLKS_H_
diff --git a/tmk_core/protocol/arm_atsam/d51_util.c b/tmk_core/protocol/arm_atsam/d51_util.c
index df596f7ba2..5903233085 100644
--- a/tmk_core/protocol/arm_atsam/d51_util.c
+++ b/tmk_core/protocol/arm_atsam/d51_util.c
@@ -34,7 +34,8 @@ void dbg_print(uint32_t x) {
     while (t >= 0) {
         p2 = t;
         p  = 1;
-        while (p2--) p *= 10;
+        while (p2--)
+            p *= 10;
         n = x / p;
         x -= n * p;
         if (!n) {
@@ -55,7 +56,7 @@ void dbg_print(uint32_t x) {
     }
 
     for (w = DBG_PAUSE; w; w--)
-        ;  // Long pause after number is complete
+        ; // Long pause after number is complete
 }
 
 // Display unsigned 32-bit number through debug led
@@ -91,7 +92,8 @@ void dled_print(uint32_t x, uint8_t long_pause) {
     while (t >= 0) {
         p2 = t;
         p  = 1;
-        while (p2--) p *= 10;
+        while (p2--)
+            p *= 10;
         n = x / p;
         x -= n * p;
         if (!n) {
@@ -188,12 +190,12 @@ void debug_code_init(void) {
     DBGC(DC_UNSET);
 
     // Configure Ports for EIC
-    PORT->Group[DEBUG_BOOT_TRACING_PORT].DIRCLR.reg                                 = 1 << DEBUG_BOOT_TRACING_PIN;  // Input
-    PORT->Group[DEBUG_BOOT_TRACING_PORT].OUTSET.reg                                 = 1 << DEBUG_BOOT_TRACING_PIN;  // High
-    PORT->Group[DEBUG_BOOT_TRACING_PORT].PINCFG[DEBUG_BOOT_TRACING_PIN].bit.INEN    = 1;                            // Input Enable
-    PORT->Group[DEBUG_BOOT_TRACING_PORT].PINCFG[DEBUG_BOOT_TRACING_PIN].bit.PULLEN  = 1;                            // Pull Enable
-    PORT->Group[DEBUG_BOOT_TRACING_PORT].PINCFG[DEBUG_BOOT_TRACING_PIN].bit.PMUXEN  = 1;                            // Mux Enable
-    PORT->Group[DEBUG_BOOT_TRACING_PORT].PMUX[DEBUG_BOOT_TRACING_PIN / 2].bit.PMUXO = 0;                            // Mux A
+    PORT->Group[DEBUG_BOOT_TRACING_PORT].DIRCLR.reg                                 = 1 << DEBUG_BOOT_TRACING_PIN; // Input
+    PORT->Group[DEBUG_BOOT_TRACING_PORT].OUTSET.reg                                 = 1 << DEBUG_BOOT_TRACING_PIN; // High
+    PORT->Group[DEBUG_BOOT_TRACING_PORT].PINCFG[DEBUG_BOOT_TRACING_PIN].bit.INEN    = 1;                           // Input Enable
+    PORT->Group[DEBUG_BOOT_TRACING_PORT].PINCFG[DEBUG_BOOT_TRACING_PIN].bit.PULLEN  = 1;                           // Pull Enable
+    PORT->Group[DEBUG_BOOT_TRACING_PORT].PINCFG[DEBUG_BOOT_TRACING_PIN].bit.PMUXEN  = 1;                           // Mux Enable
+    PORT->Group[DEBUG_BOOT_TRACING_PORT].PMUX[DEBUG_BOOT_TRACING_PIN / 2].bit.PMUXO = 0;                           // Mux A
 
     // Enable CLK_EIC_APB
     MCLK->APBAMASK.bit.EIC_ = 1;
@@ -223,12 +225,12 @@ void debug_code_disable(void) {
     }
 
     // Default port configuration
-    PORT->Group[DEBUG_BOOT_TRACING_PORT].DIRCLR.reg                                 = 1 << DEBUG_BOOT_TRACING_PIN;  // Input
-    PORT->Group[DEBUG_BOOT_TRACING_PORT].OUTCLR.reg                                 = 1 << DEBUG_BOOT_TRACING_PIN;  // Low
-    PORT->Group[DEBUG_BOOT_TRACING_PORT].PINCFG[DEBUG_BOOT_TRACING_PIN].bit.INEN    = 0;                            // Input Disable
-    PORT->Group[DEBUG_BOOT_TRACING_PORT].PINCFG[DEBUG_BOOT_TRACING_PIN].bit.PULLEN  = 0;                            // Pull Disable
-    PORT->Group[DEBUG_BOOT_TRACING_PORT].PINCFG[DEBUG_BOOT_TRACING_PIN].bit.PMUXEN  = 0;                            // Mux Disable
-    PORT->Group[DEBUG_BOOT_TRACING_PORT].PMUX[DEBUG_BOOT_TRACING_PIN / 2].bit.PMUXO = 0;                            // Mux A
+    PORT->Group[DEBUG_BOOT_TRACING_PORT].DIRCLR.reg                                 = 1 << DEBUG_BOOT_TRACING_PIN; // Input
+    PORT->Group[DEBUG_BOOT_TRACING_PORT].OUTCLR.reg                                 = 1 << DEBUG_BOOT_TRACING_PIN; // Low
+    PORT->Group[DEBUG_BOOT_TRACING_PORT].PINCFG[DEBUG_BOOT_TRACING_PIN].bit.INEN    = 0;                           // Input Disable
+    PORT->Group[DEBUG_BOOT_TRACING_PORT].PINCFG[DEBUG_BOOT_TRACING_PIN].bit.PULLEN  = 0;                           // Pull Disable
+    PORT->Group[DEBUG_BOOT_TRACING_PORT].PINCFG[DEBUG_BOOT_TRACING_PIN].bit.PMUXEN  = 0;                           // Mux Disable
+    PORT->Group[DEBUG_BOOT_TRACING_PORT].PMUX[DEBUG_BOOT_TRACING_PIN / 2].bit.PMUXO = 0;                           // Mux A
 
     // Disable CLK_EIC_APB
     MCLK->APBAMASK.bit.EIC_ = 0;
@@ -239,4 +241,4 @@ void debug_code_disable(void) {
 void debug_code_init(void) {}
 void debug_code_disable(void) {}
 
-#endif  // DEBUG_BOOT_TRACING_ENABLE
+#endif // DEBUG_BOOT_TRACING_ENABLE
diff --git a/tmk_core/protocol/arm_atsam/d51_util.h b/tmk_core/protocol/arm_atsam/d51_util.h
index 89cf338d23..d301e55411 100644
--- a/tmk_core/protocol/arm_atsam/d51_util.h
+++ b/tmk_core/protocol/arm_atsam/d51_util.h
@@ -219,6 +219,6 @@ enum debug_code_list {
 #    define DBGC(n) \
         {}
 
-#endif  // DEBUG_BOOT_TRACING_ENABLE
+#endif // DEBUG_BOOT_TRACING_ENABLE
 
-#endif  //_D51_UTIL_H_
+#endif //_D51_UTIL_H_
diff --git a/tmk_core/protocol/arm_atsam/i2c_master.c b/tmk_core/protocol/arm_atsam/i2c_master.c
index af046625f4..6b0b9a703b 100644
--- a/tmk_core/protocol/arm_atsam/i2c_master.c
+++ b/tmk_core/protocol/arm_atsam/i2c_master.c
@@ -26,21 +26,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    include "config_led.h"
 #    include "matrix.h"
 
-#    define I2C_LED_USE_DMA 1  // Set 1 to use background DMA transfers for leds, Set 0 to use inline software transfers
+#    define I2C_LED_USE_DMA 1 // Set 1 to use background DMA transfers for leds, Set 0 to use inline software transfers
 
 DmacDescriptor dmac_desc;
 DmacDescriptor dmac_desc_wb;
 
-static uint8_t i2c_led_q[I2C_Q_SIZE];  // I2C queue circular buffer
-static uint8_t i2c_led_q_s;            // Start of circular buffer
-static uint8_t i2c_led_q_e;            // End of circular buffer
-static uint8_t i2c_led_q_full;         // Queue full counter for reset
+static uint8_t i2c_led_q[I2C_Q_SIZE]; // I2C queue circular buffer
+static uint8_t i2c_led_q_s;           // Start of circular buffer
+static uint8_t i2c_led_q_e;           // End of circular buffer
+static uint8_t i2c_led_q_full;        // Queue full counter for reset
 
-static uint8_t dma_sendbuf[I2C_DMA_MAX_SEND];  // Data being written to I2C
+static uint8_t dma_sendbuf[I2C_DMA_MAX_SEND]; // Data being written to I2C
 
 volatile uint8_t i2c_led_q_running;
 
-#endif  // !defined(MD_BOOTLOADER) && defined(RGB_MATRIX_ENABLE)
+#endif // !defined(MD_BOOTLOADER) && defined(RGB_MATRIX_ENABLE)
 
 void i2c0_init(void) {
     DBGC(DC_I2C0_INIT_BEGIN);
@@ -56,23 +56,23 @@ void i2c0_init(void) {
     // I2C
     // Note: SW Reset handled in CLK_set_i2c0_freq clks.c
 
-    SERCOM0->I2CM.CTRLA.bit.MODE = 5;  // Set master mode
+    SERCOM0->I2CM.CTRLA.bit.MODE = 5; // Set master mode
 
-    SERCOM0->I2CM.CTRLA.bit.SPEED    = 0;  // Set to 1 for Fast-mode Plus (FM+) up to 1 MHz
-    SERCOM0->I2CM.CTRLA.bit.RUNSTDBY = 1;  // Enabled
+    SERCOM0->I2CM.CTRLA.bit.SPEED    = 0; // Set to 1 for Fast-mode Plus (FM+) up to 1 MHz
+    SERCOM0->I2CM.CTRLA.bit.RUNSTDBY = 1; // Enabled
 
-    SERCOM0->I2CM.CTRLA.bit.ENABLE = 1;  // Enable the device
+    SERCOM0->I2CM.CTRLA.bit.ENABLE = 1; // Enable the device
     while (SERCOM0->I2CM.SYNCBUSY.bit.ENABLE) {
         DBGC(DC_I2C0_INIT_SYNC_ENABLING);
-    }  // Wait for SYNCBUSY.ENABLE to clear
+    } // Wait for SYNCBUSY.ENABLE to clear
 
-    SERCOM0->I2CM.STATUS.bit.BUSSTATE = 1;  // Force into IDLE state
+    SERCOM0->I2CM.STATUS.bit.BUSSTATE = 1; // Force into IDLE state
     while (SERCOM0->I2CM.SYNCBUSY.bit.SYSOP) {
         DBGC(DC_I2C0_INIT_SYNC_SYSOP);
     }
     while (SERCOM0->I2CM.STATUS.bit.BUSSTATE != 1) {
         DBGC(DC_I2C0_INIT_WAIT_IDLE);
-    }  // Wait while not idle
+    } // Wait while not idle
 
     DBGC(DC_I2C0_INIT_COMPLETE);
 }
@@ -139,27 +139,27 @@ void i2c1_init(void) {
     /* I2C */
     // Note: SW Reset handled in CLK_set_i2c1_freq clks.c
 
-    SERCOM1->I2CM.CTRLA.bit.MODE     = 5;  // MODE: Set master mode (No sync)
-    SERCOM1->I2CM.CTRLA.bit.SPEED    = 1;  // SPEED: Fm+ up to 1MHz (No sync)
-    SERCOM1->I2CM.CTRLA.bit.RUNSTDBY = 1;  // RUNSTBY: Enabled (No sync)
+    SERCOM1->I2CM.CTRLA.bit.MODE     = 5; // MODE: Set master mode (No sync)
+    SERCOM1->I2CM.CTRLA.bit.SPEED    = 1; // SPEED: Fm+ up to 1MHz (No sync)
+    SERCOM1->I2CM.CTRLA.bit.RUNSTDBY = 1; // RUNSTBY: Enabled (No sync)
 
-    SERCOM1->I2CM.CTRLB.bit.SMEN = 1;  // SMEN: Smart mode enabled (For DMA)(No sync)
+    SERCOM1->I2CM.CTRLB.bit.SMEN = 1; // SMEN: Smart mode enabled (For DMA)(No sync)
 
     NVIC_EnableIRQ(SERCOM1_0_IRQn);
     SERCOM1->I2CM.INTENSET.bit.ERROR = 1;
 
-    SERCOM1->I2CM.CTRLA.bit.ENABLE = 1;  // ENABLE: Enable the device (sync SYNCBUSY.ENABLE)
+    SERCOM1->I2CM.CTRLA.bit.ENABLE = 1; // ENABLE: Enable the device (sync SYNCBUSY.ENABLE)
     while (SERCOM1->I2CM.SYNCBUSY.bit.ENABLE) {
         DBGC(DC_I2C1_INIT_SYNC_ENABLING);
-    }  // Wait for SYNCBUSY.ENABLE to clear
+    } // Wait for SYNCBUSY.ENABLE to clear
 
-    SERCOM1->I2CM.STATUS.bit.BUSSTATE = 1;  // BUSSTATE: Force into IDLE state (sync SYNCBUSY.SYSOP)
+    SERCOM1->I2CM.STATUS.bit.BUSSTATE = 1; // BUSSTATE: Force into IDLE state (sync SYNCBUSY.SYSOP)
     while (SERCOM1->I2CM.SYNCBUSY.bit.SYSOP) {
         DBGC(DC_I2C1_INIT_SYNC_SYSOP);
     }
     while (SERCOM1->I2CM.STATUS.bit.BUSSTATE != 1) {
         DBGC(DC_I2C1_INIT_WAIT_IDLE);
-    }  // Wait while not idle
+    } // Wait while not idle
 
     DBGC(DC_I2C1_INIT_COMPLETE);
 }
@@ -240,7 +240,7 @@ void i2c_led_send_onoff(uint8_t drvid) {
     }
 #    endif
 
-    *issidrv[drvid].onoff = 0;  // Force start location offset to zero
+    *issidrv[drvid].onoff = 0; // Force start location offset to zero
     i2c1_transmit(issidrv[drvid].addr, issidrv[drvid].onoff, ISSI3733_PG0_BYTES, 0);
 }
 
@@ -265,7 +265,7 @@ void i2c_led_send_pwm(uint8_t drvid) {
     }
 #    endif
 
-    *issidrv[drvid].pwm = 0;  // Force start location offset to zero
+    *issidrv[drvid].pwm = 0; // Force start location offset to zero
     i2c1_transmit(issidrv[drvid].addr, issidrv[drvid].pwm, ISSI3733_PG1_BYTES, 0);
 }
 
@@ -300,12 +300,12 @@ uint8_t I2C3733_Init_Drivers(void) {
     // Set up master device
     i2c_led_send_CRWL(0);
     i2c_led_select_page(0, 3);
-    i2c_led_send_mode_op_gcr(0, 0, ISSI3733_CR_SSD_NORMAL);  // No SYNC due to brightness mismatch with second driver
+    i2c_led_send_mode_op_gcr(0, 0, ISSI3733_CR_SSD_NORMAL); // No SYNC due to brightness mismatch with second driver
 
     // Set up slave device
     i2c_led_send_CRWL(1);
     i2c_led_select_page(1, 3);
-    i2c_led_send_mode_op_gcr(1, 0, ISSI3733_CR_SSD_NORMAL);  // No SYNC due to brightness mismatch with first driver and slight flicker at rgb values 1,2
+    i2c_led_send_mode_op_gcr(1, 0, ISSI3733_CR_SSD_NORMAL); // No SYNC due to brightness mismatch with first driver and slight flicker at rgb values 1,2
 
     i2c_led_send_CRWL(0);
     i2c_led_select_page(0, 3);
@@ -326,41 +326,41 @@ void I2C_DMAC_LED_Init(void) {
     DBGC(DC_I2C_DMAC_LED_INIT_BEGIN);
 
     // Disable device
-    dmac->CTRL.bit.DMAENABLE = 0;  // Disable DMAC
+    dmac->CTRL.bit.DMAENABLE = 0; // Disable DMAC
     while (dmac->CTRL.bit.DMAENABLE) {
-    }                          // Wait for disabled state in case of ongoing transfers
-    dmac->CTRL.bit.SWRST = 1;  // Software Reset DMAC
+    }                         // Wait for disabled state in case of ongoing transfers
+    dmac->CTRL.bit.SWRST = 1; // Software Reset DMAC
     while (dmac->CTRL.bit.SWRST) {
-    }  // Wait for software reset to complete
+    } // Wait for software reset to complete
 
     // Configure device
-    dmac->BASEADDR.reg = (uint32_t)&dmac_desc;     // Set descriptor base address
-    dmac->WRBADDR.reg  = (uint32_t)&dmac_desc_wb;  // Set descriptor write back address
-    dmac->CTRL.reg |= 0x0f00;                      // Handle all priorities (LVL0-3)
+    dmac->BASEADDR.reg = (uint32_t)&dmac_desc;    // Set descriptor base address
+    dmac->WRBADDR.reg  = (uint32_t)&dmac_desc_wb; // Set descriptor write back address
+    dmac->CTRL.reg |= 0x0f00;                     // Handle all priorities (LVL0-3)
 
     // Disable channel
-    dmac->Channel[0].CHCTRLA.bit.ENABLE = 0;  // Disable the channel
+    dmac->Channel[0].CHCTRLA.bit.ENABLE = 0; // Disable the channel
     while (dmac->Channel[0].CHCTRLA.bit.ENABLE) {
-    }                                        // Wait for disabled state in case of ongoing transfers
-    dmac->Channel[0].CHCTRLA.bit.SWRST = 1;  // Software Reset the channel
+    }                                       // Wait for disabled state in case of ongoing transfers
+    dmac->Channel[0].CHCTRLA.bit.SWRST = 1; // Software Reset the channel
     while (dmac->Channel[0].CHCTRLA.bit.SWRST) {
-    }  // Wait for software reset to complete
+    } // Wait for software reset to complete
 
     // Configure channel
-    dmac->Channel[0].CHCTRLA.bit.THRESHOLD = 0;                   // 1BEAT
-    dmac->Channel[0].CHCTRLA.bit.BURSTLEN  = 0;                   // SINGLE
-    dmac->Channel[0].CHCTRLA.bit.TRIGACT   = 2;                   // BURST
-    dmac->Channel[0].CHCTRLA.bit.TRIGSRC   = SERCOM1_DMAC_ID_TX;  // Trigger source
-    dmac->Channel[0].CHCTRLA.bit.RUNSTDBY  = 1;                   // Run in standby
+    dmac->Channel[0].CHCTRLA.bit.THRESHOLD = 0;                  // 1BEAT
+    dmac->Channel[0].CHCTRLA.bit.BURSTLEN  = 0;                  // SINGLE
+    dmac->Channel[0].CHCTRLA.bit.TRIGACT   = 2;                  // BURST
+    dmac->Channel[0].CHCTRLA.bit.TRIGSRC   = SERCOM1_DMAC_ID_TX; // Trigger source
+    dmac->Channel[0].CHCTRLA.bit.RUNSTDBY  = 1;                  // Run in standby
 
     NVIC_EnableIRQ(DMAC_0_IRQn);
     dmac->Channel[0].CHINTENSET.bit.TCMPL = 1;
     dmac->Channel[0].CHINTENSET.bit.TERR  = 1;
 
     // Enable device
-    dmac->CTRL.bit.DMAENABLE = 1;  // Enable DMAC
+    dmac->CTRL.bit.DMAENABLE = 1; // Enable DMAC
     while (dmac->CTRL.bit.DMAENABLE == 0) {
-    }  // Wait for enable state
+    } // Wait for enable state
 
     DBGC(DC_I2C_DMAC_LED_INIT_COMPLETE);
 }
@@ -377,14 +377,14 @@ void I2C3733_Control_Set(uint8_t state) {
 }
 
 void i2c_led_desc_defaults(void) {
-    dmac_desc.BTCTRL.bit.STEPSIZE = 0;  // SRCINC used in favor for auto 1 inc
-    dmac_desc.BTCTRL.bit.STEPSEL  = 0;  // SRCINC used in favor for auto 1 inc
-    dmac_desc.BTCTRL.bit.DSTINC   = 0;  // The Destination Address Increment is disabled
-    dmac_desc.BTCTRL.bit.SRCINC   = 1;  // The Source Address Increment is enabled (Inc by 1)
-    dmac_desc.BTCTRL.bit.BEATSIZE = 0;  // 8-bit bus transfer
-    dmac_desc.BTCTRL.bit.BLOCKACT = 0;  // Channel will be disabled if it is the last block transfer in the transaction
-    dmac_desc.BTCTRL.bit.EVOSEL   = 0;  // Event generation disabled
-    dmac_desc.BTCTRL.bit.VALID    = 1;  // Set dmac valid
+    dmac_desc.BTCTRL.bit.STEPSIZE = 0; // SRCINC used in favor for auto 1 inc
+    dmac_desc.BTCTRL.bit.STEPSEL  = 0; // SRCINC used in favor for auto 1 inc
+    dmac_desc.BTCTRL.bit.DSTINC   = 0; // The Destination Address Increment is disabled
+    dmac_desc.BTCTRL.bit.SRCINC   = 1; // The Source Address Increment is enabled (Inc by 1)
+    dmac_desc.BTCTRL.bit.BEATSIZE = 0; // 8-bit bus transfer
+    dmac_desc.BTCTRL.bit.BLOCKACT = 0; // Channel will be disabled if it is the last block transfer in the transaction
+    dmac_desc.BTCTRL.bit.EVOSEL   = 0; // Event generation disabled
+    dmac_desc.BTCTRL.bit.VALID    = 1; // Set dmac valid
 }
 
 void i2c_led_prepare_send_dma(uint8_t *data, uint8_t len) {
@@ -397,9 +397,9 @@ void i2c_led_prepare_send_dma(uint8_t *data, uint8_t len) {
 }
 
 void i2c_led_begin_dma(uint8_t drvid) {
-    DMAC->Channel[0].CHCTRLA.bit.ENABLE = 1;  // Enable the channel
+    DMAC->Channel[0].CHCTRLA.bit.ENABLE = 1; // Enable the channel
 
-    SERCOM1->I2CM.ADDR.reg = (dmac_desc.BTCNT.reg << 16) | 0x2000 | issidrv[drvid].addr;  // Begin transfer
+    SERCOM1->I2CM.ADDR.reg = (dmac_desc.BTCNT.reg << 16) | 0x2000 | issidrv[drvid].addr; // Begin transfer
 }
 
 void i2c_led_send_CRWL_dma(uint8_t drvid) {
@@ -429,7 +429,7 @@ void i2c_led_send_GCR_dma(uint8_t drvid) {
 void i2c_led_send_pwm_dma(uint8_t drvid) {
     // Note: This copies the CURRENT pwm buffer, which may be getting modified
     memcpy(dma_sendbuf, issidrv[drvid].pwm, ISSI3733_PG1_BYTES);
-    *dma_sendbuf = 0;  // Force start location offset to zero
+    *dma_sendbuf = 0; // Force start location offset to zero
     i2c_led_prepare_send_dma(dma_sendbuf, ISSI3733_PG1_BYTES);
 
     i2c_led_begin_dma(drvid);
@@ -438,7 +438,7 @@ void i2c_led_send_pwm_dma(uint8_t drvid) {
 void i2c_led_send_onoff_dma(uint8_t drvid) {
     // Note: This copies the CURRENT onoff buffer, which may be getting modified
     memcpy(dma_sendbuf, issidrv[drvid].onoff, ISSI3733_PG0_BYTES);
-    *dma_sendbuf = 0;  // Force start location offset to zero
+    *dma_sendbuf = 0; // Force start location offset to zero
     i2c_led_prepare_send_dma(dma_sendbuf, ISSI3733_PG0_BYTES);
 
     i2c_led_begin_dma(drvid);
@@ -452,12 +452,16 @@ void i2c_led_q_init(void) {
     i2c_led_q_full    = 0;
 }
 
-uint8_t i2c_led_q_isempty(void) { return i2c_led_q_s == i2c_led_q_e; }
+uint8_t i2c_led_q_isempty(void) {
+    return i2c_led_q_s == i2c_led_q_e;
+}
 
-uint8_t i2c_led_q_size(void) { return (i2c_led_q_e - i2c_led_q_s) % I2C_Q_SIZE; }
+uint8_t i2c_led_q_size(void) {
+    return (i2c_led_q_e - i2c_led_q_s) % I2C_Q_SIZE;
+}
 
 uint8_t i2c_led_q_available(void) {
-    return I2C_Q_SIZE - i2c_led_q_size() - 1;  // Never allow end to meet start
+    return I2C_Q_SIZE - i2c_led_q_size() - 1; // Never allow end to meet start
 }
 
 void i2c_led_q_add(uint8_t cmd) {
@@ -466,11 +470,11 @@ void i2c_led_q_add(uint8_t cmd) {
     // Assign command
     i2c_led_q[i2c_led_q_e] = cmd;
 
-    i2c_led_q_e = (i2c_led_q_e + 1) % I2C_Q_SIZE;  // Move end up one or wrap
+    i2c_led_q_e = (i2c_led_q_e + 1) % I2C_Q_SIZE; // Move end up one or wrap
 }
 
 void i2c_led_q_s_advance(void) {
-    i2c_led_q_s = (i2c_led_q_s + 1) % I2C_Q_SIZE;  // Move start up one or wrap
+    i2c_led_q_s = (i2c_led_q_s + 1) % I2C_Q_SIZE; // Move start up one or wrap
 }
 
 // Always request room before adding commands
@@ -480,7 +484,7 @@ uint8_t i2c_led_q_request_room(uint8_t request_size) {
     if (request_size > i2c_led_q_available()) {
         i2c_led_q_full++;
 
-        if (i2c_led_q_full >= 100)  // Give the queue a chance to clear up
+        if (i2c_led_q_full >= 100) // Give the queue a chance to clear up
         {
             DBG_LED_ON;
             I2C_DMAC_LED_Init();
@@ -554,7 +558,7 @@ uint8_t i2c_led_q_run(void) {
 #    endif
         }
 
-        i2c_led_q_s_advance();  // Advance last run command or if the command byte was not serviced
+        i2c_led_q_s_advance(); // Advance last run command or if the command byte was not serviced
 
 #    if I2C_LED_USE_DMA != 1
     }
@@ -583,4 +587,4 @@ i2c_status_t i2c_transmit(uint8_t address, const uint8_t *data, uint16_t length,
     return ret ? I2C_STATUS_SUCCESS : I2C_STATUS_ERROR;
 }
 
-#endif  // !defined(MD_BOOTLOADER) && defined(RGB_MATRIX_ENABLE)
+#endif // !defined(MD_BOOTLOADER) && defined(RGB_MATRIX_ENABLE)
diff --git a/tmk_core/protocol/arm_atsam/i2c_master.h b/tmk_core/protocol/arm_atsam/i2c_master.h
index e11235d447..5459923de4 100644
--- a/tmk_core/protocol/arm_atsam/i2c_master.h
+++ b/tmk_core/protocol/arm_atsam/i2c_master.h
@@ -95,7 +95,7 @@ void    i2c1_init(void);
 uint8_t i2c1_transmit(uint8_t address, uint8_t *data, uint16_t length, uint16_t timeout);
 void    i2c1_stop(void);
 
-#endif  // MD_BOOTLOADER
+#endif // MD_BOOTLOADER
 
 void    i2c0_init(void);
 uint8_t i2c0_transmit(uint8_t address, uint8_t *data, uint16_t length, uint16_t timeout);
@@ -110,4 +110,4 @@ typedef int16_t i2c_status_t;
 void         i2c_init(void);
 i2c_status_t i2c_transmit(uint8_t address, const uint8_t *data, uint16_t length, uint16_t timeout);
 
-#endif  // _I2C_MASTER_H_
+#endif // _I2C_MASTER_H_
diff --git a/tmk_core/protocol/arm_atsam/issi3733_driver.h b/tmk_core/protocol/arm_atsam/issi3733_driver.h
index bd29fe76b6..c01f147e13 100644
--- a/tmk_core/protocol/arm_atsam/issi3733_driver.h
+++ b/tmk_core/protocol/arm_atsam/issi3733_driver.h
@@ -20,29 +20,29 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // ISII3733 Registers
 
-#define ISSI3733_CMDR 0xFD  // Command Register (Write Only)
+#define ISSI3733_CMDR 0xFD // Command Register (Write Only)
 
-#define ISSI3733_CMDRWL 0xFE                    // Command Register Write Lock (Read/Write)
-#define ISSI3733_CMDRWL_WRITE_DISABLE 0x00      // Lock register
-#define ISSI3733_CMDRWL_WRITE_ENABLE_ONCE 0xC5  // Enable one write to register then reset to locked
+#define ISSI3733_CMDRWL 0xFE                   // Command Register Write Lock (Read/Write)
+#define ISSI3733_CMDRWL_WRITE_DISABLE 0x00     // Lock register
+#define ISSI3733_CMDRWL_WRITE_ENABLE_ONCE 0xC5 // Enable one write to register then reset to locked
 
-#define ISSI3733_IMR 0xF0         // Interrupt Mask Register (Write Only)
-#define ISSI3733_IMR_IAC_ON 0x08  // Auto Clear Interrupt Bit - Interrupt auto clear when INTB stay low exceeds 8ms
-#define ISSI3733_IMR_IAB_ON 0x04  // Auto Breath Interrupt Bit - Enable auto breath loop finish interrupt
-#define ISSI3733_IMR_IS_ON 0x02   // Dot Short Interrupt Bit - Enable dot short interrupt
-#define ISSI3733_IMR_IO_ON 0x01   // Dot Open Interrupt Bit - Enable dot open interrupt
+#define ISSI3733_IMR 0xF0        // Interrupt Mask Register (Write Only)
+#define ISSI3733_IMR_IAC_ON 0x08 // Auto Clear Interrupt Bit - Interrupt auto clear when INTB stay low exceeds 8ms
+#define ISSI3733_IMR_IAB_ON 0x04 // Auto Breath Interrupt Bit - Enable auto breath loop finish interrupt
+#define ISSI3733_IMR_IS_ON 0x02  // Dot Short Interrupt Bit - Enable dot short interrupt
+#define ISSI3733_IMR_IO_ON 0x01  // Dot Open Interrupt Bit - Enable dot open interrupt
 
-#define ISSI3733_ISR 0xF1              // Interrupt Status Register (Read Only)
-#define ISSI3733_ISR_ABM3_FINISH 0x10  // Auto Breath Mode 3 Finish Bit - ABM3 finished
-#define ISSI3733_ISR_ABM2_FINISH 0x08  // Auto Breath Mode 2 Finish Bit - ABM2 finished
-#define ISSI3733_ISR_ABM1_FINISH 0x04  // Auto Breath Mode 1 Finish Bit - ABM1 finished
-#define ISSI3733_ISR_SB 0x02           // Short Bit - Shorted
-#define ISSI3733_ISR_OB 0x01           // Open Bit - Opened
+#define ISSI3733_ISR 0xF1             // Interrupt Status Register (Read Only)
+#define ISSI3733_ISR_ABM3_FINISH 0x10 // Auto Breath Mode 3 Finish Bit - ABM3 finished
+#define ISSI3733_ISR_ABM2_FINISH 0x08 // Auto Breath Mode 2 Finish Bit - ABM2 finished
+#define ISSI3733_ISR_ABM1_FINISH 0x04 // Auto Breath Mode 1 Finish Bit - ABM1 finished
+#define ISSI3733_ISR_SB 0x02          // Short Bit - Shorted
+#define ISSI3733_ISR_OB 0x01          // Open Bit - Opened
 
-#define ISSI3733_PG0 0x00  // LED Control Register
-#define ISSI3733_PG1 0x01  // PWM Register
-#define ISSI3733_PG2 0x02  // Auto Breath Mode Register
-#define ISSI3733_PG3 0x03  // Function Register
+#define ISSI3733_PG0 0x00 // LED Control Register
+#define ISSI3733_PG1 0x01 // PWM Register
+#define ISSI3733_PG2 0x02 // Auto Breath Mode Register
+#define ISSI3733_PG3 0x03 // Function Register
 
 #define ISSI3733_PG_ONOFF ISSI3733_PG0
 #define ISSI3733_PG_OR ISSI3733_PG0
@@ -51,88 +51,88 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ISSI3733_PG_ABM ISSI3733_PG2
 #define ISSI3733_PG_FN ISSI3733_PG3
 
-#define ISSI3733_CR 0x00  // Configuration Register
+#define ISSI3733_CR 0x00 // Configuration Register
 
 // PG3: Configuration Register: Synchronize Configuration
-#define ISSI3733_CR_SYNC_MASTER 0x40    // Master
-#define ISSI3733_CR_SYNC_SLAVE 0x80     // Slave
-#define ISSI3733_CR_SYNC_HIGH_IMP 0xC0  // High Impedance
+#define ISSI3733_CR_SYNC_MASTER 0x40   // Master
+#define ISSI3733_CR_SYNC_SLAVE 0x80    // Slave
+#define ISSI3733_CR_SYNC_HIGH_IMP 0xC0 // High Impedance
 
 // PG3: Configuration Register: Open/Short Detection Enable Bit
 //#define ISSI3733_CR_OSD_DISABLE 0x00          //Disable open/short detection
-#define ISSI3733_CR_OSD_ENABLE 0x04  // Enable open/short detection
+#define ISSI3733_CR_OSD_ENABLE 0x04 // Enable open/short detection
 
 // PG3: Configuration Register: Auto Breath Enable
 //#define ISSI3733_CR_B_EN_PWM 0x00             //PWM Mode Enable
-#define ISSI3733_CR_B_EN_AUTO 0x02  // Auto Breath Mode Enable
+#define ISSI3733_CR_B_EN_AUTO 0x02 // Auto Breath Mode Enable
 
 // PG3: Configuration Register: Software Shutdown Control
 //#define ISSI3733_CR_SSD_SHUTDOWN 0x00         //Software shutdown
-#define ISSI3733_CR_SSD_NORMAL 0x01  // Normal operation
+#define ISSI3733_CR_SSD_NORMAL 0x01 // Normal operation
 
-#define ISSI3733_GCCR 0x01  // Global Current Control Register
+#define ISSI3733_GCCR 0x01 // Global Current Control Register
 
 // 1 Byte, Iout = (GCC / 256) * (840 / Rext)
 // TODO: Give user define for Rext
 
 // PG3: Auto Breath Control Register 1
-#define ISSI3733_ABCR1_ABM1 0x02  // Auto Breath Control Register 1 of ABM-1
-#define ISSI3733_ABCR1_ABM2 0x06  // Auto Breath Control Register 1 of ABM-2
-#define ISSI3733_ABCR1_ABM3 0x0A  // Auto Breath Control Register 1 of ABM-3
+#define ISSI3733_ABCR1_ABM1 0x02 // Auto Breath Control Register 1 of ABM-1
+#define ISSI3733_ABCR1_ABM2 0x06 // Auto Breath Control Register 1 of ABM-2
+#define ISSI3733_ABCR1_ABM3 0x0A // Auto Breath Control Register 1 of ABM-3
 
 // Rise time
-#define ISSI3733_ABCR1_T1_0021 0x00  // 0.21s
-#define ISSI3733_ABCR1_T1_0042 0x20  // 0.42s
-#define ISSI3733_ABCR1_T1_0084 0x40  // 0.84s
-#define ISSI3733_ABCR1_T1_0168 0x60  // 1.68s
-#define ISSI3733_ABCR1_T1_0336 0x80  // 3.36s
-#define ISSI3733_ABCR1_T1_0672 0xA0  // 6.72s
-#define ISSI3733_ABCR1_T1_1344 0xC0  // 13.44s
-#define ISSI3733_ABCR1_T1_2688 0xE0  // 26.88s
+#define ISSI3733_ABCR1_T1_0021 0x00 // 0.21s
+#define ISSI3733_ABCR1_T1_0042 0x20 // 0.42s
+#define ISSI3733_ABCR1_T1_0084 0x40 // 0.84s
+#define ISSI3733_ABCR1_T1_0168 0x60 // 1.68s
+#define ISSI3733_ABCR1_T1_0336 0x80 // 3.36s
+#define ISSI3733_ABCR1_T1_0672 0xA0 // 6.72s
+#define ISSI3733_ABCR1_T1_1344 0xC0 // 13.44s
+#define ISSI3733_ABCR1_T1_2688 0xE0 // 26.88s
 
 // Max value time
-#define ISSI3733_ABCR1_T2_0000 0x00  // 0s
-#define ISSI3733_ABCR1_T2_0021 0x02  // 0.21s
-#define ISSI3733_ABCR1_T2_0042 0x04  // 0.42s
-#define ISSI3733_ABCR1_T2_0084 0x06  // 0.84s
-#define ISSI3733_ABCR1_T2_0168 0x08  // 1.68s
-#define ISSI3733_ABCR1_T2_0336 0x0A  // 3.36s
-#define ISSI3733_ABCR1_T2_0672 0x0C  // 6.72s
-#define ISSI3733_ABCR1_T2_1344 0x0E  // 13.44s
-#define ISSI3733_ABCR1_T2_2688 0x10  // 26.88s
+#define ISSI3733_ABCR1_T2_0000 0x00 // 0s
+#define ISSI3733_ABCR1_T2_0021 0x02 // 0.21s
+#define ISSI3733_ABCR1_T2_0042 0x04 // 0.42s
+#define ISSI3733_ABCR1_T2_0084 0x06 // 0.84s
+#define ISSI3733_ABCR1_T2_0168 0x08 // 1.68s
+#define ISSI3733_ABCR1_T2_0336 0x0A // 3.36s
+#define ISSI3733_ABCR1_T2_0672 0x0C // 6.72s
+#define ISSI3733_ABCR1_T2_1344 0x0E // 13.44s
+#define ISSI3733_ABCR1_T2_2688 0x10 // 26.88s
 
 // PG3: Auto Breath Control Register 2
-#define ISSI3733_ABCR2_ABM1 0x03  // Auto Breath Control Register 2 of ABM-1
-#define ISSI3733_ABCR2_ABM2 0x07  // Auto Breath Control Register 2 of ABM-2
-#define ISSI3733_ABCR2_ABM3 0x0B  // Auto Breath Control Register 2 of ABM-3
+#define ISSI3733_ABCR2_ABM1 0x03 // Auto Breath Control Register 2 of ABM-1
+#define ISSI3733_ABCR2_ABM2 0x07 // Auto Breath Control Register 2 of ABM-2
+#define ISSI3733_ABCR2_ABM3 0x0B // Auto Breath Control Register 2 of ABM-3
 
 // Fall time
-#define ISSI3733_ABCR2_T3_0021 0x00  // 0.21s
-#define ISSI3733_ABCR2_T3_0042 0x20  // 0.42s
-#define ISSI3733_ABCR2_T3_0084 0x40  // 0.84s
-#define ISSI3733_ABCR2_T3_0168 0x60  // 1.68s
-#define ISSI3733_ABCR2_T3_0336 0x80  // 3.36s
-#define ISSI3733_ABCR2_T3_0672 0xA0  // 6.72s
-#define ISSI3733_ABCR2_T3_1344 0xC0  // 13.44s
-#define ISSI3733_ABCR2_T3_2688 0xE0  // 26.88s
+#define ISSI3733_ABCR2_T3_0021 0x00 // 0.21s
+#define ISSI3733_ABCR2_T3_0042 0x20 // 0.42s
+#define ISSI3733_ABCR2_T3_0084 0x40 // 0.84s
+#define ISSI3733_ABCR2_T3_0168 0x60 // 1.68s
+#define ISSI3733_ABCR2_T3_0336 0x80 // 3.36s
+#define ISSI3733_ABCR2_T3_0672 0xA0 // 6.72s
+#define ISSI3733_ABCR2_T3_1344 0xC0 // 13.44s
+#define ISSI3733_ABCR2_T3_2688 0xE0 // 26.88s
 
 // Min value time
-#define ISSI3733_ABCR2_T4_0000 0x00   // 0s
-#define ISSI3733_ABCR2_T4_0021 0x02   // 0.21s
-#define ISSI3733_ABCR2_T4_0042 0x04   // 0.42s
-#define ISSI3733_ABCR2_T4_0084 0x06   // 0.84s
-#define ISSI3733_ABCR2_T4_0168 0x08   // 1.68s
-#define ISSI3733_ABCR2_T4_0336 0x0A   // 3.36s
-#define ISSI3733_ABCR2_T4_0672 0x0C   // 6.72s
-#define ISSI3733_ABCR2_T4_1344 0x0E   // 13.44s
-#define ISSI3733_ABCR2_T4_2688 0x10   // 26.88s
-#define ISSI3733_ABCR2_T4_5376 0x12   // 53.76s
-#define ISSI3733_ABCR2_T4_10752 0x14  // 107.52s
+#define ISSI3733_ABCR2_T4_0000 0x00  // 0s
+#define ISSI3733_ABCR2_T4_0021 0x02  // 0.21s
+#define ISSI3733_ABCR2_T4_0042 0x04  // 0.42s
+#define ISSI3733_ABCR2_T4_0084 0x06  // 0.84s
+#define ISSI3733_ABCR2_T4_0168 0x08  // 1.68s
+#define ISSI3733_ABCR2_T4_0336 0x0A  // 3.36s
+#define ISSI3733_ABCR2_T4_0672 0x0C  // 6.72s
+#define ISSI3733_ABCR2_T4_1344 0x0E  // 13.44s
+#define ISSI3733_ABCR2_T4_2688 0x10  // 26.88s
+#define ISSI3733_ABCR2_T4_5376 0x12  // 53.76s
+#define ISSI3733_ABCR2_T4_10752 0x14 // 107.52s
 
 // PG3: Auto Breath Control Register 3
-#define ISSI3733_ABCR3_ABM1 0x04  // Auto Breath Control Register 3 of ABM-1
-#define ISSI3733_ABCR3_ABM2 0x08  // Auto Breath Control Register 3 of ABM-2
-#define ISSI3733_ABCR3_ABM3 0x0C  // Auto Breath Control Register 3 of ABM-3
+#define ISSI3733_ABCR3_ABM1 0x04 // Auto Breath Control Register 3 of ABM-1
+#define ISSI3733_ABCR3_ABM2 0x08 // Auto Breath Control Register 3 of ABM-2
+#define ISSI3733_ABCR3_ABM3 0x0C // Auto Breath Control Register 3 of ABM-3
 
 #define ISSI3733_ABCR3_LTA_LOOP_ENDLESS 0x00
 #define ISSI3733_ABCR3_LTA_LOOP_1 0x01
@@ -158,44 +158,44 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ISSI3733_ABCR3_LB_T4 0x30
 
 // Loop End
-#define ISSI3733_ABCR3_LE_T3 0x00  // End at Off state
-#define ISSI3733_ABCR3_LE_T1 0x40  // End at On State
+#define ISSI3733_ABCR3_LE_T3 0x00 // End at Off state
+#define ISSI3733_ABCR3_LE_T1 0x40 // End at On State
 
 // PG3: Auto Breath Control Register 4
-#define ISSI3733_ABCR4_ABM1 0x05  // Auto Breath Control Register 4 of ABM-1
-#define ISSI3733_ABCR4_ABM2 0x09  // Auto Breath Control Register 4 of ABM-2
-#define ISSI3733_ABCR4_ABM3 0x0D  // Auto Breath Control Register 4 of ABM-3
+#define ISSI3733_ABCR4_ABM1 0x05 // Auto Breath Control Register 4 of ABM-1
+#define ISSI3733_ABCR4_ABM2 0x09 // Auto Breath Control Register 4 of ABM-2
+#define ISSI3733_ABCR4_ABM3 0x0D // Auto Breath Control Register 4 of ABM-3
 
 #define ISSI3733_ABCR4_LTB_LOOP_ENDLESS 0x00
 // Or 8bit loop times
 
 // PG3: Time Update Register
 #define ISSI3733_TUR 0x0E
-#define ISSI3733_TUR_UPDATE 0x00  // Write to update 02h~0Dh time registers after configuring
+#define ISSI3733_TUR_UPDATE 0x00 // Write to update 02h~0Dh time registers after configuring
 
 // PG3: SWy Pull-Up Resistor Selection Register
 #define ISSI3733_SWYR_PUR 0x0F
-#define ISSI3733_SWYR_PUR_NONE 0x00   // No pull-up resistor
-#define ISSI3733_SWYR_PUR_500 0x01    // 0.5k Ohm
-#define ISSI3733_SWYR_PUR_1000 0x02   // 1.0k Ohm
-#define ISSI3733_SWYR_PUR_2000 0x03   // 2.0k Ohm
-#define ISSI3733_SWYR_PUR_4000 0x04   // 4.0k Ohm
-#define ISSI3733_SWYR_PUR_8000 0x05   // 8.0k Ohm
-#define ISSI3733_SWYR_PUR_16000 0x06  // 16k Ohm
-#define ISSI3733_SWYR_PUR_32000 0x07  // 32k Ohm
+#define ISSI3733_SWYR_PUR_NONE 0x00  // No pull-up resistor
+#define ISSI3733_SWYR_PUR_500 0x01   // 0.5k Ohm
+#define ISSI3733_SWYR_PUR_1000 0x02  // 1.0k Ohm
+#define ISSI3733_SWYR_PUR_2000 0x03  // 2.0k Ohm
+#define ISSI3733_SWYR_PUR_4000 0x04  // 4.0k Ohm
+#define ISSI3733_SWYR_PUR_8000 0x05  // 8.0k Ohm
+#define ISSI3733_SWYR_PUR_16000 0x06 // 16k Ohm
+#define ISSI3733_SWYR_PUR_32000 0x07 // 32k Ohm
 
 // PG3: CSx Pull-Down Resistor Selection Register
 #define ISSI3733_CSXR_PDR 0x10
-#define ISSI3733_CSXR_PDR_NONE 0x00   // No pull-down resistor
-#define ISSI3733_CSXR_PDR_500 0x01    // 0.5k Ohm
-#define ISSI3733_CSXR_PDR_1000 0x02   // 1.0k Ohm
-#define ISSI3733_CSXR_PDR_2000 0x03   // 2.0k Ohm
-#define ISSI3733_CSXR_PDR_4000 0x04   // 4.0k Ohm
-#define ISSI3733_CSXR_PDR_8000 0x05   // 8.0k Ohm
-#define ISSI3733_CSXR_PDR_16000 0x06  // 16k Ohm
-#define ISSI3733_CSXR_PDR_32000 0x07  // 32k Ohm
+#define ISSI3733_CSXR_PDR_NONE 0x00  // No pull-down resistor
+#define ISSI3733_CSXR_PDR_500 0x01   // 0.5k Ohm
+#define ISSI3733_CSXR_PDR_1000 0x02  // 1.0k Ohm
+#define ISSI3733_CSXR_PDR_2000 0x03  // 2.0k Ohm
+#define ISSI3733_CSXR_PDR_4000 0x04  // 4.0k Ohm
+#define ISSI3733_CSXR_PDR_8000 0x05  // 8.0k Ohm
+#define ISSI3733_CSXR_PDR_16000 0x06 // 16k Ohm
+#define ISSI3733_CSXR_PDR_32000 0x07 // 32k Ohm
 
 // PG3: Reset Register
-#define ISSI3733_RR 0x11  // Read to reset all registers to default values
+#define ISSI3733_RR 0x11 // Read to reset all registers to default values
 
-#endif  //_ISSI3733_DRIVER_H_
+#endif //_ISSI3733_DRIVER_H_
diff --git a/tmk_core/protocol/arm_atsam/main_arm_atsam.c b/tmk_core/protocol/arm_atsam/main_arm_atsam.c
index de12821a74..d092da8682 100644
--- a/tmk_core/protocol/arm_atsam/main_arm_atsam.c
+++ b/tmk_core/protocol/arm_atsam/main_arm_atsam.c
@@ -31,7 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // From keyboard's directory
 #include "config_led.h"
 
-uint8_t g_usb_state = USB_FSMSTATUS_FSMSTATE_OFF_Val;  // Saved USB state from hardware value to detect changes
+uint8_t g_usb_state = USB_FSMSTATUS_FSMSTATE_OFF_Val; // Saved USB state from hardware value to detect changes
 
 void    main_subtasks(void);
 uint8_t keyboard_leds(void);
@@ -42,7 +42,7 @@ void    send_consumer(uint16_t data);
 
 #ifdef DEFERRED_EXEC_ENABLE
 void deferred_exec_task(void);
-#endif  // DEFERRED_EXEC_ENABLE
+#endif // DEFERRED_EXEC_ENABLE
 
 host_driver_t arm_atsam_driver = {keyboard_leds, send_keyboard, send_mouse, send_system, send_consumer};
 
@@ -53,7 +53,7 @@ uint8_t keyboard_leds(void) {
     if (keymap_config.nkro)
         return udi_hid_nkro_report_set;
     else
-#endif  // NKRO_ENABLE
+#endif // NKRO_ENABLE
         return udi_hid_kbd_report_set;
 }
 
@@ -62,10 +62,10 @@ void send_keyboard(report_keyboard_t *report) {
 
 #ifdef NKRO_ENABLE
     if (!keymap_config.nkro) {
-#endif  // NKRO_ENABLE
+#endif // NKRO_ENABLE
         while (udi_hid_kbd_b_report_trans_ongoing) {
             main_subtasks();
-        }  // Run other tasks while waiting for USB to be free
+        } // Run other tasks while waiting for USB to be free
 
         irqflags = __get_PRIMASK();
         __disable_irq();
@@ -81,7 +81,7 @@ void send_keyboard(report_keyboard_t *report) {
     } else {
         while (udi_hid_nkro_b_report_trans_ongoing) {
             main_subtasks();
-        }  // Run other tasks while waiting for USB to be free
+        } // Run other tasks while waiting for USB to be free
 
         irqflags = __get_PRIMASK();
         __disable_irq();
@@ -94,7 +94,7 @@ void send_keyboard(report_keyboard_t *report) {
         __DMB();
         __set_PRIMASK(irqflags);
     }
-#endif  // NKRO_ENABLE
+#endif // NKRO_ENABLE
 }
 
 void send_mouse(report_mouse_t *report) {
@@ -111,7 +111,7 @@ void send_mouse(report_mouse_t *report) {
 
     __DMB();
     __set_PRIMASK(irqflags);
-#endif  // MOUSEKEY_ENABLE
+#endif // MOUSEKEY_ENABLE
 }
 
 #ifdef EXTRAKEY_ENABLE
@@ -130,18 +130,18 @@ void send_extra(uint8_t report_id, uint16_t data) {
     __DMB();
     __set_PRIMASK(irqflags);
 }
-#endif  // EXTRAKEY_ENABLE
+#endif // EXTRAKEY_ENABLE
 
 void send_system(uint16_t data) {
 #ifdef EXTRAKEY_ENABLE
     send_extra(REPORT_ID_SYSTEM, data);
-#endif  // EXTRAKEY_ENABLE
+#endif // EXTRAKEY_ENABLE
 }
 
 void send_consumer(uint16_t data) {
 #ifdef EXTRAKEY_ENABLE
     send_extra(REPORT_ID_CONSUMER, data);
-#endif  // EXTRAKEY_ENABLE
+#endif // EXTRAKEY_ENABLE
 }
 
 #ifdef CONSOLE_ENABLE
@@ -158,81 +158,81 @@ int8_t sendchar(uint8_t c) {
 
 void main_subtask_console_flush(void) {
     while (udi_hid_con_b_report_trans_ongoing) {
-    }  // Wait for any previous transfers to complete
+    } // Wait for any previous transfers to complete
 
     uint16_t result = console_printbuf_len;
     uint32_t irqflags;
-    char *   pconbuf  = console_printbuf;  // Pointer to start send from
-    int      send_out = CONSOLE_EPSIZE;    // Bytes to send per transfer
+    char *   pconbuf  = console_printbuf; // Pointer to start send from
+    int      send_out = CONSOLE_EPSIZE;   // Bytes to send per transfer
 
-    while (result > 0) {  // While not error and bytes remain
+    while (result > 0) { // While not error and bytes remain
         while (udi_hid_con_b_report_trans_ongoing) {
-        }  // Wait for any previous transfers to complete
+        } // Wait for any previous transfers to complete
 
         irqflags = __get_PRIMASK();
         __disable_irq();
         __DMB();
 
-        if (result < CONSOLE_EPSIZE) {                      // If remaining bytes are less than console epsize
-            memset(udi_hid_con_report, 0, CONSOLE_EPSIZE);  // Clear the buffer
-            send_out = result;                              // Send remaining size
+        if (result < CONSOLE_EPSIZE) {                     // If remaining bytes are less than console epsize
+            memset(udi_hid_con_report, 0, CONSOLE_EPSIZE); // Clear the buffer
+            send_out = result;                             // Send remaining size
         }
 
-        memcpy(udi_hid_con_report, pconbuf, send_out);  // Copy data into the send buffer
+        memcpy(udi_hid_con_report, pconbuf, send_out); // Copy data into the send buffer
 
-        udi_hid_con_b_report_valid = 1;  // Set report valid
-        udi_hid_con_send_report();       // Send report
+        udi_hid_con_b_report_valid = 1; // Set report valid
+        udi_hid_con_send_report();      // Send report
 
         __DMB();
         __set_PRIMASK(irqflags);
 
-        result -= send_out;   // Decrement result by bytes sent
-        pconbuf += send_out;  // Increment buffer point by bytes sent
+        result -= send_out;  // Decrement result by bytes sent
+        pconbuf += send_out; // Increment buffer point by bytes sent
     }
 
     console_printbuf_len = 0;
 }
 
-#endif  // CONSOLE_ENABLE
+#endif // CONSOLE_ENABLE
 
 void main_subtask_usb_state(void) {
-    static uint64_t fsmstate_on_delay = 0;                          // Delay timer to be sure USB is actually operating before bringing up hardware
-    uint8_t         fsmstate_now      = USB->DEVICE.FSMSTATUS.reg;  // Current state from hardware register
+    static uint64_t fsmstate_on_delay = 0;                         // Delay timer to be sure USB is actually operating before bringing up hardware
+    uint8_t         fsmstate_now      = USB->DEVICE.FSMSTATUS.reg; // Current state from hardware register
 
-    if (fsmstate_now == USB_FSMSTATUS_FSMSTATE_SUSPEND_Val)  // If USB SUSPENDED
+    if (fsmstate_now == USB_FSMSTATUS_FSMSTATE_SUSPEND_Val) // If USB SUSPENDED
     {
-        fsmstate_on_delay = 0;  // Clear ON delay timer
+        fsmstate_on_delay = 0; // Clear ON delay timer
 
-        if (g_usb_state != USB_FSMSTATUS_FSMSTATE_SUSPEND_Val)  // If previously not SUSPENDED
+        if (g_usb_state != USB_FSMSTATUS_FSMSTATE_SUSPEND_Val) // If previously not SUSPENDED
         {
-            suspend_power_down();        // Run suspend routine
-            g_usb_state = fsmstate_now;  // Save current USB state
+            suspend_power_down();       // Run suspend routine
+            g_usb_state = fsmstate_now; // Save current USB state
         }
-    } else if (fsmstate_now == USB_FSMSTATUS_FSMSTATE_SLEEP_Val)  // Else if USB SLEEPING
+    } else if (fsmstate_now == USB_FSMSTATUS_FSMSTATE_SLEEP_Val) // Else if USB SLEEPING
     {
-        fsmstate_on_delay = 0;  // Clear ON delay timer
+        fsmstate_on_delay = 0; // Clear ON delay timer
 
-        if (g_usb_state != USB_FSMSTATUS_FSMSTATE_SLEEP_Val)  // If previously not SLEEPING
+        if (g_usb_state != USB_FSMSTATUS_FSMSTATE_SLEEP_Val) // If previously not SLEEPING
         {
-            suspend_power_down();        // Run suspend routine
-            g_usb_state = fsmstate_now;  // Save current USB state
+            suspend_power_down();       // Run suspend routine
+            g_usb_state = fsmstate_now; // Save current USB state
         }
-    } else if (fsmstate_now == USB_FSMSTATUS_FSMSTATE_ON_Val)  // Else if USB ON
+    } else if (fsmstate_now == USB_FSMSTATUS_FSMSTATE_ON_Val) // Else if USB ON
     {
-        if (g_usb_state != USB_FSMSTATUS_FSMSTATE_ON_Val)  // If previously not ON
+        if (g_usb_state != USB_FSMSTATUS_FSMSTATE_ON_Val) // If previously not ON
         {
-            if (fsmstate_on_delay == 0)  // If ON delay timer is cleared
+            if (fsmstate_on_delay == 0) // If ON delay timer is cleared
             {
-                fsmstate_on_delay = timer_read64() + 250;   // Set ON delay timer
-            } else if (timer_read64() > fsmstate_on_delay)  // Else if ON delay timer is active and timed out
+                fsmstate_on_delay = timer_read64() + 250;  // Set ON delay timer
+            } else if (timer_read64() > fsmstate_on_delay) // Else if ON delay timer is active and timed out
             {
-                suspend_wakeup_init();       // Run wakeup routine
-                g_usb_state = fsmstate_now;  // Save current USB state
+                suspend_wakeup_init();      // Run wakeup routine
+                g_usb_state = fsmstate_now; // Save current USB state
             }
         }
-    } else  // Else if USB is in a state not being tracked
+    } else // Else if USB is in a state not being tracked
     {
-        fsmstate_on_delay = 0;  // Clear ON delay timer
+        fsmstate_on_delay = 0; // Clear ON delay timer
     }
 }
 
@@ -262,7 +262,9 @@ void main_subtask_usb_extra_device(void) {
 }
 
 #ifdef RAW_ENABLE
-void main_subtask_raw(void) { udi_hid_raw_receive_report(); }
+void main_subtask_raw(void) {
+    udi_hid_raw_receive_report();
+}
 #endif
 
 void main_subtasks(void) {
@@ -296,7 +298,7 @@ int main(void) {
 
 #ifdef RGB_MATRIX_ENABLE
     i2c1_init();
-#endif  // RGB_MATRIX_ENABLE
+#endif // RGB_MATRIX_ENABLE
 
     matrix_init();
 
@@ -325,8 +327,9 @@ int main(void) {
 
     i2c_led_q_init();
 
-    for (uint8_t drvid = 0; drvid < ISSI3733_DRIVER_COUNT; drvid++) I2C_LED_Q_ONOFF(drvid);  // Queue data
-#endif                                                                                       // RGB_MATRIX_ENABLE
+    for (uint8_t drvid = 0; drvid < ISSI3733_DRIVER_COUNT; drvid++)
+        I2C_LED_Q_ONOFF(drvid); // Queue data
+#endif                          // RGB_MATRIX_ENABLE
 
     keyboard_setup();
 
@@ -336,18 +339,18 @@ int main(void) {
 
 #ifdef CONSOLE_ENABLE
     uint64_t next_print = 0;
-#endif  // CONSOLE_ENABLE
+#endif // CONSOLE_ENABLE
 
     v_5v_avg = adc_get(ADC_5V);
 
     debug_code_disable();
 
     while (1) {
-        main_subtasks();  // Note these tasks will also be run while waiting for USB keyboard polling intervals
+        main_subtasks(); // Note these tasks will also be run while waiting for USB keyboard polling intervals
 
         if (g_usb_state == USB_FSMSTATUS_FSMSTATE_SUSPEND_Val || g_usb_state == USB_FSMSTATUS_FSMSTATE_SLEEP_Val) {
             if (suspend_wakeup_condition()) {
-                udc_remotewakeup();  // Send remote wakeup signal
+                udc_remotewakeup(); // Send remote wakeup signal
                 wait_ms(50);
             }
 
@@ -362,12 +365,12 @@ int main(void) {
             // Add any debug information here that you want to see very often
             // dprintf("5v=%u 5vu=%u dlow=%u dhi=%u gca=%u gcd=%u\r\n", v_5v, v_5v_avg, v_5v_avg - V5_LOW, v_5v_avg - V5_HIGH, gcr_actual, gcr_desired);
         }
-#endif  // CONSOLE_ENABLE
+#endif // CONSOLE_ENABLE
 
 #ifdef DEFERRED_EXEC_ENABLE
         // Run deferred executions
         deferred_exec_task();
-#endif  // DEFERRED_EXEC_ENABLE
+#endif // DEFERRED_EXEC_ENABLE
 
         // Run housekeeping
         housekeeping_task();
diff --git a/tmk_core/protocol/arm_atsam/main_arm_atsam.h b/tmk_core/protocol/arm_atsam/main_arm_atsam.h
index 5b088f0e20..78205e2e1b 100644
--- a/tmk_core/protocol/arm_atsam/main_arm_atsam.h
+++ b/tmk_core/protocol/arm_atsam/main_arm_atsam.h
@@ -20,4 +20,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 uint8_t keyboard_leds(void);
 
-#endif  //_MAIN_ARM_ATSAM_H_
+#endif //_MAIN_ARM_ATSAM_H_
diff --git a/tmk_core/protocol/arm_atsam/md_rgb_matrix.c b/tmk_core/protocol/arm_atsam/md_rgb_matrix.c
index 0741584439..84ce3ee24b 100644
--- a/tmk_core/protocol/arm_atsam/md_rgb_matrix.c
+++ b/tmk_core/protocol/arm_atsam/md_rgb_matrix.c
@@ -53,16 +53,20 @@ void eeconfig_update_md_led_default(void) {
     eeconfig_flush_md_led(true);
 }
 
-void md_led_changed(void) { eeconfig_flag_md_led(true); }
+void md_led_changed(void) {
+    eeconfig_flag_md_led(true);
+}
 
 // todo: use real task rather than this bodge
-void housekeeping_task_kb(void) { eeconfig_flush_md_led_task(FLUSH_TIMEOUT); }
+void housekeeping_task_kb(void) {
+    eeconfig_flush_md_led_task(FLUSH_TIMEOUT);
+}
 
 __attribute__((weak)) led_instruction_t led_instructions[] = {{.end = 1}};
 static void                             md_rgb_matrix_config_override(int i);
 #    else
 uint8_t gcr_desired;
-#    endif  // USE_MASSDROP_CONFIGURATOR
+#    endif // USE_MASSDROP_CONFIGURATOR
 
 void SERCOM1_0_Handler(void) {
     if (SERCOM1->I2CM.INTFLAG.bit.ERROR) {
@@ -125,9 +129,9 @@ void gcr_compute(void) {
     if (v_5v < V5_CAT) {
         I2C3733_Control_Set(0);
         // CDC_print("USB: WARNING: 5V catastrophic level reached! Disabling LED drivers!\r\n"); //Blocking print is bad here!
-        v_5v_cat_hit = 20;  //~100ms recover
-        gcr_actual   = 0;   // Minimize GCR
-        usb_gcr_auto = 1;   // Force auto mode enabled
+        v_5v_cat_hit = 20; //~100ms recover
+        gcr_actual   = 0;  // Minimize GCR
+        usb_gcr_auto = 1;  // Force auto mode enabled
         return;
     } else if (v_5v_cat_hit > 1) {
         v_5v_cat_hit--;
@@ -157,24 +161,24 @@ void gcr_compute(void) {
         gcr_min_counter = 0;
     } else if (action == ACT_GCR_INC) {
         if (LED_GCR_STEP_AUTO > LED_GCR_MAX - gcr_actual)
-            gcr_actual = LED_GCR_MAX;  // Obey max and prevent wrapping
+            gcr_actual = LED_GCR_MAX; // Obey max and prevent wrapping
         else
             gcr_actual += LED_GCR_STEP_AUTO;
         gcr_min_counter = 0;
     } else if (action == ACT_GCR_DEC) {
-        if (LED_GCR_STEP_AUTO > gcr_actual)  // Prevent wrapping
+        if (LED_GCR_STEP_AUTO > gcr_actual) // Prevent wrapping
         {
             gcr_actual = 0;
             // At this point, power can no longer be cut from the LED drivers, so focus on cutting out extra port if active
-            if (usb_extra_state != USB_EXTRA_STATE_DISABLED_UNTIL_REPLUG)  // If not in a wait for replug state
+            if (usb_extra_state != USB_EXTRA_STATE_DISABLED_UNTIL_REPLUG) // If not in a wait for replug state
             {
-                if (usb_extra_state == USB_EXTRA_STATE_ENABLED)  // If extra usb is enabled
+                if (usb_extra_state == USB_EXTRA_STATE_ENABLED) // If extra usb is enabled
                 {
                     gcr_min_counter++;
-                    if (gcr_min_counter > 200)  // 5ms per check = 1s delay
+                    if (gcr_min_counter > 200) // 5ms per check = 1s delay
                     {
                         USB_ExtraSetState(USB_EXTRA_STATE_DISABLED_UNTIL_REPLUG);
-                        usb_extra_manual = 0;  // Force disable manual mode of extra port
+                        usb_extra_manual = 0; // Force disable manual mode of extra port
                         if (usb_extra_manual)
                             CDC_print("USB: Disabling extra port until replug and manual mode toggle!\r\n");
                         else
@@ -275,11 +279,11 @@ static void flush(void) {
 #    ifdef USE_MASSDROP_CONFIGURATOR
     if (!led_enabled) {
         return;
-    }  // Prevent calculations and I2C traffic if LED drivers are not enabled
+    } // Prevent calculations and I2C traffic if LED drivers are not enabled
 #    else
     if (!sr_exp_data.bit.SDB_N) {
         return;
-    }  // Prevent calculations and I2C traffic if LED drivers are not enabled
+    } // Prevent calculations and I2C traffic if LED drivers are not enabled
 #    endif
 
     // Wait for previous transfer to complete
@@ -319,17 +323,19 @@ static void flush(void) {
     pomod = (uint32_t)pomod % 10000;
     pomod /= 100.0f;
 
-#    endif  // USE_MASSDROP_CONFIGURATOR
+#    endif // USE_MASSDROP_CONFIGURATOR
 
     uint8_t drvid;
 
     // NOTE: GCR does not need to be timed with LED processing, but there is really no harm
     if (gcr_actual != gcr_actual_last) {
-        for (drvid = 0; drvid < ISSI3733_DRIVER_COUNT; drvid++) I2C_LED_Q_GCR(drvid);  // Queue data
+        for (drvid = 0; drvid < ISSI3733_DRIVER_COUNT; drvid++)
+            I2C_LED_Q_GCR(drvid); // Queue data
         gcr_actual_last = gcr_actual;
     }
 
-    for (drvid = 0; drvid < ISSI3733_DRIVER_COUNT; drvid++) I2C_LED_Q_PWM(drvid);  // Queue data
+    for (drvid = 0; drvid < ISSI3733_DRIVER_COUNT; drvid++)
+        I2C_LED_Q_PWM(drvid); // Queue data
 
     i2c_led_q_run();
 }
@@ -341,19 +347,19 @@ void md_rgb_matrix_indicators_advanced(uint8_t led_min, uint8_t led_max) {
             if (
 #    if USB_LED_NUM_LOCK_SCANCODE != 255
                 (led_map[i].scan == USB_LED_NUM_LOCK_SCANCODE && (kbled & (1 << USB_LED_NUM_LOCK))) ||
-#    endif  // NUM LOCK
+#    endif // NUM LOCK
 #    if USB_LED_CAPS_LOCK_SCANCODE != 255
                 (led_map[i].scan == USB_LED_CAPS_LOCK_SCANCODE && (kbled & (1 << USB_LED_CAPS_LOCK))) ||
-#    endif  // CAPS LOCK
+#    endif // CAPS LOCK
 #    if USB_LED_SCROLL_LOCK_SCANCODE != 255
                 (led_map[i].scan == USB_LED_SCROLL_LOCK_SCANCODE && (kbled & (1 << USB_LED_SCROLL_LOCK))) ||
-#    endif  // SCROLL LOCK
+#    endif // SCROLL LOCK
 #    if USB_LED_COMPOSE_SCANCODE != 255
                 (led_map[i].scan == USB_LED_COMPOSE_SCANCODE && (kbled & (1 << USB_LED_COMPOSE))) ||
-#    endif  // COMPOSE
+#    endif // COMPOSE
 #    if USB_LED_KANA_SCANCODE != 255
                 (led_map[i].scan == USB_LED_KANA_SCANCODE && (kbled & (1 << USB_LED_KANA))) ||
-#    endif  // KANA
+#    endif // KANA
                 (0)) {
                 if (rgb_matrix_get_flags() & LED_FLAG_INDICATOR) {
                     led_buffer[i].r = 255 - led_buffer[i].r;
@@ -378,7 +384,7 @@ static void led_run_pattern(led_setup_t* f, float* ro, float* go, float* bo, flo
     float po;
 
     while (f->end != 1) {
-        po = pos;  // Reset po for new frame
+        po = pos; // Reset po for new frame
 
         // Add in any moving effects
         if ((!led_animation_direction && f->ef & EF_SCR_R) || (led_animation_direction && (f->ef & EF_SCR_L))) {
@@ -413,17 +419,17 @@ static void led_run_pattern(led_setup_t* f, float* ro, float* go, float* bo, flo
 
         // Add in any color effects
         if (f->ef & EF_OVER) {
-            *ro = (po * (f->re - f->rs)) + f->rs;  // + 0.5;
-            *go = (po * (f->ge - f->gs)) + f->gs;  // + 0.5;
-            *bo = (po * (f->be - f->bs)) + f->bs;  // + 0.5;
+            *ro = (po * (f->re - f->rs)) + f->rs; // + 0.5;
+            *go = (po * (f->ge - f->gs)) + f->gs; // + 0.5;
+            *bo = (po * (f->be - f->bs)) + f->bs; // + 0.5;
         } else if (f->ef & EF_SUBTRACT) {
-            *ro -= (po * (f->re - f->rs)) + f->rs;  // + 0.5;
-            *go -= (po * (f->ge - f->gs)) + f->gs;  // + 0.5;
-            *bo -= (po * (f->be - f->bs)) + f->bs;  // + 0.5;
+            *ro -= (po * (f->re - f->rs)) + f->rs; // + 0.5;
+            *go -= (po * (f->ge - f->gs)) + f->gs; // + 0.5;
+            *bo -= (po * (f->be - f->bs)) + f->bs; // + 0.5;
         } else {
-            *ro += (po * (f->re - f->rs)) + f->rs;  // + 0.5;
-            *go += (po * (f->ge - f->gs)) + f->gs;  // + 0.5;
-            *bo += (po * (f->be - f->bs)) + f->bs;  // + 0.5;
+            *ro += (po * (f->re - f->rs)) + f->rs; // + 0.5;
+            *go += (po * (f->ge - f->gs)) + f->gs; // + 0.5;
+            *bo += (po * (f->be - f->bs)) + f->bs; // + 0.5;
         }
 
         f++;
@@ -471,10 +477,10 @@ static void md_rgb_matrix_config_override(int i) {
 
             // Check if this applies to current index
             if (led_cur_instruction->flags & LED_FLAG_MATCH_ID) {
-                uint8_t   modid    = i / 32;                             // Calculate which id# contains the led bit
-                uint32_t  modidbit = 1 << (i % 32);                      // Calculate the bit within the id#
-                uint32_t* bitfield = &led_cur_instruction->id0 + modid;  // Add modid as offset to id0 address. *bitfield is now idX of the led id
-                if (~(*bitfield) & modidbit) {                           // Check if led bit is not set in idX
+                uint8_t   modid    = i / 32;                            // Calculate which id# contains the led bit
+                uint32_t  modidbit = 1 << (i % 32);                     // Calculate the bit within the id#
+                uint32_t* bitfield = &led_cur_instruction->id0 + modid; // Add modid as offset to id0 address. *bitfield is now idX of the led id
+                if (~(*bitfield) & modidbit) {                          // Check if led bit is not set in idX
                     goto next_iter;
                 }
             }
@@ -538,5 +544,5 @@ static void md_rgb_matrix_config_override(int i) {
     led_buffer[i].b = (uint8_t)bo;
 }
 
-#    endif  // USE_MASSDROP_CONFIGURATOR
-#endif      // RGB_MATRIX_ENABLE
+#    endif // USE_MASSDROP_CONFIGURATOR
+#endif     // RGB_MATRIX_ENABLE
diff --git a/tmk_core/protocol/arm_atsam/md_rgb_matrix.h b/tmk_core/protocol/arm_atsam/md_rgb_matrix.h
index deea12b888..f27da028a0 100644
--- a/tmk_core/protocol/arm_atsam/md_rgb_matrix.h
+++ b/tmk_core/protocol/arm_atsam/md_rgb_matrix.h
@@ -31,10 +31,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ISSI3733_SW_COUNT 12
 
 #define ISSI3733_LED_RGB_COUNT ISSI3733_CS_COUNT *ISSI3733_SW_COUNT
-#define ISSI3733_PG0_BYTES ISSI3733_LED_RGB_COUNT / 8 + 1  //+1 for first byte being memory start offset for I2C transfer
-#define ISSI3733_PG1_BYTES ISSI3733_LED_RGB_COUNT + 1      //+1 for first byte being memory start offset for I2C transfer
-#define ISSI3733_PG2_BYTES ISSI3733_LED_RGB_COUNT + 1      //+1 for first byte being memory start offset for I2C transfer
-#define ISSI3733_PG3_BYTES 18 + 1                          //+1 for first byte being memory start offset for I2C transfer
+#define ISSI3733_PG0_BYTES ISSI3733_LED_RGB_COUNT / 8 + 1 //+1 for first byte being memory start offset for I2C transfer
+#define ISSI3733_PG1_BYTES ISSI3733_LED_RGB_COUNT + 1     //+1 for first byte being memory start offset for I2C transfer
+#define ISSI3733_PG2_BYTES ISSI3733_LED_RGB_COUNT + 1     //+1 for first byte being memory start offset for I2C transfer
+#define ISSI3733_PG3_BYTES 18 + 1                         //+1 for first byte being memory start offset for I2C transfer
 
 #define ISSI3733_PG_ONOFF_BYTES ISSI3733_PG0_BYTES
 #define ISSI3733_PG_OR_BYTES ISSI3733_PG0_BYTES
@@ -44,38 +44,38 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ISSI3733_PG_FN_BYTES ISSI3733_PG3_BYTES
 
 typedef struct issi3733_driver_s {
-    uint8_t addr;                            // Address of the driver according to wiring "ISSI3733: Table 1 Slave Address"
-    uint8_t onoff[ISSI3733_PG_ONOFF_BYTES];  // PG0 - LED Control Register - LED On/Off Register
-    uint8_t open[ISSI3733_PG_OR_BYTES];      // PG0 - LED Control Register - LED Open Register
-    uint8_t shrt[ISSI3733_PG_SR_BYTES];      // PG0 - LED Control Register - LED Short Register
-    uint8_t pwm[ISSI3733_PG_PWM_BYTES];      // PG1 - PWM Register
-    uint8_t abm[ISSI3733_PG_ABM_BYTES];      // PG2 - Auto Breath Mode Register
-    uint8_t conf[ISSI3733_PG_FN_BYTES];      // PG3 - Function Register
+    uint8_t addr;                           // Address of the driver according to wiring "ISSI3733: Table 1 Slave Address"
+    uint8_t onoff[ISSI3733_PG_ONOFF_BYTES]; // PG0 - LED Control Register - LED On/Off Register
+    uint8_t open[ISSI3733_PG_OR_BYTES];     // PG0 - LED Control Register - LED Open Register
+    uint8_t shrt[ISSI3733_PG_SR_BYTES];     // PG0 - LED Control Register - LED Short Register
+    uint8_t pwm[ISSI3733_PG_PWM_BYTES];     // PG1 - PWM Register
+    uint8_t abm[ISSI3733_PG_ABM_BYTES];     // PG2 - Auto Breath Mode Register
+    uint8_t conf[ISSI3733_PG_FN_BYTES];     // PG3 - Function Register
 } issi3733_driver_t;
 
 typedef struct issi3733_rgb_s {
-    uint8_t *r;  // Direct access into PWM data
-    uint8_t *g;  // Direct access into PWM data
-    uint8_t *b;  // Direct access into PWM data
+    uint8_t *r; // Direct access into PWM data
+    uint8_t *g; // Direct access into PWM data
+    uint8_t *b; // Direct access into PWM data
 } issi3733_rgb_t;
 
 typedef struct issi3733_rgb_adr_s {
-    uint8_t drv;  // Driver from given list
-    uint8_t cs;   // CS
-    uint8_t swr;  // SW Red
-    uint8_t swg;  // SW Green
-    uint8_t swb;  // SW Blue
+    uint8_t drv; // Driver from given list
+    uint8_t cs;  // CS
+    uint8_t swr; // SW Red
+    uint8_t swg; // SW Green
+    uint8_t swb; // SW Blue
 } issi3733_rgb_adr_t;
 
 typedef struct issi3733_led_s {
-    uint8_t            id;    // According to PCB ref
-    issi3733_rgb_t     rgb;   // PWM settings of R G B
-    issi3733_rgb_adr_t adr;   // Hardware addresses
-    float              x;     // Physical position X
-    float              y;     // Physical position Y
-    float              px;    // Physical position X in percent
-    float              py;    // Physical position Y in percent
-    uint8_t            scan;  // Key scan code from wiring (set 0xFF if no key)
+    uint8_t            id;   // According to PCB ref
+    issi3733_rgb_t     rgb;  // PWM settings of R G B
+    issi3733_rgb_adr_t adr;  // Hardware addresses
+    float              x;    // Physical position X
+    float              y;    // Physical position Y
+    float              px;   // Physical position X in percent
+    float              py;   // Physical position Y in percent
+    uint8_t            scan; // Key scan code from wiring (set 0xFF if no key)
 } issi3733_led_t;
 
 extern issi3733_driver_t issidrv[ISSI3733_DRIVER_COUNT];
@@ -92,44 +92,44 @@ void md_rgb_matrix_indicators_advanced(uint8_t led_min, uint8_t led_max);
 
 #ifdef USE_MASSDROP_CONFIGURATOR
 
-#    define EF_NONE 0x00000000      // No effect
-#    define EF_OVER 0x00000001      // Overwrite any previous color information with new
-#    define EF_SCR_L 0x00000002     // Scroll left
-#    define EF_SCR_R 0x00000004     // Scroll right
-#    define EF_SUBTRACT 0x00000008  // Subtract color values
+#    define EF_NONE 0x00000000     // No effect
+#    define EF_OVER 0x00000001     // Overwrite any previous color information with new
+#    define EF_SCR_L 0x00000002    // Scroll left
+#    define EF_SCR_R 0x00000004    // Scroll right
+#    define EF_SUBTRACT 0x00000008 // Subtract color values
 
 typedef struct led_setup_s {
-    float    hs;   // Band begin at percent
-    float    he;   // Band end at percent
-    uint8_t  rs;   // Red start value
-    uint8_t  re;   // Red end value
-    uint8_t  gs;   // Green start value
-    uint8_t  ge;   // Green end value
-    uint8_t  bs;   // Blue start value
-    uint8_t  be;   // Blue end value
-    uint32_t ef;   // Animation and color effects
-    uint8_t  end;  // Set to signal end of the setup
+    float    hs;  // Band begin at percent
+    float    he;  // Band end at percent
+    uint8_t  rs;  // Red start value
+    uint8_t  re;  // Red end value
+    uint8_t  gs;  // Green start value
+    uint8_t  ge;  // Green end value
+    uint8_t  bs;  // Blue start value
+    uint8_t  be;  // Blue end value
+    uint32_t ef;  // Animation and color effects
+    uint8_t  end; // Set to signal end of the setup
 } led_setup_t;
 
 extern const uint8_t led_setups_count;
 extern void *        led_setups[];
 
 // LED Extra Instructions
-#    define LED_FLAG_NULL 0x00                // Matching and coloring not used (default)
-#    define LED_FLAG_MATCH_ID 0x01            // Match on the ID of the LED (set id#'s to desired bit pattern, first LED is id 1)
-#    define LED_FLAG_MATCH_LAYER 0x02         // Match on the current active layer (set layer to desired match layer)
-#    define LED_FLAG_USE_RGB 0x10             // Use a specific RGB value (set r, g, b to desired output color values)
-#    define LED_FLAG_USE_PATTERN 0x20         // Use a specific pattern ID (set pattern_id to desired output pattern)
-#    define LED_FLAG_USE_ROTATE_PATTERN 0x40  // Use pattern the user has cycled to manually
+#    define LED_FLAG_NULL 0x00               // Matching and coloring not used (default)
+#    define LED_FLAG_MATCH_ID 0x01           // Match on the ID of the LED (set id#'s to desired bit pattern, first LED is id 1)
+#    define LED_FLAG_MATCH_LAYER 0x02        // Match on the current active layer (set layer to desired match layer)
+#    define LED_FLAG_USE_RGB 0x10            // Use a specific RGB value (set r, g, b to desired output color values)
+#    define LED_FLAG_USE_PATTERN 0x20        // Use a specific pattern ID (set pattern_id to desired output pattern)
+#    define LED_FLAG_USE_ROTATE_PATTERN 0x40 // Use pattern the user has cycled to manually
 
 typedef struct led_instruction_s {
-    uint16_t flags;  // Bitfield for LED instructions
-    uint32_t id0;    // Bitwise id, IDs 0-31
-    uint32_t id1;    // Bitwise id, IDs 32-63
-    uint32_t id2;    // Bitwise id, IDs 64-95
-    uint32_t id3;    // Bitwise id, IDs 96-127
-    uint32_t id4;    // Bitwise id, IDs 128-159
-    uint32_t id5;    // Bitwise id, IDs 160-191
+    uint16_t flags; // Bitfield for LED instructions
+    uint32_t id0;   // Bitwise id, IDs 0-31
+    uint32_t id1;   // Bitwise id, IDs 32-63
+    uint32_t id2;   // Bitwise id, IDs 64-95
+    uint32_t id3;   // Bitwise id, IDs 96-127
+    uint32_t id4;   // Bitwise id, IDs 128-159
+    uint32_t id5;   // Bitwise id, IDs 160-191
     uint8_t  layer;
     uint8_t  r;
     uint8_t  g;
@@ -141,7 +141,7 @@ typedef struct led_instruction_s {
 extern led_instruction_t led_instructions[];
 
 typedef struct led_config_s {
-    uint8_t ver;  // assumed to be zero on eeprom reset
+    uint8_t ver; // assumed to be zero on eeprom reset
 
     uint8_t desired_gcr;
     uint8_t animation_breathing;
@@ -178,27 +178,27 @@ void md_led_changed(void);
 #    define led_ratio_brightness md_led_config.ratio_brightness
 #    define led_edge_mode md_led_config.edge_mode
 
-#    define LED_MODE_NORMAL 0  // Must be 0
+#    define LED_MODE_NORMAL 0 // Must be 0
 #    define LED_MODE_KEYS_ONLY 1
 #    define LED_MODE_NON_KEYS_ONLY 2
 #    define LED_MODE_INDICATORS_ONLY 3
-#    define LED_MODE_MAX_INDEX LED_MODE_INDICATORS_ONLY  // Must be highest value
+#    define LED_MODE_MAX_INDEX LED_MODE_INDICATORS_ONLY // Must be highest value
 
-#    define LED_EDGE_MODE_ALL 0                        // All edge LEDs are active (Must be 0)
-#    define LED_EDGE_MODE_ALTERNATE 1                  // Alternate mode of edge LEDs are active (Intention is for 'only every other edge LED' to be active)
-#    define LED_EDGE_MODE_MAX LED_EDGE_MODE_ALTERNATE  // Must be the highest valued LED edge mode
+#    define LED_EDGE_MODE_ALL 0                       // All edge LEDs are active (Must be 0)
+#    define LED_EDGE_MODE_ALTERNATE 1                 // Alternate mode of edge LEDs are active (Intention is for 'only every other edge LED' to be active)
+#    define LED_EDGE_MODE_MAX LED_EDGE_MODE_ALTERNATE // Must be the highest valued LED edge mode
 
-#    define LED_EDGE_FULL_MODE 255  // LEDs configured with this scan code will always be on for edge lighting modes
-#    define LED_EDGE_ALT_MODE 254   // LEDs configured with this scan code will turn off in edge alternating mode
-#    define LED_EDGE_MIN_SCAN 254   // LEDs configured with scan code >= to this are assigned as edge LEDs
-#    define LED_INDICATOR_SCAN 253  // LEDs configured as dedicated indicators
+#    define LED_EDGE_FULL_MODE 255 // LEDs configured with this scan code will always be on for edge lighting modes
+#    define LED_EDGE_ALT_MODE 254  // LEDs configured with this scan code will turn off in edge alternating mode
+#    define LED_EDGE_MIN_SCAN 254  // LEDs configured with scan code >= to this are assigned as edge LEDs
+#    define LED_INDICATOR_SCAN 253 // LEDs configured as dedicated indicators
 
-#    define LED_IS_KEY(scan) (scan < LED_INDICATOR_SCAN)         // Return true if an LED's scan value indicates it is a key LED
-#    define LED_IS_EDGE(scan) (scan >= LED_EDGE_MIN_SCAN)        // Return true if an LED's scan value indicates an edge LED
-#    define LED_IS_EDGE_ALT(scan) (scan == LED_EDGE_ALT_MODE)    // Return true if an LED's scan value indicates an alternate edge mode LED
-#    define LED_IS_INDICATOR(scan) (scan == LED_INDICATOR_SCAN)  // Return true if an LED's scan value indicates it is a dedicated Indicator
+#    define LED_IS_KEY(scan) (scan < LED_INDICATOR_SCAN)        // Return true if an LED's scan value indicates it is a key LED
+#    define LED_IS_EDGE(scan) (scan >= LED_EDGE_MIN_SCAN)       // Return true if an LED's scan value indicates an edge LED
+#    define LED_IS_EDGE_ALT(scan) (scan == LED_EDGE_ALT_MODE)   // Return true if an LED's scan value indicates an alternate edge mode LED
+#    define LED_IS_INDICATOR(scan) (scan == LED_INDICATOR_SCAN) // Return true if an LED's scan value indicates it is a dedicated Indicator
 #else
 extern uint8_t gcr_desired;
-#endif  // USE_MASSDROP_CONFIGURATOR
+#endif // USE_MASSDROP_CONFIGURATOR
 
-#endif  //_LED_MATRIX_H_
+#endif //_LED_MATRIX_H_
diff --git a/tmk_core/protocol/arm_atsam/md_rgb_matrix_programs.c b/tmk_core/protocol/arm_atsam/md_rgb_matrix_programs.c
index 92b40b5b85..69b3ad574c 100644
--- a/tmk_core/protocol/arm_atsam/md_rgb_matrix_programs.c
+++ b/tmk_core/protocol/arm_atsam/md_rgb_matrix_programs.c
@@ -97,5 +97,5 @@ void *led_setups[] = {leds_rainbow_s, leds_rainbow_ns, leds_teal_salmon, leds_ye
 
 const uint8_t led_setups_count = sizeof(led_setups) / sizeof(led_setups[0]);
 
-#    endif  // USE_MASSDROP_CONFIGURATOR
-#endif      // RGB_MATRIX_ENABLE
\ No newline at end of file
+#    endif // USE_MASSDROP_CONFIGURATOR
+#endif     // RGB_MATRIX_ENABLE
\ No newline at end of file
diff --git a/tmk_core/protocol/arm_atsam/shift_register.c b/tmk_core/protocol/arm_atsam/shift_register.c
index 8d63af1b59..3adb682aa8 100644
--- a/tmk_core/protocol/arm_atsam/shift_register.c
+++ b/tmk_core/protocol/arm_atsam/shift_register.c
@@ -54,7 +54,9 @@ void shift_out_impl(const uint8_t *data, uint16_t length) {
 
 #else
 
-void shift_init_impl(void) { spi_init(); }
+void shift_init_impl(void) {
+    spi_init();
+}
 
 void shift_out_impl(const uint8_t *data, uint16_t length) {
     spi_start(SR_EXP_RCLK_PIN, true, 0, 0);
@@ -67,7 +69,9 @@ void shift_out_impl(const uint8_t *data, uint16_t length) {
 
 // ***************************************************************
 
-void shift_out(const uint8_t *data, uint16_t length) { shift_out_impl(data, length); }
+void shift_out(const uint8_t *data, uint16_t length) {
+    shift_out_impl(data, length);
+}
 
 void shift_enable(void) {
     setPinOutput(SR_EXP_OE_PIN);
@@ -90,8 +94,8 @@ sr_exp_t sr_exp_data;
 
 void SR_EXP_WriteData(void) {
     uint8_t data[2] = {
-        sr_exp_data.reg & 0xFF,         // Shift in bits 7-0
-        (sr_exp_data.reg >> 8) & 0xFF,  // Shift in bits 15-8
+        sr_exp_data.reg & 0xFF,        // Shift in bits 7-0
+        (sr_exp_data.reg >> 8) & 0xFF, // Shift in bits 15-8
     };
     shift_out(data, 2);
 }
diff --git a/tmk_core/protocol/arm_atsam/spi_master.c b/tmk_core/protocol/arm_atsam/spi_master.c
index 9781d45b1e..3be82fac1d 100644
--- a/tmk_core/protocol/arm_atsam/spi_master.c
+++ b/tmk_core/protocol/arm_atsam/spi_master.c
@@ -45,10 +45,10 @@ __attribute__((weak)) void spi_init(void) {
         CLK_set_spi_freq(CHAN_SERCOM_SPI, FREQ_SPI_DEFAULT);
 
         // Set up MCU SPI pins
-        PORT->Group[SAMD_PORT(SPI_DATAOUT_PIN)].PMUX[SAMD_PIN(SPI_DATAOUT_PIN) / 2].bit.SPI_DATAOUT_MUX_SEL = SPI_DATAOUT_MUX;  // MUX select for sercom
-        PORT->Group[SAMD_PORT(SPI_SCLK_PIN)].PMUX[SAMD_PIN(SPI_SCLK_PIN) / 2].bit.SPI_SCLK_MUX_SEL          = SPI_SCLK_MUX;     // MUX select for sercom
-        PORT->Group[SAMD_PORT(SPI_DATAOUT_PIN)].PINCFG[SAMD_PIN(SPI_DATAOUT_PIN)].bit.PMUXEN                = 1;                // MUX Enable
-        PORT->Group[SAMD_PORT(SPI_SCLK_PIN)].PINCFG[SAMD_PIN(SPI_SCLK_PIN)].bit.PMUXEN                      = 1;                // MUX Enable
+        PORT->Group[SAMD_PORT(SPI_DATAOUT_PIN)].PMUX[SAMD_PIN(SPI_DATAOUT_PIN) / 2].bit.SPI_DATAOUT_MUX_SEL = SPI_DATAOUT_MUX; // MUX select for sercom
+        PORT->Group[SAMD_PORT(SPI_SCLK_PIN)].PMUX[SAMD_PIN(SPI_SCLK_PIN) / 2].bit.SPI_SCLK_MUX_SEL          = SPI_SCLK_MUX;    // MUX select for sercom
+        PORT->Group[SAMD_PORT(SPI_DATAOUT_PIN)].PINCFG[SAMD_PIN(SPI_DATAOUT_PIN)].bit.PMUXEN                = 1;               // MUX Enable
+        PORT->Group[SAMD_PORT(SPI_SCLK_PIN)].PINCFG[SAMD_PIN(SPI_SCLK_PIN)].bit.PMUXEN                      = 1;               // MUX Enable
 
         DBGC(DC_SPI_INIT_COMPLETE);
     }
@@ -63,14 +63,14 @@ bool spi_start(pin_t csPin, bool lsbFirst, uint8_t mode, uint16_t divisor) {
     setPinOutput(currentSelectPin);
     writePinLow(currentSelectPin);
 
-    SPI_SERCOM->SPI.CTRLA.bit.DORD = lsbFirst;  // Data Order - LSB is transferred first
-    SPI_SERCOM->SPI.CTRLA.bit.CPOL = 1;         // Clock Polarity - SCK high when idle. Leading edge of cycle is falling. Trailing rising.
-    SPI_SERCOM->SPI.CTRLA.bit.CPHA = 1;         // Clock Phase - Leading Edge Falling, change, Trailing Edge - Rising, sample
-    SPI_SERCOM->SPI.CTRLA.bit.DIPO = 3;         // Data In Pinout - SERCOM PAD[3] is used as data input (Configure away from DOPO. Not using input.)
-    SPI_SERCOM->SPI.CTRLA.bit.DOPO = 0;         // Data Output PAD[0], Serial Clock PAD[1]
-    SPI_SERCOM->SPI.CTRLA.bit.MODE = 3;         // Operating Mode - Master operation
+    SPI_SERCOM->SPI.CTRLA.bit.DORD = lsbFirst; // Data Order - LSB is transferred first
+    SPI_SERCOM->SPI.CTRLA.bit.CPOL = 1;        // Clock Polarity - SCK high when idle. Leading edge of cycle is falling. Trailing rising.
+    SPI_SERCOM->SPI.CTRLA.bit.CPHA = 1;        // Clock Phase - Leading Edge Falling, change, Trailing Edge - Rising, sample
+    SPI_SERCOM->SPI.CTRLA.bit.DIPO = 3;        // Data In Pinout - SERCOM PAD[3] is used as data input (Configure away from DOPO. Not using input.)
+    SPI_SERCOM->SPI.CTRLA.bit.DOPO = 0;        // Data Output PAD[0], Serial Clock PAD[1]
+    SPI_SERCOM->SPI.CTRLA.bit.MODE = 3;        // Operating Mode - Master operation
 
-    SPI_SERCOM->SPI.CTRLA.bit.ENABLE = 1;  // Enable - Peripheral is enabled or being enabled
+    SPI_SERCOM->SPI.CTRLA.bit.ENABLE = 1; // Enable - Peripheral is enabled or being enabled
     while (SPI_SERCOM->SPI.SYNCBUSY.bit.ENABLE) {
         DBGC(DC_SPI_SYNC_ENABLING);
     }
diff --git a/tmk_core/protocol/arm_atsam/usb/compiler.h b/tmk_core/protocol/arm_atsam/usb/compiler.h
index 6ba2322340..517499f946 100644
--- a/tmk_core/protocol/arm_atsam/usb/compiler.h
+++ b/tmk_core/protocol/arm_atsam/usb/compiler.h
@@ -876,66 +876,66 @@ typedef struct {
 // kmod #define LOW       0
 // kmod #define HIGH      1
 
-typedef int8_t   S8;   //!< 8-bit signed integer.
-typedef uint8_t  U8;   //!< 8-bit unsigned integer.
-typedef int16_t  S16;  //!< 16-bit signed integer.
-typedef uint16_t U16;  //!< 16-bit unsigned integer.
-typedef int32_t  S32;  //!< 32-bit signed integer.
-typedef uint32_t U32;  //!< 32-bit unsigned integer.
-typedef int64_t  S64;  //!< 64-bit signed integer.
-typedef uint64_t U64;  //!< 64-bit unsigned integer.
-typedef float    F32;  //!< 32-bit floating-point number.
-typedef double   F64;  //!< 64-bit floating-point number.
+typedef int8_t   S8;  //!< 8-bit signed integer.
+typedef uint8_t  U8;  //!< 8-bit unsigned integer.
+typedef int16_t  S16; //!< 16-bit signed integer.
+typedef uint16_t U16; //!< 16-bit unsigned integer.
+typedef int32_t  S32; //!< 32-bit signed integer.
+typedef uint32_t U32; //!< 32-bit unsigned integer.
+typedef int64_t  S64; //!< 64-bit signed integer.
+typedef uint64_t U64; //!< 64-bit unsigned integer.
+typedef float    F32; //!< 32-bit floating-point number.
+typedef double   F64; //!< 64-bit floating-point number.
 
-#    define MSB(u16) (((U8 *)&(u16))[1])  //!< Most significant byte of \a u16.
-#    define LSB(u16) (((U8 *)&(u16))[0])  //!< Least significant byte of \a u16.
+#    define MSB(u16) (((U8 *)&(u16))[1]) //!< Most significant byte of \a u16.
+#    define LSB(u16) (((U8 *)&(u16))[0]) //!< Least significant byte of \a u16.
 
-#    define MSH(u32) (((U16 *)&(u32))[1])   //!< Most significant half-word of \a u32.
-#    define LSH(u32) (((U16 *)&(u32))[0])   //!< Least significant half-word of \a u32.
-#    define MSB0W(u32) (((U8 *)&(u32))[3])  //!< Most significant byte of 1st rank of \a u32.
-#    define MSB1W(u32) (((U8 *)&(u32))[2])  //!< Most significant byte of 2nd rank of \a u32.
-#    define MSB2W(u32) (((U8 *)&(u32))[1])  //!< Most significant byte of 3rd rank of \a u32.
-#    define MSB3W(u32) (((U8 *)&(u32))[0])  //!< Most significant byte of 4th rank of \a u32.
-#    define LSB3W(u32) MSB0W(u32)           //!< Least significant byte of 4th rank of \a u32.
-#    define LSB2W(u32) MSB1W(u32)           //!< Least significant byte of 3rd rank of \a u32.
-#    define LSB1W(u32) MSB2W(u32)           //!< Least significant byte of 2nd rank of \a u32.
-#    define LSB0W(u32) MSB3W(u32)           //!< Least significant byte of 1st rank of \a u32.
+#    define MSH(u32) (((U16 *)&(u32))[1])  //!< Most significant half-word of \a u32.
+#    define LSH(u32) (((U16 *)&(u32))[0])  //!< Least significant half-word of \a u32.
+#    define MSB0W(u32) (((U8 *)&(u32))[3]) //!< Most significant byte of 1st rank of \a u32.
+#    define MSB1W(u32) (((U8 *)&(u32))[2]) //!< Most significant byte of 2nd rank of \a u32.
+#    define MSB2W(u32) (((U8 *)&(u32))[1]) //!< Most significant byte of 3rd rank of \a u32.
+#    define MSB3W(u32) (((U8 *)&(u32))[0]) //!< Most significant byte of 4th rank of \a u32.
+#    define LSB3W(u32) MSB0W(u32)          //!< Least significant byte of 4th rank of \a u32.
+#    define LSB2W(u32) MSB1W(u32)          //!< Least significant byte of 3rd rank of \a u32.
+#    define LSB1W(u32) MSB2W(u32)          //!< Least significant byte of 2nd rank of \a u32.
+#    define LSB0W(u32) MSB3W(u32)          //!< Least significant byte of 1st rank of \a u32.
 
-#    define MSW(u64) (((U32 *)&(u64))[1])   //!< Most significant word of \a u64.
-#    define LSW(u64) (((U32 *)&(u64))[0])   //!< Least significant word of \a u64.
-#    define MSH0(u64) (((U16 *)&(u64))[3])  //!< Most significant half-word of 1st rank of \a u64.
-#    define MSH1(u64) (((U16 *)&(u64))[2])  //!< Most significant half-word of 2nd rank of \a u64.
-#    define MSH2(u64) (((U16 *)&(u64))[1])  //!< Most significant half-word of 3rd rank of \a u64.
-#    define MSH3(u64) (((U16 *)&(u64))[0])  //!< Most significant half-word of 4th rank of \a u64.
-#    define LSH3(u64) MSH0(u64)             //!< Least significant half-word of 4th rank of \a u64.
-#    define LSH2(u64) MSH1(u64)             //!< Least significant half-word of 3rd rank of \a u64.
-#    define LSH1(u64) MSH2(u64)             //!< Least significant half-word of 2nd rank of \a u64.
-#    define LSH0(u64) MSH3(u64)             //!< Least significant half-word of 1st rank of \a u64.
-#    define MSB0D(u64) (((U8 *)&(u64))[7])  //!< Most significant byte of 1st rank of \a u64.
-#    define MSB1D(u64) (((U8 *)&(u64))[6])  //!< Most significant byte of 2nd rank of \a u64.
-#    define MSB2D(u64) (((U8 *)&(u64))[5])  //!< Most significant byte of 3rd rank of \a u64.
-#    define MSB3D(u64) (((U8 *)&(u64))[4])  //!< Most significant byte of 4th rank of \a u64.
-#    define MSB4D(u64) (((U8 *)&(u64))[3])  //!< Most significant byte of 5th rank of \a u64.
-#    define MSB5D(u64) (((U8 *)&(u64))[2])  //!< Most significant byte of 6th rank of \a u64.
-#    define MSB6D(u64) (((U8 *)&(u64))[1])  //!< Most significant byte of 7th rank of \a u64.
-#    define MSB7D(u64) (((U8 *)&(u64))[0])  //!< Most significant byte of 8th rank of \a u64.
-#    define LSB7D(u64) MSB0D(u64)           //!< Least significant byte of 8th rank of \a u64.
-#    define LSB6D(u64) MSB1D(u64)           //!< Least significant byte of 7th rank of \a u64.
-#    define LSB5D(u64) MSB2D(u64)           //!< Least significant byte of 6th rank of \a u64.
-#    define LSB4D(u64) MSB3D(u64)           //!< Least significant byte of 5th rank of \a u64.
-#    define LSB3D(u64) MSB4D(u64)           //!< Least significant byte of 4th rank of \a u64.
-#    define LSB2D(u64) MSB5D(u64)           //!< Least significant byte of 3rd rank of \a u64.
-#    define LSB1D(u64) MSB6D(u64)           //!< Least significant byte of 2nd rank of \a u64.
-#    define LSB0D(u64) MSB7D(u64)           //!< Least significant byte of 1st rank of \a u64.
+#    define MSW(u64) (((U32 *)&(u64))[1])  //!< Most significant word of \a u64.
+#    define LSW(u64) (((U32 *)&(u64))[0])  //!< Least significant word of \a u64.
+#    define MSH0(u64) (((U16 *)&(u64))[3]) //!< Most significant half-word of 1st rank of \a u64.
+#    define MSH1(u64) (((U16 *)&(u64))[2]) //!< Most significant half-word of 2nd rank of \a u64.
+#    define MSH2(u64) (((U16 *)&(u64))[1]) //!< Most significant half-word of 3rd rank of \a u64.
+#    define MSH3(u64) (((U16 *)&(u64))[0]) //!< Most significant half-word of 4th rank of \a u64.
+#    define LSH3(u64) MSH0(u64)            //!< Least significant half-word of 4th rank of \a u64.
+#    define LSH2(u64) MSH1(u64)            //!< Least significant half-word of 3rd rank of \a u64.
+#    define LSH1(u64) MSH2(u64)            //!< Least significant half-word of 2nd rank of \a u64.
+#    define LSH0(u64) MSH3(u64)            //!< Least significant half-word of 1st rank of \a u64.
+#    define MSB0D(u64) (((U8 *)&(u64))[7]) //!< Most significant byte of 1st rank of \a u64.
+#    define MSB1D(u64) (((U8 *)&(u64))[6]) //!< Most significant byte of 2nd rank of \a u64.
+#    define MSB2D(u64) (((U8 *)&(u64))[5]) //!< Most significant byte of 3rd rank of \a u64.
+#    define MSB3D(u64) (((U8 *)&(u64))[4]) //!< Most significant byte of 4th rank of \a u64.
+#    define MSB4D(u64) (((U8 *)&(u64))[3]) //!< Most significant byte of 5th rank of \a u64.
+#    define MSB5D(u64) (((U8 *)&(u64))[2]) //!< Most significant byte of 6th rank of \a u64.
+#    define MSB6D(u64) (((U8 *)&(u64))[1]) //!< Most significant byte of 7th rank of \a u64.
+#    define MSB7D(u64) (((U8 *)&(u64))[0]) //!< Most significant byte of 8th rank of \a u64.
+#    define LSB7D(u64) MSB0D(u64)          //!< Least significant byte of 8th rank of \a u64.
+#    define LSB6D(u64) MSB1D(u64)          //!< Least significant byte of 7th rank of \a u64.
+#    define LSB5D(u64) MSB2D(u64)          //!< Least significant byte of 6th rank of \a u64.
+#    define LSB4D(u64) MSB3D(u64)          //!< Least significant byte of 5th rank of \a u64.
+#    define LSB3D(u64) MSB4D(u64)          //!< Least significant byte of 4th rank of \a u64.
+#    define LSB2D(u64) MSB5D(u64)          //!< Least significant byte of 3rd rank of \a u64.
+#    define LSB1D(u64) MSB6D(u64)          //!< Least significant byte of 2nd rank of \a u64.
+#    define LSB0D(u64) MSB7D(u64)          //!< Least significant byte of 1st rank of \a u64.
 
-#    define LSB0(u32) LSB0W(u32)  //!< Least significant byte of 1st rank of \a u32.
-#    define LSB1(u32) LSB1W(u32)  //!< Least significant byte of 2nd rank of \a u32.
-#    define LSB2(u32) LSB2W(u32)  //!< Least significant byte of 3rd rank of \a u32.
-#    define LSB3(u32) LSB3W(u32)  //!< Least significant byte of 4th rank of \a u32.
-#    define MSB3(u32) MSB3W(u32)  //!< Most significant byte of 4th rank of \a u32.
-#    define MSB2(u32) MSB2W(u32)  //!< Most significant byte of 3rd rank of \a u32.
-#    define MSB1(u32) MSB1W(u32)  //!< Most significant byte of 2nd rank of \a u32.
-#    define MSB0(u32) MSB0W(u32)  //!< Most significant byte of 1st rank of \a u32.
+#    define LSB0(u32) LSB0W(u32) //!< Least significant byte of 1st rank of \a u32.
+#    define LSB1(u32) LSB1W(u32) //!< Least significant byte of 2nd rank of \a u32.
+#    define LSB2(u32) LSB2W(u32) //!< Least significant byte of 3rd rank of \a u32.
+#    define LSB3(u32) LSB3W(u32) //!< Least significant byte of 4th rank of \a u32.
+#    define MSB3(u32) MSB3W(u32) //!< Most significant byte of 4th rank of \a u32.
+#    define MSB2(u32) MSB2W(u32) //!< Most significant byte of 3rd rank of \a u32.
+#    define MSB1(u32) MSB1W(u32) //!< Most significant byte of 2nd rank of \a u32.
+#    define MSB0(u32) MSB0W(u32) //!< Most significant byte of 1st rank of \a u32.
 
 #    if defined(__ICCARM__)
 #        define SHORTENUM __packed
@@ -1031,7 +1031,9 @@ static inline void convert_16_bit_to_byte_address(uint16_t value, uint8_t *data)
  * @return 16-Bit value
  * @ingroup apiPalApi
  */
-static inline uint16_t convert_byte_array_to_16_bit(uint8_t *data) { return (data[0] | ((uint16_t)data[1] << 8)); }
+static inline uint16_t convert_byte_array_to_16_bit(uint8_t *data) {
+    return (data[0] | ((uint16_t)data[1] << 8));
+}
 
 /* Converts a 4 Byte array into a 32-Bit value */
 static inline uint32_t convert_byte_array_to_32_bit(uint8_t *data) {
diff --git a/tmk_core/protocol/arm_atsam/usb/conf_usb.h b/tmk_core/protocol/arm_atsam/usb/conf_usb.h
index 184a2e81dc..50d189a202 100644
--- a/tmk_core/protocol/arm_atsam/usb/conf_usb.h
+++ b/tmk_core/protocol/arm_atsam/usb/conf_usb.h
@@ -59,7 +59,7 @@
 #define USB_DEVICE_VENDOR_ID VENDOR_ID
 #define USB_DEVICE_PRODUCT_ID PRODUCT_ID
 #define USB_DEVICE_VERSION DEVICE_VER
-#define USB_DEVICE_POWER 500  // Consumption on Vbus line (mA)
+#define USB_DEVICE_POWER 500 // Consumption on Vbus line (mA)
 #define USB_DEVICE_ATTR (USB_CONFIG_ATTR_REMOTE_WAKEUP | USB_CONFIG_ATTR_BUS_POWERED)
 //                                      (USB_CONFIG_ATTR_REMOTE_WAKEUP|USB_CONFIG_ATTR_BUS_POWERED)
 //                                      (USB_CONFIG_ATTR_REMOTE_WAKEUP|USB_CONFIG_ATTR_SELF_POWERED)
@@ -161,4 +161,4 @@
 #include "usb_main.h"
 #include "ui.h"
 
-#endif  // _CONF_USB_H_
+#endif // _CONF_USB_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/main_usb.c b/tmk_core/protocol/arm_atsam/usb/main_usb.c
index 5fcb9a9c61..ee6ed25b85 100644
--- a/tmk_core/protocol/arm_atsam/usb/main_usb.c
+++ b/tmk_core/protocol/arm_atsam/usb/main_usb.c
@@ -25,15 +25,25 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 uint8_t keyboard_protocol = 1;
 
-void main_suspend_action(void) { ui_powerdown(); }
+void main_suspend_action(void) {
+    ui_powerdown();
+}
 
-void main_resume_action(void) { ui_wakeup(); }
+void main_resume_action(void) {
+    ui_wakeup();
+}
 
-void main_sof_action(void) { ui_process(udd_get_frame_number()); }
+void main_sof_action(void) {
+    ui_process(udd_get_frame_number());
+}
 
-void main_remotewakeup_enable(void) { ui_wakeup_enable(); }
+void main_remotewakeup_enable(void) {
+    ui_wakeup_enable();
+}
 
-void main_remotewakeup_disable(void) { ui_wakeup_disable(); }
+void main_remotewakeup_disable(void) {
+    ui_wakeup_disable();
+}
 
 volatile bool main_b_kbd_enable = false;
 bool          main_kbd_enable(void) {
@@ -41,7 +51,9 @@ bool          main_kbd_enable(void) {
     return true;
 }
 
-void main_kbd_disable(void) { main_b_kbd_enable = false; }
+void main_kbd_disable(void) {
+    main_b_kbd_enable = false;
+}
 
 #ifdef NKRO_ENABLE
 volatile bool main_b_nkro_enable = false;
@@ -50,7 +62,9 @@ bool          main_nkro_enable(void) {
     return true;
 }
 
-void main_nkro_disable(void) { main_b_nkro_enable = false; }
+void main_nkro_disable(void) {
+    main_b_nkro_enable = false;
+}
 #endif
 
 #ifdef EXTRAKEY_ENABLE
@@ -60,7 +74,9 @@ bool          main_exk_enable(void) {
     return true;
 }
 
-void main_exk_disable(void) { main_b_exk_enable = false; }
+void main_exk_disable(void) {
+    main_b_exk_enable = false;
+}
 #endif
 
 #ifdef CONSOLE_ENABLE
@@ -70,7 +86,9 @@ bool          main_con_enable(void) {
     return true;
 }
 
-void main_con_disable(void) { main_b_con_enable = false; }
+void main_con_disable(void) {
+    main_b_con_enable = false;
+}
 #endif
 
 #ifdef MOUSE_ENABLE
@@ -80,7 +98,9 @@ bool          main_mou_enable(void) {
     return true;
 }
 
-void main_mou_disable(void) { main_b_mou_enable = false; }
+void main_mou_disable(void) {
+    main_b_mou_enable = false;
+}
 #endif
 
 #ifdef RAW_ENABLE
@@ -90,7 +110,11 @@ bool          main_raw_enable(void) {
     return true;
 }
 
-void main_raw_disable(void) { main_b_raw_enable = false; }
+void main_raw_disable(void) {
+    main_b_raw_enable = false;
+}
 
-void main_raw_receive(uint8_t *buffer, uint8_t len) { raw_hid_receive(buffer, len); }
+void main_raw_receive(uint8_t *buffer, uint8_t len) {
+    raw_hid_receive(buffer, len);
+}
 #endif
diff --git a/tmk_core/protocol/arm_atsam/usb/status_codes.h b/tmk_core/protocol/arm_atsam/usb/status_codes.h
index a7a1230be0..72819a0d7d 100644
--- a/tmk_core/protocol/arm_atsam/usb/status_codes.h
+++ b/tmk_core/protocol/arm_atsam/usb/status_codes.h
@@ -124,20 +124,20 @@ typedef enum status_code status_code_genare_t;
  */
 enum status_code_wireless {
     // STATUS_OK               =  0, //!< Success
-    ERR_IO_ERROR              = -1,   //!< I/O error
-    ERR_FLUSHED               = -2,   //!< Request flushed from queue
-    ERR_TIMEOUT               = -3,   //!< Operation timed out
-    ERR_BAD_DATA              = -4,   //!< Data integrity check failed
-    ERR_PROTOCOL              = -5,   //!< Protocol error
-    ERR_UNSUPPORTED_DEV       = -6,   //!< Unsupported device
-    ERR_NO_MEMORY             = -7,   //!< Insufficient memory
-    ERR_INVALID_ARG           = -8,   //!< Invalid argument
-    ERR_BAD_ADDRESS           = -9,   //!< Bad address
-    ERR_BUSY                  = -10,  //!< Resource is busy
-    ERR_BAD_FORMAT            = -11,  //!< Data format not recognized
-    ERR_NO_TIMER              = -12,  //!< No timer available
-    ERR_TIMER_ALREADY_RUNNING = -13,  //!< Timer already running
-    ERR_TIMER_NOT_RUNNING     = -14,  //!< Timer not running
+    ERR_IO_ERROR              = -1,  //!< I/O error
+    ERR_FLUSHED               = -2,  //!< Request flushed from queue
+    ERR_TIMEOUT               = -3,  //!< Operation timed out
+    ERR_BAD_DATA              = -4,  //!< Data integrity check failed
+    ERR_PROTOCOL              = -5,  //!< Protocol error
+    ERR_UNSUPPORTED_DEV       = -6,  //!< Unsupported device
+    ERR_NO_MEMORY             = -7,  //!< Insufficient memory
+    ERR_INVALID_ARG           = -8,  //!< Invalid argument
+    ERR_BAD_ADDRESS           = -9,  //!< Bad address
+    ERR_BUSY                  = -10, //!< Resource is busy
+    ERR_BAD_FORMAT            = -11, //!< Data format not recognized
+    ERR_NO_TIMER              = -12, //!< No timer available
+    ERR_TIMER_ALREADY_RUNNING = -13, //!< Timer already running
+    ERR_TIMER_NOT_RUNNING     = -14, //!< Timer not running
 
     /**
      * \brief Operation in progress
diff --git a/tmk_core/protocol/arm_atsam/usb/udc.c b/tmk_core/protocol/arm_atsam/usb/udc.c
index 1f0c0d95d6..2a371c200a 100644
--- a/tmk_core/protocol/arm_atsam/usb/udc.c
+++ b/tmk_core/protocol/arm_atsam/usb/udc.c
@@ -52,7 +52,7 @@
 #include "udi.h"
 #include "udc.h"
 
-#define BOOTLOADER_SERIAL_MAX_SIZE 20  // DO NOT MODIFY!
+#define BOOTLOADER_SERIAL_MAX_SIZE 20 // DO NOT MODIFY!
 
 /**
  * \ingroup udc_group
@@ -132,13 +132,13 @@ uint8_t     bootloader_serial_number[BOOTLOADER_SERIAL_MAX_SIZE + 1] = "";
 static const uint8_t *udc_get_string_serial_name(void) {
 #if defined           USB_DEVICE_SERIAL_USE_BOOTLOADER_SERIAL
     uint32_t serial_ptrloc  = (uint32_t)&_srom - 4;
-    uint32_t serial_address = *(uint32_t *)serial_ptrloc;  // Address of bootloader's serial number if available
+    uint32_t serial_address = *(uint32_t *)serial_ptrloc; // Address of bootloader's serial number if available
 
-    if (serial_address != 0xFFFFFFFF && serial_address < serial_ptrloc)  // Check for factory programmed serial address
+    if (serial_address != 0xFFFFFFFF && serial_address < serial_ptrloc) // Check for factory programmed serial address
     {
-        if ((serial_address & 0xFF) % 4 == 0)  // Check alignment
+        if ((serial_address & 0xFF) % 4 == 0) // Check alignment
         {
-            uint16_t *serial_use    = (uint16_t *)(serial_address);  // Point to address of string in rom
+            uint16_t *serial_use    = (uint16_t *)(serial_address); // Point to address of string in rom
             uint8_t   serial_length = 0;
 
             while ((*(serial_use + serial_length) > 32 && *(serial_use + serial_length) < 127) && serial_length < BOOTLOADER_SERIAL_MAX_SIZE) {
@@ -149,7 +149,7 @@ static const uint8_t *udc_get_string_serial_name(void) {
 
             usb_device_serial_name_size = serial_length;
 
-            return bootloader_serial_number;  // Use serial programmed into bootloader rom
+            return bootloader_serial_number; // Use serial programmed into bootloader rom
         }
     }
 #endif
@@ -157,9 +157,9 @@ static const uint8_t *udc_get_string_serial_name(void) {
     usb_device_serial_name_size = USB_DEVICE_SERIAL_NAME_SIZE;
 
 #if defined USB_DEVICE_SERIAL_NAME
-    return (const uint8_t *)USB_DEVICE_SERIAL_NAME;  // Use serial supplied by keyboard's config.h
+    return (const uint8_t *)USB_DEVICE_SERIAL_NAME; // Use serial supplied by keyboard's config.h
 #else
-    return 0;  // No serial supplied
+    return 0; // No serial supplied
 #endif
 }
 
@@ -169,7 +169,7 @@ static const uint8_t *udc_get_string_serial_name(void) {
  */
 #ifndef BOOTLOADER_SERIAL_MAX_SIZE
 #    define BOOTLOADER_SERIAL_MAX_SIZE 0
-#endif  // BOOTLOADER_SERIAL_MAX_SIZE
+#endif // BOOTLOADER_SERIAL_MAX_SIZE
 struct udc_string_desc_t {
     usb_str_desc_t header;
     le16_t         string[Max(Max(Max(USB_DEVICE_MANUFACTURE_NAME_SIZE, USB_DEVICE_PRODUCT_NAME_SIZE), USB_DEVICE_SERIAL_NAME_SIZE), BOOTLOADER_SERIAL_MAX_SIZE)];
@@ -178,14 +178,18 @@ COMPILER_WORD_ALIGNED
 static UDC_DESC_STORAGE struct udc_string_desc_t udc_string_desc = {.header.bDescriptorType = USB_DT_STRING};
 //! @}
 
-usb_iface_desc_t UDC_DESC_STORAGE *udc_get_interface_desc(void) { return udc_ptr_iface; }
+usb_iface_desc_t UDC_DESC_STORAGE *udc_get_interface_desc(void) {
+    return udc_ptr_iface;
+}
 
 /**
  * \brief Returns a value to check the end of USB Configuration descriptor
  *
  * \return address after the last byte of USB Configuration descriptor
  */
-static usb_conf_desc_t UDC_DESC_STORAGE *udc_get_eof_conf(void) { return (UDC_DESC_STORAGE usb_conf_desc_t *)((uint8_t *)udc_ptr_conf->desc + le16_to_cpu(udc_ptr_conf->desc->wTotalLength)); }
+static usb_conf_desc_t UDC_DESC_STORAGE *udc_get_eof_conf(void) {
+    return (UDC_DESC_STORAGE usb_conf_desc_t *)((uint8_t *)udc_ptr_conf->desc + le16_to_cpu(udc_ptr_conf->desc->wTotalLength));
+}
 
 #if (0 != USB_DEVICE_MAX_EP)
 /**
@@ -209,15 +213,15 @@ static usb_conf_desc_t UDC_DESC_STORAGE *udc_next_desc_in_iface(usb_conf_desc_t
         // If new interface descriptor is found,
         // then it is the end of the current global interface descriptor
         if (USB_DT_INTERFACE == desc->bDescriptorType) {
-            break;  // End of global interface descriptor
+            break; // End of global interface descriptor
         }
         if (desc_id == desc->bDescriptorType) {
-            return desc;  // Specific descriptor found
+            return desc; // Specific descriptor found
         }
         // Go to next descriptor
         desc = (UDC_DESC_STORAGE usb_conf_desc_t *)((uint8_t *)desc + desc->bLength);
     }
-    return NULL;  // No specific descriptor found
+    return NULL; // No specific descriptor found
 }
 #endif
 
@@ -251,13 +255,13 @@ static bool udc_update_iface_desc(uint8_t iface_num, uint8_t setting_num) {
             // A interface descriptor is found
             // Check interface and alternate setting number
             if ((iface_num == udc_ptr_iface->bInterfaceNumber) && (setting_num == udc_ptr_iface->bAlternateSetting)) {
-                return true;  // Interface found
+                return true; // Interface found
             }
         }
         // Go to next descriptor
         udc_ptr_iface = (UDC_DESC_STORAGE usb_iface_desc_t *)((uint8_t *)udc_ptr_iface + udc_ptr_iface->bLength);
     }
-    return false;  // Interface not found
+    return false; // Interface not found
 }
 
 /**
@@ -343,7 +347,9 @@ static bool udc_iface_enable(uint8_t iface_num, uint8_t setting_num) {
 
 /*! \brief Start the USB Device stack
  */
-void udc_start(void) { udd_enable(); }
+void udc_start(void) {
+    udd_enable();
+}
 
 /*! \brief Stop the USB Device stack
  */
@@ -510,7 +516,7 @@ static bool udc_req_std_dev_set_feature(void) {
                     udd_g_ctrlreq.callback = udd_test_mode_packet;
                     return true;
 
-                case USB_DEV_TEST_MODE_FORCE_ENABLE:  // Only for downstream facing hub ports
+                case USB_DEV_TEST_MODE_FORCE_ENABLE: // Only for downstream facing hub ports
                 default:
                     break;
             }
@@ -544,7 +550,9 @@ static bool udc_req_std_ep_set_feature(void) {
  * \brief Change the address of device
  * Callback called at the end of request set address
  */
-static void udc_valid_address(void) { udd_set_address(udd_g_ctrlreq.req.wValue & 0x7F); }
+static void udc_valid_address(void) {
+    udd_set_address(udd_g_ctrlreq.req.wValue & 0x7F);
+}
 
 /**
  * \brief Standard device request to set device address
@@ -763,7 +771,7 @@ static bool udc_req_std_dev_set_configuration(void) {
     // Enable new configuration
     udc_num_configuration = udd_g_ctrlreq.req.wValue & 0xFF;
     if (udc_num_configuration == 0) {
-        return true;  // Default empty configuration requested
+        return true; // Default empty configuration requested
     }
     // Update pointer of the configuration descriptor
 #ifdef USB_DEVICE_HS_SUPPORT
@@ -796,10 +804,10 @@ static bool udc_req_std_iface_get_setting(void) {
     udi_api_t UDC_DESC_STORAGE *udi_api;
 
     if (udd_g_ctrlreq.req.wLength != 1) {
-        return false;  // Error in request
+        return false; // Error in request
     }
     if (!udc_num_configuration) {
-        return false;  // The device is not is configured state yet
+        return false; // The device is not is configured state yet
     }
 
     // Check the interface number included in the request
@@ -832,10 +840,10 @@ static bool udc_req_std_iface_set_setting(void) {
     uint8_t iface_num, setting_num;
 
     if (udd_g_ctrlreq.req.wLength) {
-        return false;  // Error in request
+        return false; // Error in request
     }
     if (!udc_num_configuration) {
-        return false;  // The device is not is configured state yet
+        return false; // The device is not is configured state yet
     }
 
     iface_num   = udd_g_ctrlreq.req.wIndex & 0xFF;
@@ -859,7 +867,7 @@ static bool udc_reqstd(void) {
     if (Udd_setup_is_in()) {
         // GET Standard Requests
         if (udd_g_ctrlreq.req.wLength == 0) {
-            return false;  // Error for USB host
+            return false; // Error for USB host
         }
 
         if (USB_REQ_RECIP_DEVICE == Udd_setup_recipient()) {
@@ -953,7 +961,7 @@ static bool udc_req_iface(void) {
     udi_api_t UDC_DESC_STORAGE *udi_api;
 
     if (0 == udc_num_configuration) {
-        return false;  // The device is not is configured state yet
+        return false; // The device is not is configured state yet
     }
     // Check interface number
     iface_num = udd_g_ctrlreq.req.wIndex & 0xFF;
@@ -987,7 +995,7 @@ static bool udc_req_ep(void) {
     udi_api_t UDC_DESC_STORAGE *udi_api;
 
     if (0 == udc_num_configuration) {
-        return false;  // The device is not is configured state yet
+        return false; // The device is not is configured state yet
     }
     // Send this request on all enabled interfaces
     iface_num = udd_g_ctrlreq.req.wIndex & 0xFF;
@@ -1027,7 +1035,7 @@ bool udc_process_setup(void) {
 
     if (Udd_setup_is_in()) {
         if (udd_g_ctrlreq.req.wLength == 0) {
-            return false;  // Error from USB host
+            return false; // Error from USB host
         }
     }
 
@@ -1055,7 +1063,7 @@ bool udc_process_setup(void) {
     // Here SETUP request unknown by UDC and UDIs
 #ifdef USB_DEVICE_SPECIFIC_REQUEST
     // Try to decode it in specific callback
-    return USB_DEVICE_SPECIFIC_REQUEST();  // Ex: Vendor request,...
+    return USB_DEVICE_SPECIFIC_REQUEST(); // Ex: Vendor request,...
 #else
     return false;
 #endif
diff --git a/tmk_core/protocol/arm_atsam/usb/udc.h b/tmk_core/protocol/arm_atsam/usb/udc.h
index 8d33307d3c..f2144059eb 100644
--- a/tmk_core/protocol/arm_atsam/usb/udc.h
+++ b/tmk_core/protocol/arm_atsam/usb/udc.h
@@ -172,7 +172,9 @@ extern "C" {
     }
 \endcode
  */
-static inline bool udc_include_vbus_monitoring(void) { return udd_include_vbus_monitoring(); }
+static inline bool udc_include_vbus_monitoring(void) {
+    return udd_include_vbus_monitoring();
+}
 
 /*! \brief Start the USB Device stack
  */
@@ -189,19 +191,25 @@ void udc_stop(void);
  * then it will attach device when an acceptable Vbus
  * level from the host is detected.
  */
-static inline void udc_attach(void) { udd_attach(); }
+static inline void udc_attach(void) {
+    udd_attach();
+}
 
 /**
  * \brief Detaches the device from the bus
  *
  * The driver must remove pull-up on USB line D- or D+.
  */
-static inline void udc_detach(void) { udd_detach(); }
+static inline void udc_detach(void) {
+    udd_detach();
+}
 
 /*! \brief The USB driver sends a resume signal called \e "Upstream Resume"
  * This is authorized only when the remote wakeup feature is enabled by host.
  */
-inline void udc_remotewakeup(void) { udd_send_remotewakeup(); }
+inline void udc_remotewakeup(void) {
+    udd_send_remotewakeup();
+}
 
 /**
  * \brief Returns a pointer on the current interface descriptor
@@ -245,4 +253,4 @@ usb_iface_desc_t UDC_DESC_STORAGE *udc_get_interface_desc(void);
 }
 #endif
 
-#endif  // _UDC_H_
+#endif // _UDC_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/udc_desc.h b/tmk_core/protocol/arm_atsam/usb/udc_desc.h
index 39ea153b40..50861da964 100644
--- a/tmk_core/protocol/arm_atsam/usb/udc_desc.h
+++ b/tmk_core/protocol/arm_atsam/usb/udc_desc.h
@@ -129,4 +129,4 @@ extern UDC_DESC_STORAGE udc_config_t udc_config;
 #ifdef __cplusplus
 }
 #endif
-#endif  // _UDC_DESC_H_
+#endif // _UDC_DESC_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/udd.h b/tmk_core/protocol/arm_atsam/usb/udd.h
index 805b761a77..d9f58baf0b 100644
--- a/tmk_core/protocol/arm_atsam/usb/udd.h
+++ b/tmk_core/protocol/arm_atsam/usb/udd.h
@@ -381,4 +381,4 @@ extern void udc_sof_notify(void);
 #ifdef __cplusplus
 }
 #endif
-#endif  // _UDD_H_
+#endif // _UDD_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/udi.h b/tmk_core/protocol/arm_atsam/usb/udi.h
index 89942cce4d..60b117f3ca 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi.h
+++ b/tmk_core/protocol/arm_atsam/usb/udi.h
@@ -130,4 +130,4 @@ typedef struct {
 #ifdef __cplusplus
 }
 #endif
-#endif  // _UDI_H_
+#endif // _UDI_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_cdc.c b/tmk_core/protocol/arm_atsam/usb/udi_cdc.c
index 27db4017c4..0391b49f66 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi_cdc.c
+++ b/tmk_core/protocol/arm_atsam/usb/udi_cdc.c
@@ -386,7 +386,7 @@ bool udi_cdc_comm_setup(void) {
             switch (udd_g_ctrlreq.req.bRequest) {
                 case USB_REQ_CDC_GET_LINE_CODING:
                     // Get configuration of CDC line
-                    if (sizeof(usb_cdc_line_coding_t) != udd_g_ctrlreq.req.wLength) return false;  // Error for USB host
+                    if (sizeof(usb_cdc_line_coding_t) != udd_g_ctrlreq.req.wLength) return false; // Error for USB host
                     udd_g_ctrlreq.payload      = (uint8_t *)&udi_cdc_line_coding[port];
                     udd_g_ctrlreq.payload_size = sizeof(usb_cdc_line_coding_t);
                     return true;
@@ -400,7 +400,7 @@ bool udi_cdc_comm_setup(void) {
             switch (udd_g_ctrlreq.req.bRequest) {
                 case USB_REQ_CDC_SET_LINE_CODING:
                     // Change configuration of CDC line
-                    if (sizeof(usb_cdc_line_coding_t) != udd_g_ctrlreq.req.wLength) return false;  // Error for USB host
+                    if (sizeof(usb_cdc_line_coding_t) != udd_g_ctrlreq.req.wLength) return false; // Error for USB host
                     udd_g_ctrlreq.callback     = udi_cdc_line_coding_received;
                     udd_g_ctrlreq.payload      = (uint8_t *)&udi_cdc_line_coding[port];
                     udd_g_ctrlreq.payload_size = sizeof(usb_cdc_line_coding_t);
@@ -417,15 +417,15 @@ bool udi_cdc_comm_setup(void) {
             }
         }
     }
-    return false;  // request Not supported
+    return false; // request Not supported
 }
 
 bool udi_cdc_data_setup(void) {
-    return false;  // request Not supported
+    return false; // request Not supported
 }
 
 uint8_t udi_cdc_getsetting(void) {
-    return 0;  // CDC don't have multiple alternate setting
+    return 0; // CDC don't have multiple alternate setting
 }
 
 void udi_cdc_data_sof_notify(void) {
@@ -476,7 +476,7 @@ static void udi_cdc_line_coding_received(void) {
 
 static void udi_cdc_ctrl_state_change(uint8_t port, bool b_set, le16_t bit_mask) {
     udd_ep_id_t ep_comm;
-    uint32_t    irqflags;  // irqflags_t
+    uint32_t    irqflags; // irqflags_t
 
     //#if UDI_CDC_PORT_NB == 1 // To optimize code
     port = 0;
@@ -514,7 +514,7 @@ static void udi_cdc_ctrl_state_change(uint8_t port, bool b_set, le16_t bit_mask)
 }
 
 static void udi_cdc_ctrl_state_notify(uint8_t port, udd_ep_id_t ep) {
-#    if UDI_CDC_PORT_NB == 1  // To optimize code
+#    if UDI_CDC_PORT_NB == 1 // To optimize code
     port = 0;
 #    endif
 
@@ -562,7 +562,7 @@ static void udi_cdc_serial_state_msg_sent(udd_ep_status_t status, iram_size_t n,
 //------- Internal routines to process data transfer
 
 static bool udi_cdc_rx_start(uint8_t port) {
-    uint32_t    irqflags;  // irqflags_t
+    uint32_t    irqflags; // irqflags_t
     uint8_t     buf_sel_trans;
     udd_ep_id_t ep;
 
@@ -685,7 +685,7 @@ static void udi_cdc_data_sent(udd_ep_status_t status, iram_size_t n, udd_ep_id_t
 }
 
 static void udi_cdc_tx_send(uint8_t port) {
-    uint32_t        irqflags;  // irqflags_t
+    uint32_t        irqflags; // irqflags_t
     uint8_t         buf_sel_trans;
     bool            b_short_packet;
     udd_ep_id_t     ep;
@@ -696,15 +696,15 @@ static void udi_cdc_tx_send(uint8_t port) {
     //#endif
 
     if (udi_cdc_tx_trans_ongoing[port]) {
-        return;  // Already on going or wait next SOF to send next data
+        return; // Already on going or wait next SOF to send next data
     }
     if (udd_is_high_speed()) {
         if (udi_cdc_tx_sof_num[port] == udd_get_micro_frame_number()) {
-            return;  // Wait next SOF to send next data
+            return; // Wait next SOF to send next data
         }
     } else {
         if (udi_cdc_tx_sof_num[port] == udd_get_frame_number()) {
-            return;  // Wait next SOF to send next data
+            return; // Wait next SOF to send next data
         }
     }
 
@@ -743,7 +743,7 @@ static void udi_cdc_tx_send(uint8_t port) {
             udi_cdc_tx_sof_num[port] = udd_get_frame_number();
         }
     } else {
-        udi_cdc_tx_sof_num[port] = 0;  // Force next transfer without wait SOF
+        udi_cdc_tx_sof_num[port] = 0; // Force next transfer without wait SOF
     }
 
     /*
@@ -768,28 +768,48 @@ static void udi_cdc_tx_send(uint8_t port) {
 //---------------------------------------------
 //------- Application interface
 
-void udi_cdc_ctrl_signal_dcd(bool b_set) { udi_cdc_ctrl_state_change(0, b_set, CDC_SERIAL_STATE_DCD); }
+void udi_cdc_ctrl_signal_dcd(bool b_set) {
+    udi_cdc_ctrl_state_change(0, b_set, CDC_SERIAL_STATE_DCD);
+}
 
-void udi_cdc_ctrl_signal_dsr(bool b_set) { udi_cdc_ctrl_state_change(0, b_set, CDC_SERIAL_STATE_DSR); }
+void udi_cdc_ctrl_signal_dsr(bool b_set) {
+    udi_cdc_ctrl_state_change(0, b_set, CDC_SERIAL_STATE_DSR);
+}
 
-void udi_cdc_signal_framing_error(void) { udi_cdc_ctrl_state_change(0, true, CDC_SERIAL_STATE_FRAMING); }
+void udi_cdc_signal_framing_error(void) {
+    udi_cdc_ctrl_state_change(0, true, CDC_SERIAL_STATE_FRAMING);
+}
 
-void udi_cdc_signal_parity_error(void) { udi_cdc_ctrl_state_change(0, true, CDC_SERIAL_STATE_PARITY); }
+void udi_cdc_signal_parity_error(void) {
+    udi_cdc_ctrl_state_change(0, true, CDC_SERIAL_STATE_PARITY);
+}
 
-void udi_cdc_signal_overrun(void) { udi_cdc_ctrl_state_change(0, true, CDC_SERIAL_STATE_OVERRUN); }
+void udi_cdc_signal_overrun(void) {
+    udi_cdc_ctrl_state_change(0, true, CDC_SERIAL_STATE_OVERRUN);
+}
 
-void udi_cdc_multi_ctrl_signal_dcd(uint8_t port, bool b_set) { udi_cdc_ctrl_state_change(port, b_set, CDC_SERIAL_STATE_DCD); }
+void udi_cdc_multi_ctrl_signal_dcd(uint8_t port, bool b_set) {
+    udi_cdc_ctrl_state_change(port, b_set, CDC_SERIAL_STATE_DCD);
+}
 
-void udi_cdc_multi_ctrl_signal_dsr(uint8_t port, bool b_set) { udi_cdc_ctrl_state_change(port, b_set, CDC_SERIAL_STATE_DSR); }
+void udi_cdc_multi_ctrl_signal_dsr(uint8_t port, bool b_set) {
+    udi_cdc_ctrl_state_change(port, b_set, CDC_SERIAL_STATE_DSR);
+}
 
-void udi_cdc_multi_signal_framing_error(uint8_t port) { udi_cdc_ctrl_state_change(port, true, CDC_SERIAL_STATE_FRAMING); }
+void udi_cdc_multi_signal_framing_error(uint8_t port) {
+    udi_cdc_ctrl_state_change(port, true, CDC_SERIAL_STATE_FRAMING);
+}
 
-void udi_cdc_multi_signal_parity_error(uint8_t port) { udi_cdc_ctrl_state_change(port, true, CDC_SERIAL_STATE_PARITY); }
+void udi_cdc_multi_signal_parity_error(uint8_t port) {
+    udi_cdc_ctrl_state_change(port, true, CDC_SERIAL_STATE_PARITY);
+}
 
-void udi_cdc_multi_signal_overrun(uint8_t port) { udi_cdc_ctrl_state_change(port, true, CDC_SERIAL_STATE_OVERRUN); }
+void udi_cdc_multi_signal_overrun(uint8_t port) {
+    udi_cdc_ctrl_state_change(port, true, CDC_SERIAL_STATE_OVERRUN);
+}
 
 iram_size_t udi_cdc_multi_get_nb_received_data(uint8_t port) {
-    uint32_t    irqflags;  // irqflags_t
+    uint32_t    irqflags; // irqflags_t
     uint16_t    pos;
     iram_size_t nb_received;
 
@@ -807,14 +827,20 @@ iram_size_t udi_cdc_multi_get_nb_received_data(uint8_t port) {
     return nb_received;
 }
 
-iram_size_t udi_cdc_get_nb_received_data(void) { return udi_cdc_multi_get_nb_received_data(0); }
+iram_size_t udi_cdc_get_nb_received_data(void) {
+    return udi_cdc_multi_get_nb_received_data(0);
+}
 
-bool udi_cdc_multi_is_rx_ready(uint8_t port) { return (udi_cdc_multi_get_nb_received_data(port) > 0); }
+bool udi_cdc_multi_is_rx_ready(uint8_t port) {
+    return (udi_cdc_multi_get_nb_received_data(port) > 0);
+}
 
-bool udi_cdc_is_rx_ready(void) { return udi_cdc_multi_is_rx_ready(0); }
+bool udi_cdc_is_rx_ready(void) {
+    return udi_cdc_multi_is_rx_ready(0);
+}
 
 int udi_cdc_multi_getc(uint8_t port) {
-    uint32_t irqflags;  // irqflags_t
+    uint32_t irqflags; // irqflags_t
     int      rx_data = 0;
     bool     b_databit_9;
     uint16_t pos;
@@ -859,10 +885,12 @@ udi_cdc_getc_process_one_byte:
     return rx_data;
 }
 
-int udi_cdc_getc(void) { return udi_cdc_multi_getc(0); }
+int udi_cdc_getc(void) {
+    return udi_cdc_multi_getc(0);
+}
 
 iram_size_t udi_cdc_multi_read_buf(uint8_t port, void *buf, iram_size_t size) {
-    uint32_t    irqflags;  // irqflags_t
+    uint32_t    irqflags; // irqflags_t
     uint8_t *   ptr_buf = (uint8_t *)buf;
     iram_size_t copy_nb;
     uint16_t    pos;
@@ -912,7 +940,7 @@ static iram_size_t udi_cdc_multi_read_no_polling(uint8_t port, void *buf, iram_s
     iram_size_t nb_avail_data;
     uint16_t    pos;
     uint8_t     buf_sel;
-    uint32_t    irqflags;  // irqflags_t
+    uint32_t    irqflags; // irqflags_t
 
     //#if UDI_CDC_PORT_NB == 1 // To optimize code
     port = 0;
@@ -952,12 +980,16 @@ static iram_size_t udi_cdc_multi_read_no_polling(uint8_t port, void *buf, iram_s
     return (nb_avail_data);
 }
 
-iram_size_t udi_cdc_read_no_polling(void *buf, iram_size_t size) { return udi_cdc_multi_read_no_polling(0, buf, size); }
+iram_size_t udi_cdc_read_no_polling(void *buf, iram_size_t size) {
+    return udi_cdc_multi_read_no_polling(0, buf, size);
+}
 
-iram_size_t udi_cdc_read_buf(void *buf, iram_size_t size) { return udi_cdc_multi_read_buf(0, buf, size); }
+iram_size_t udi_cdc_read_buf(void *buf, iram_size_t size) {
+    return udi_cdc_multi_read_buf(0, buf, size);
+}
 
 iram_size_t udi_cdc_multi_get_free_tx_buffer(uint8_t port) {
-    uint32_t    irqflags;  // irqflags_t
+    uint32_t    irqflags; // irqflags_t
     iram_size_t buf_sel_nb, retval;
     uint8_t     buf_sel;
 
@@ -986,14 +1018,20 @@ iram_size_t udi_cdc_multi_get_free_tx_buffer(uint8_t port) {
     return retval;
 }
 
-iram_size_t udi_cdc_get_free_tx_buffer(void) { return udi_cdc_multi_get_free_tx_buffer(0); }
+iram_size_t udi_cdc_get_free_tx_buffer(void) {
+    return udi_cdc_multi_get_free_tx_buffer(0);
+}
 
-bool udi_cdc_multi_is_tx_ready(uint8_t port) { return (udi_cdc_multi_get_free_tx_buffer(port) != 0); }
+bool udi_cdc_multi_is_tx_ready(uint8_t port) {
+    return (udi_cdc_multi_get_free_tx_buffer(port) != 0);
+}
 
-bool udi_cdc_is_tx_ready(void) { return udi_cdc_multi_is_tx_ready(0); }
+bool udi_cdc_is_tx_ready(void) {
+    return udi_cdc_multi_is_tx_ready(0);
+}
 
 int udi_cdc_multi_putc(uint8_t port, int value) {
-    uint32_t irqflags;  // irqflags_t
+    uint32_t irqflags; // irqflags_t
     bool     b_databit_9;
     uint8_t  buf_sel;
 
@@ -1030,10 +1068,12 @@ udi_cdc_putc_process_one_byte:
     return true;
 }
 
-int udi_cdc_putc(int value) { return udi_cdc_multi_putc(0, value); }
+int udi_cdc_putc(int value) {
+    return udi_cdc_multi_putc(0, value);
+}
 
 iram_size_t udi_cdc_multi_write_buf(uint8_t port, const void *buf, iram_size_t size) {
-    uint32_t    irqflags;  // irqflags_t
+    uint32_t    irqflags; // irqflags_t
     uint8_t     buf_sel;
     uint16_t    buf_nb;
     iram_size_t copy_nb;
@@ -1083,7 +1123,9 @@ udi_cdc_write_buf_loop_wait:
     return 0;
 }
 
-iram_size_t udi_cdc_write_buf(const void *buf, iram_size_t size) { return udi_cdc_multi_write_buf(0, buf, size); }
+iram_size_t udi_cdc_write_buf(const void *buf, iram_size_t size) {
+    return udi_cdc_multi_write_buf(0, buf, size);
+}
 
 #    define MAX_PRINT 256
 #    define CDC_SEND_INTERVAL 2
@@ -1121,10 +1163,10 @@ uint32_t CDC_print(char *printbuf) {
 char printbuf[CDC_PRINTBUF_SIZE];
 
 int CDC_printf(const char *_Format, ...) {
-    va_list va;  // Variable argument list variable
+    va_list va; // Variable argument list variable
     int     result;
 
-    va_start(va, _Format);  // Initialize the variable argument list
+    va_start(va, _Format); // Initialize the variable argument list
     result = vsnprintf(printbuf, CDC_PRINTBUF_SIZE, _Format, va);
     va_end(va);
 
@@ -1146,18 +1188,18 @@ uint32_t CDC_input_buf(inbuf_t inbuf, uint32_t inbuf_size) {
 
     if (RXChar) {
         switch (RXChar) {
-            case '\t':  // tab - repeat last
+            case '\t': // tab - repeat last
                 inbuf.count                = inbuf.lastcount;
                 inbuf.buf[inbuf.count + 1] = 0;
                 CDC_print(inbuf.buf);
                 break;
-            case '\r':  // enter
+            case '\r': // enter
                 inbuf.buf[inbuf.count] = 0;
                 inbuf.lastcount        = inbuf.count;
                 inbuf.count            = 0;
                 entered                = 1;
                 break;
-            case '\b':  // backspace
+            case '\b': // backspace
                 if (inbuf.count > 0) {
                     inbuf.count -= 1;
                     CDC_print("\b \b\0");
@@ -1181,7 +1223,9 @@ uint32_t CDC_input_buf(inbuf_t inbuf, uint32_t inbuf_size) {
     return entered;
 }
 
-uint32_t CDC_input() { return CDC_input_buf(inbuf, CDC_INBUF_SIZE); }
+uint32_t CDC_input() {
+    return CDC_input_buf(inbuf, CDC_INBUF_SIZE);
+}
 
 void CDC_init(void) {
     inbuf.count           = 0;
@@ -1190,19 +1234,27 @@ void CDC_init(void) {
     cdc_tx_send_time_next = timer_read64() + CDC_SEND_INTERVAL;
 }
 
-#else  // CDC line 62
+#else // CDC line 62
 
 char printbuf[CDC_PRINTBUF_SIZE];
 
-void CDC_send(void) { return; }
+void CDC_send(void) {
+    return;
+}
 
-uint32_t CDC_print(char *printbuf) { return 0; }
+uint32_t CDC_print(char *printbuf) {
+    return 0;
+}
 
-int CDC_printf(const char *_Format, ...) { return 0; }
+int CDC_printf(const char *_Format, ...) {
+    return 0;
+}
 
 inbuf_t inbuf;
 
-uint32_t CDC_input(void) { return 0; }
+uint32_t CDC_input(void) {
+    return 0;
+}
 
 void CDC_init(void) {
     inbuf.count     = 0;
@@ -1210,6 +1262,6 @@ void CDC_init(void) {
     printbuf[0]     = 0;
 }
 
-#endif  // CDC line 62
+#endif // CDC line 62
 
 //@}
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_cdc.h b/tmk_core/protocol/arm_atsam/usb/udi_cdc.h
index 406023980c..ff4f521ce0 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi_cdc.h
+++ b/tmk_core/protocol/arm_atsam/usb/udi_cdc.h
@@ -346,7 +346,7 @@ typedef struct {
     char     buf[CDC_INBUF_SIZE];
 } inbuf_t;
 
-#else  // VIRTSER_ENABLE
+#else // VIRTSER_ENABLE
 
 // keep these to accommodate calls if remaining
 #    define CDC_PRINTBUF_SIZE 1
@@ -362,7 +362,7 @@ typedef struct {
 
 extern inbuf_t inbuf;
 
-#endif  // VIRTSER_ENABLE
+#endif // VIRTSER_ENABLE
 
 uint32_t CDC_print(char* printbuf);
 int      CDC_printf(const char* _Format, ...);
@@ -373,4 +373,4 @@ void     CDC_init(void);
 }
 #endif
 
-#endif  // _UDI_CDC_H_
+#endif // _UDI_CDC_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_cdc_conf.h b/tmk_core/protocol/arm_atsam/usb/udi_cdc_conf.h
index e079512492..e17ed7bf44 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi_cdc_conf.h
+++ b/tmk_core/protocol/arm_atsam/usb/udi_cdc_conf.h
@@ -59,9 +59,9 @@
 extern "C" {
 #endif
 
-#define UDI_CDC_DATA_EP_IN_0 ((CDC_TX_ENDPOINT) | (USB_EP_DIR_IN))    // TX
-#define UDI_CDC_DATA_EP_OUT_0 ((CDC_RX_ENDPOINT) | (USB_EP_DIR_OUT))  // RX
-#define UDI_CDC_COMM_EP_0 ((CDC_ACM_ENDPOINT) | (USB_EP_DIR_IN))      // Notify endpoint
+#define UDI_CDC_DATA_EP_IN_0 ((CDC_TX_ENDPOINT) | (USB_EP_DIR_IN))   // TX
+#define UDI_CDC_DATA_EP_OUT_0 ((CDC_RX_ENDPOINT) | (USB_EP_DIR_OUT)) // RX
+#define UDI_CDC_COMM_EP_0 ((CDC_ACM_ENDPOINT) | (USB_EP_DIR_IN))     // Notify endpoint
 
 #define UDI_CDC_COMM_IFACE_NUMBER_0 (CDC_STATUS_INTERFACE)
 #define UDI_CDC_DATA_IFACE_NUMBER_0 (CDC_DATA_INTERFACE)
@@ -69,4 +69,4 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-#endif  // _UDI_CDC_CONF_H_
+#endif // _UDI_CDC_CONF_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_device_conf.h b/tmk_core/protocol/arm_atsam/usb/udi_device_conf.h
index 1c0983115c..eeed196275 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi_device_conf.h
+++ b/tmk_core/protocol/arm_atsam/usb/udi_device_conf.h
@@ -220,7 +220,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define NEXT_OUT_EPNUM_4 (CDC_OUT_EPNUM + 1)
 
 #    define CDC_ACM_SIZE CDC_NOTIFICATION_EPSIZE
-#    define CDC_RX_SIZE CDC_EPSIZE  // KFSMOD was 64
+#    define CDC_RX_SIZE CDC_EPSIZE // KFSMOD was 64
 #    define CDC_TX_SIZE CDC_RX_SIZE
 #    define CDC_ACM_POLLING_INTERVAL 255
 #    define CDC_EP_INTERVAL_STATUS CDC_ACM_POLLING_INTERVAL
@@ -370,7 +370,7 @@ extern udi_hid_exk_report_t udi_hid_exk_report;
 
 COMPILER_PACK_RESET()
 
-#endif  // EXTRAKEY_ENABLE
+#endif // EXTRAKEY_ENABLE
 
 // **********************************************************************
 // NKRO Descriptor structure and content
@@ -433,7 +433,7 @@ extern uint8_t udi_hid_nkro_report[UDI_HID_NKRO_REPORT_SIZE];
 
 COMPILER_PACK_RESET()
 
-#endif  // NKRO_ENABLE
+#endif // NKRO_ENABLE
 
 // **********************************************************************
 // MOU Descriptor structure and content
@@ -449,7 +449,7 @@ typedef struct {
 } udi_hid_mou_desc_t;
 
 typedef struct {
-    uint8_t array[77];  // MOU PDS
+    uint8_t array[77]; // MOU PDS
 } udi_hid_mou_report_desc_t;
 
 // clang-format off
@@ -488,12 +488,12 @@ typedef struct {
 // clang-format on
 
 // report buffer
-#    define UDI_HID_MOU_REPORT_SIZE 5  // MOU PDS
+#    define UDI_HID_MOU_REPORT_SIZE 5 // MOU PDS
 extern uint8_t udi_hid_mou_report[UDI_HID_MOU_REPORT_SIZE];
 
 COMPILER_PACK_RESET()
 
-#endif  // MOUSE_ENABLE
+#endif // MOUSE_ENABLE
 
 // **********************************************************************
 // RAW Descriptor structure and content
@@ -565,7 +565,7 @@ extern uint8_t udi_hid_raw_report[UDI_HID_RAW_REPORT_SIZE];
 
 COMPILER_PACK_RESET()
 
-#endif  // RAW_ENABLE
+#endif // RAW_ENABLE
 
 // **********************************************************************
 // CON Descriptor structure and content
@@ -637,7 +637,7 @@ extern uint8_t udi_hid_con_report[UDI_HID_CON_REPORT_SIZE];
 
 COMPILER_PACK_RESET()
 
-#endif  // CONSOLE_ENABLE
+#endif // CONSOLE_ENABLE
 
 // **********************************************************************
 // CDC Descriptor structure and content
@@ -780,7 +780,7 @@ typedef struct {
 
 COMPILER_PACK_RESET()
 
-#endif  // VIRTSER_ENABLE
+#endif // VIRTSER_ENABLE
 
 // **********************************************************************
 // CONFIGURATION Descriptor structure and content
@@ -815,4 +815,4 @@ typedef struct {
 
 COMPILER_PACK_RESET()
 
-#endif  //_UDI_DEVICE_CONF_H_
+#endif //_UDI_DEVICE_CONF_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_device_epsize.h b/tmk_core/protocol/arm_atsam/usb/udi_device_epsize.h
index 09de475469..7a9ed31930 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi_device_epsize.h
+++ b/tmk_core/protocol/arm_atsam/usb/udi_device_epsize.h
@@ -28,4 +28,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define CDC_NOTIFICATION_EPSIZE 8
 #define CDC_EPSIZE 16
 
-#endif  //_UDI_DEVICE_EPSIZE_H_
+#endif //_UDI_DEVICE_EPSIZE_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_hid.c b/tmk_core/protocol/arm_atsam/usb/udi_hid.c
index b0bdcc6932..73e384a039 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi_hid.c
+++ b/tmk_core/protocol/arm_atsam/usb/udi_hid.c
@@ -110,7 +110,7 @@ bool udi_hid_setup(uint8_t *rate, uint8_t *protocol, uint8_t *report_desc, bool
             }
         }
     }
-    return false;  // Request not supported
+    return false; // Request not supported
 }
 
 //---------------------------------------------
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_hid.h b/tmk_core/protocol/arm_atsam/usb/udi_hid.h
index 6fd2cabd4c..a08b7db744 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi_hid.h
+++ b/tmk_core/protocol/arm_atsam/usb/udi_hid.h
@@ -82,4 +82,4 @@ bool udi_hid_setup(uint8_t *rate, uint8_t *protocol, uint8_t *report_desc, bool
 #ifdef __cplusplus
 }
 #endif
-#endif  // _UDI_HID_H_
+#endif // _UDI_HID_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.c b/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.c
index 9ea4addcfc..be4f2bb0c9 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.c
+++ b/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.c
@@ -94,42 +94,42 @@ static uint8_t udi_hid_kbd_report_trans[UDI_HID_KBD_REPORT_SIZE];
 
 COMPILER_WORD_ALIGNED
 UDC_DESC_STORAGE udi_hid_kbd_report_desc_t udi_hid_kbd_report_desc = {{
-    0x05, 0x01,  // Usage Page (Generic Desktop)
-    0x09, 0x06,  // Usage (Keyboard)
-    0xA1, 0x01,  // Collection (Application)
+    0x05, 0x01, // Usage Page (Generic Desktop)
+    0x09, 0x06, // Usage (Keyboard)
+    0xA1, 0x01, // Collection (Application)
     // Modifiers (8 bits)
-    0x05, 0x07,  //   Usage Page (Keyboard)
-    0x19, 0xE0,  //   Usage Minimum (Keyboard Left Control)
-    0x29, 0xE7,  //   Usage Maximum (Keyboard Right GUI)
-    0x15, 0x00,  //   Logical Minimum (0)
-    0x25, 0x01,  //   Logical Maximum (1)
-    0x95, 0x08,  //   Report Count (8)
-    0x75, 0x01,  //   Report Size (1)
-    0x81, 0x02,  //   Input (Data, Variable, Absolute)
+    0x05, 0x07, //   Usage Page (Keyboard)
+    0x19, 0xE0, //   Usage Minimum (Keyboard Left Control)
+    0x29, 0xE7, //   Usage Maximum (Keyboard Right GUI)
+    0x15, 0x00, //   Logical Minimum (0)
+    0x25, 0x01, //   Logical Maximum (1)
+    0x95, 0x08, //   Report Count (8)
+    0x75, 0x01, //   Report Size (1)
+    0x81, 0x02, //   Input (Data, Variable, Absolute)
     // Reserved (1 byte)
-    0x81, 0x01,  //   Input (Constant)
+    0x81, 0x01, //   Input (Constant)
     // Keycodes (6 bytes)
-    0x19, 0x00,  //   Usage Minimum (0)
-    0x29, 0xFF,  //   Usage Maximum (255)
-    0x15, 0x00,  //   Logical Minimum (0)
-    0x25, 0xFF,  //   Logical Maximum (255)
-    0x95, 0x06,  //   Report Count (6)
-    0x75, 0x08,  //   Report Size (8)
-    0x81, 0x00,  //   Input (Data, Array, Absolute)
+    0x19, 0x00, //   Usage Minimum (0)
+    0x29, 0xFF, //   Usage Maximum (255)
+    0x15, 0x00, //   Logical Minimum (0)
+    0x25, 0xFF, //   Logical Maximum (255)
+    0x95, 0x06, //   Report Count (6)
+    0x75, 0x08, //   Report Size (8)
+    0x81, 0x00, //   Input (Data, Array, Absolute)
 
     // Status LEDs (5 bits)
-    0x05, 0x08,  //   Usage Page (LED)
-    0x19, 0x01,  //   Usage Minimum (Num Lock)
-    0x29, 0x05,  //   Usage Maximum (Kana)
-    0x15, 0x00,  //   Logical Minimum (0)
-    0x25, 0x01,  //   Logical Maximum (1)
-    0x95, 0x05,  //   Report Count (5)
-    0x75, 0x01,  //   Report Size (1)
-    0x91, 0x02,  //   Output (Data, Variable, Absolute)
+    0x05, 0x08, //   Usage Page (LED)
+    0x19, 0x01, //   Usage Minimum (Num Lock)
+    0x29, 0x05, //   Usage Maximum (Kana)
+    0x15, 0x00, //   Logical Minimum (0)
+    0x25, 0x01, //   Logical Maximum (1)
+    0x95, 0x05, //   Report Count (5)
+    0x75, 0x01, //   Report Size (1)
+    0x91, 0x02, //   Output (Data, Variable, Absolute)
     // LED padding (3 bits)
-    0x95, 0x03,  //   Report Count (3)
-    0x91, 0x01,  //   Output (Constant)
-    0xC0         // End Collection
+    0x95, 0x03, //   Report Count (3)
+    0x91, 0x01, //   Output (Constant)
+    0xC0        // End Collection
 }};
 
 static bool udi_hid_kbd_setreport(void);
@@ -148,11 +148,17 @@ bool udi_hid_kbd_enable(void) {
     return UDI_HID_KBD_ENABLE_EXT();
 }
 
-void udi_hid_kbd_disable(void) { UDI_HID_KBD_DISABLE_EXT(); }
+void udi_hid_kbd_disable(void) {
+    UDI_HID_KBD_DISABLE_EXT();
+}
 
-bool udi_hid_kbd_setup(void) { return udi_hid_setup(&udi_hid_kbd_rate, &udi_hid_kbd_protocol, (uint8_t *)&udi_hid_kbd_report_desc, udi_hid_kbd_setreport); }
+bool udi_hid_kbd_setup(void) {
+    return udi_hid_setup(&udi_hid_kbd_rate, &udi_hid_kbd_protocol, (uint8_t *)&udi_hid_kbd_report_desc, udi_hid_kbd_setreport);
+}
 
-uint8_t udi_hid_kbd_getsetting(void) { return 0; }
+uint8_t udi_hid_kbd_getsetting(void) {
+    return 0;
+}
 
 static bool udi_hid_kbd_setreport(void) {
     if ((USB_HID_REPORT_TYPE_OUTPUT == (udd_g_ctrlreq.req.wValue >> 8)) && (0 == (0xFF & udd_g_ctrlreq.req.wValue)) && (1 == udd_g_ctrlreq.req.wLength)) {
@@ -234,41 +240,41 @@ static uint8_t udi_hid_nkro_report_trans[UDI_HID_NKRO_REPORT_SIZE];
 
 COMPILER_WORD_ALIGNED
 UDC_DESC_STORAGE udi_hid_nkro_report_desc_t udi_hid_nkro_report_desc = {{
-    0x05, 0x01,  // Usage Page (Generic Desktop)
-    0x09, 0x06,  // Usage (Keyboard)
-    0xA1, 0x01,  // Collection (Application)
+    0x05, 0x01, // Usage Page (Generic Desktop)
+    0x09, 0x06, // Usage (Keyboard)
+    0xA1, 0x01, // Collection (Application)
 
     // Modifiers (8 bits)
-    0x05, 0x07,  //   Usage Page (Keyboard/Keypad)
-    0x19, 0xE0,  //   Usage Minimum (Keyboard Left Control)
-    0x29, 0xE7,  //   Usage Maximum (Keyboard Right GUI)
-    0x15, 0x00,  //   Logical Minimum (0)
-    0x25, 0x01,  //   Logical Maximum (1)
-    0x95, 0x08,  //   Report Count (8)
-    0x75, 0x01,  //   Report Size (1)
-    0x81, 0x02,  //   Input (Data, Variable, Absolute)
+    0x05, 0x07, //   Usage Page (Keyboard/Keypad)
+    0x19, 0xE0, //   Usage Minimum (Keyboard Left Control)
+    0x29, 0xE7, //   Usage Maximum (Keyboard Right GUI)
+    0x15, 0x00, //   Logical Minimum (0)
+    0x25, 0x01, //   Logical Maximum (1)
+    0x95, 0x08, //   Report Count (8)
+    0x75, 0x01, //   Report Size (1)
+    0x81, 0x02, //   Input (Data, Variable, Absolute)
     // Keycodes
-    0x05, 0x07,  //   Usage Page (Keyboard/Keypad)
-    0x19, 0x00,  //   Usage Minimum (0)
-    0x29, 0xF7,  //   Usage Maximum (247)
-    0x15, 0x00,  //   Logical Minimum (0)
-    0x25, 0x01,  //   Logical Maximum (1)
-    0x95, 0xF8,  //   Report Count (248)
-    0x75, 0x01,  //   Report Size (1)
-    0x81, 0x02,  //   Input (Data, Variable, Absolute, Bitfield)
+    0x05, 0x07, //   Usage Page (Keyboard/Keypad)
+    0x19, 0x00, //   Usage Minimum (0)
+    0x29, 0xF7, //   Usage Maximum (247)
+    0x15, 0x00, //   Logical Minimum (0)
+    0x25, 0x01, //   Logical Maximum (1)
+    0x95, 0xF8, //   Report Count (248)
+    0x75, 0x01, //   Report Size (1)
+    0x81, 0x02, //   Input (Data, Variable, Absolute, Bitfield)
 
     // Status LEDs (5 bits)
-    0x05, 0x08,  //   Usage Page (LED)
-    0x19, 0x01,  //   Usage Minimum (Num Lock)
-    0x29, 0x05,  //   Usage Maximum (Kana)
-    0x95, 0x05,  //   Report Count (5)
-    0x75, 0x01,  //   Report Size (1)
-    0x91, 0x02,  //   Output (Data, Variable, Absolute)
+    0x05, 0x08, //   Usage Page (LED)
+    0x19, 0x01, //   Usage Minimum (Num Lock)
+    0x29, 0x05, //   Usage Maximum (Kana)
+    0x95, 0x05, //   Report Count (5)
+    0x75, 0x01, //   Report Size (1)
+    0x91, 0x02, //   Output (Data, Variable, Absolute)
     // LED padding (3 bits)
-    0x95, 0x01,  //   Report Count (1)
-    0x75, 0x03,  //   Report Size (3)
-    0x91, 0x03,  //   Output (Constant)
-    0xC0         // End Collection
+    0x95, 0x01, //   Report Count (1)
+    0x75, 0x03, //   Report Size (3)
+    0x91, 0x03, //   Output (Constant)
+    0xC0        // End Collection
 }};
 
 static bool udi_hid_nkro_setreport(void);
@@ -285,18 +291,24 @@ bool udi_hid_nkro_enable(void) {
     return UDI_HID_NKRO_ENABLE_EXT();
 }
 
-void udi_hid_nkro_disable(void) { UDI_HID_NKRO_DISABLE_EXT(); }
+void udi_hid_nkro_disable(void) {
+    UDI_HID_NKRO_DISABLE_EXT();
+}
 
-bool udi_hid_nkro_setup(void) { return udi_hid_setup(&udi_hid_nkro_rate, &udi_hid_nkro_protocol, (uint8_t *)&udi_hid_nkro_report_desc, udi_hid_nkro_setreport); }
+bool udi_hid_nkro_setup(void) {
+    return udi_hid_setup(&udi_hid_nkro_rate, &udi_hid_nkro_protocol, (uint8_t *)&udi_hid_nkro_report_desc, udi_hid_nkro_setreport);
+}
 
-uint8_t udi_hid_nkro_getsetting(void) { return 0; }
+uint8_t udi_hid_nkro_getsetting(void) {
+    return 0;
+}
 
 // keyboard receives LED report here
 static bool udi_hid_nkro_setreport(void) {
     if ((USB_HID_REPORT_TYPE_OUTPUT == (udd_g_ctrlreq.req.wValue >> 8)) && (0 == (0xFF & udd_g_ctrlreq.req.wValue)) && (1 == udd_g_ctrlreq.req.wLength)) {
         // Report OUT type on report ID 0 from USB Host
         udd_g_ctrlreq.payload      = &udi_hid_nkro_report_set;
-        udd_g_ctrlreq.callback     = udi_hid_nkro_setreport_valid;  // must call routine to transform setreport to LED state
+        udd_g_ctrlreq.callback     = udi_hid_nkro_setreport_valid; // must call routine to transform setreport to LED state
         udd_g_ctrlreq.payload_size = 1;
         return true;
     }
@@ -333,7 +345,7 @@ static void udi_hid_nkro_setreport_valid(void) {
     // UDI_HID_NKRO_CHANGE_LED(udi_hid_nkro_report_set);
 }
 
-#endif  // NKRO_ENABLE
+#endif // NKRO_ENABLE
 
 //********************************************************************************************
 // EXK (extra-keys) SYS-CTRL  Keyboard
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.h b/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.h
index a2d2281628..a330014498 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.h
+++ b/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.h
@@ -71,7 +71,7 @@ extern UDC_DESC_STORAGE udi_api_t udi_api_hid_nkro;
 extern bool                       udi_hid_nkro_b_report_valid;
 extern volatile bool              udi_hid_nkro_b_report_trans_ongoing;
 bool                              udi_hid_nkro_send_report(void);
-#endif  // NKRO_ENABLE
+#endif // NKRO_ENABLE
 
 //********************************************************************************************
 // SYS-CTRL interface
@@ -81,7 +81,7 @@ extern UDC_DESC_STORAGE udi_api_t udi_api_hid_exk;
 extern bool                       udi_hid_exk_b_report_valid;
 extern uint8_t                    udi_hid_exk_report_set;
 bool                              udi_hid_exk_send_report(void);
-#endif  // EXTRAKEY_ENABLE
+#endif // EXTRAKEY_ENABLE
 
 //********************************************************************************************
 // CON Console
@@ -92,7 +92,7 @@ extern bool                       udi_hid_con_b_report_valid;
 extern uint8_t                    udi_hid_con_report_set[UDI_HID_CON_REPORT_SIZE];
 extern volatile bool              udi_hid_con_b_report_trans_ongoing;
 bool                              udi_hid_con_send_report(void);
-#endif  // CONSOLE_ENABLE
+#endif // CONSOLE_ENABLE
 
 //********************************************************************************************
 // MOU Mouse
@@ -101,7 +101,7 @@ bool                              udi_hid_con_send_report(void);
 extern UDC_DESC_STORAGE udi_api_t udi_api_hid_mou;
 extern bool                       udi_hid_mou_b_report_valid;
 bool                              udi_hid_mou_send_report(void);
-#endif  // MOUSE_ENABLE
+#endif // MOUSE_ENABLE
 
 //********************************************************************************************
 // RAW Raw
@@ -110,7 +110,7 @@ bool                              udi_hid_mou_send_report(void);
 extern UDC_DESC_STORAGE udi_api_t udi_api_hid_raw;
 bool                              udi_hid_raw_send_report(void);
 bool                              udi_hid_raw_receive_report(void);
-#endif  // RAW_ENABLE
+#endif // RAW_ENABLE
 
 //@}
 
@@ -118,4 +118,4 @@ bool                              udi_hid_raw_receive_report(void);
 }
 #endif
 
-#endif  // _UDC_HID_KBD_H_
+#endif // _UDC_HID_KBD_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_conf.h b/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_conf.h
index ec73252b69..db5db17ed5 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_conf.h
+++ b/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_conf.h
@@ -57,4 +57,4 @@
 
 #include "udi_hid_kbd.h"
 
-#endif  // _UDI_HID_KBD_CONF_H_
+#endif // _UDI_HID_KBD_CONF_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_desc.c b/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_desc.c
index 3c1c9a7926..2a60868ed2 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_desc.c
+++ b/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_desc.c
@@ -78,17 +78,17 @@ UDC_DESC_STORAGE usb_dev_desc_t udc_device_desc = {.bLength         = sizeof(usb
 #ifdef USB_DEVICE_MANUFACTURE_NAME
                                                    .iManufacturer = 1,
 #else
-                                                   .iManufacturer = 0,  // No manufacture string
+                                                   .iManufacturer = 0, // No manufacture string
 #endif
 #ifdef USB_DEVICE_PRODUCT_NAME
                                                    .iProduct = 2,
 #else
-                                                   .iProduct      = 0,  // No product string
+                                                   .iProduct      = 0, // No product string
 #endif
 #if (defined USB_DEVICE_SERIAL_NAME || defined USB_DEVICE_GET_SERIAL_NAME_POINTER)
                                                    .iSerialNumber = 3,
 #else
-                                                   .iSerialNumber = 0,  // No serial string
+                                                   .iSerialNumber = 0, // No serial string
 #endif
                                                    .bNumConfigurations = 1};
 
diff --git a/tmk_core/protocol/arm_atsam/usb/ui.c b/tmk_core/protocol/arm_atsam/usb/ui.c
index 86c7edc94e..f5263d7289 100644
--- a/tmk_core/protocol/arm_atsam/usb/ui.c
+++ b/tmk_core/protocol/arm_atsam/usb/ui.c
@@ -48,7 +48,7 @@
 #    define ARM_MATH_CM4
 #endif
 
-#undef LITTLE_ENDIAN  // redefined in samd51j18a.h
+#undef LITTLE_ENDIAN // redefined in samd51j18a.h
 #include "samd51j18a.h"
 #include "ui.h"
 
diff --git a/tmk_core/protocol/arm_atsam/usb/ui.h b/tmk_core/protocol/arm_atsam/usb/ui.h
index f7bc652360..d1c767d457 100644
--- a/tmk_core/protocol/arm_atsam/usb/ui.h
+++ b/tmk_core/protocol/arm_atsam/usb/ui.h
@@ -73,4 +73,4 @@ void ui_process(uint16_t framenumber);
  */
 void ui_kbd_led(uint8_t value);
 
-#endif  // _UI_H_
+#endif // _UI_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/usb.c b/tmk_core/protocol/arm_atsam/usb/usb.c
index b7393660b1..1abf0a2f4d 100644
--- a/tmk_core/protocol/arm_atsam/usb/usb.c
+++ b/tmk_core/protocol/arm_atsam/usb/usb.c
@@ -52,7 +52,7 @@
 #endif
 
 #include "compiler.h"
-#undef LITTLE_ENDIAN  // redefined in samd51j18a.h
+#undef LITTLE_ENDIAN // redefined in samd51j18a.h
 #include "samd51j18a.h"
 #include <stdbool.h>
 #include <string.h>
@@ -319,7 +319,7 @@ enum status_code usb_device_endpoint_enable_callback(struct usb_module *module_i
     module_inst->device_endpoint_enabled_callback_mask[ep_num] |= _usb_endpoint_irq_bits[callback_type];
 
     if (callback_type == USB_DEVICE_ENDPOINT_CALLBACK_TRCPT) {
-        if (ep_num == 0) {  // control endpoint
+        if (ep_num == 0) { // control endpoint
             module_inst->hw->DEVICE.DeviceEndpoint[ep_num].EPINTENSET.reg = USB_DEVICE_EPINTENSET_TRCPT0 | USB_DEVICE_EPINTENSET_TRCPT1;
         } else if (ep & USB_EP_DIR_IN) {
             module_inst->hw->DEVICE.DeviceEndpoint[ep_num].EPINTENSET.reg = USB_DEVICE_EPINTENSET_TRCPT1;
@@ -329,7 +329,7 @@ enum status_code usb_device_endpoint_enable_callback(struct usb_module *module_i
     }
 
     if (callback_type == USB_DEVICE_ENDPOINT_CALLBACK_TRFAIL) {
-        if (ep_num == 0) {  // control endpoint
+        if (ep_num == 0) { // control endpoint
             module_inst->hw->DEVICE.DeviceEndpoint[ep_num].EPINTENSET.reg = USB_DEVICE_EPINTENSET_TRFAIL0 | USB_DEVICE_EPINTENSET_TRFAIL1;
         } else if (ep & USB_EP_DIR_IN) {
             module_inst->hw->DEVICE.DeviceEndpoint[ep_num].EPINTENSET.reg = USB_DEVICE_EPINTENSET_TRFAIL1;
@@ -377,7 +377,7 @@ enum status_code usb_device_endpoint_disable_callback(struct usb_module *module_
     module_inst->device_endpoint_enabled_callback_mask[ep_num] &= ~_usb_endpoint_irq_bits[callback_type];
 
     if (callback_type == USB_DEVICE_ENDPOINT_CALLBACK_TRCPT) {
-        if (ep_num == 0) {  // control endpoint
+        if (ep_num == 0) { // control endpoint
             module_inst->hw->DEVICE.DeviceEndpoint[ep_num].EPINTENCLR.reg = USB_DEVICE_EPINTENCLR_TRCPT0 | USB_DEVICE_EPINTENCLR_TRCPT1;
         } else if (ep & USB_EP_DIR_IN) {
             module_inst->hw->DEVICE.DeviceEndpoint[ep_num].EPINTENCLR.reg = USB_DEVICE_EPINTENCLR_TRCPT1;
@@ -387,7 +387,7 @@ enum status_code usb_device_endpoint_disable_callback(struct usb_module *module_
     }
 
     if (callback_type == USB_DEVICE_ENDPOINT_CALLBACK_TRFAIL) {
-        if (ep_num == 0) {  // control endpoint
+        if (ep_num == 0) { // control endpoint
             module_inst->hw->DEVICE.DeviceEndpoint[ep_num].EPINTENCLR.reg = USB_DEVICE_EPINTENCLR_TRFAIL0 | USB_DEVICE_EPINTENCLR_TRFAIL1;
         } else if (ep & USB_EP_DIR_IN) {
             module_inst->hw->DEVICE.DeviceEndpoint[ep_num].EPINTENCLR.reg = USB_DEVICE_EPINTENCLR_TRFAIL1;
@@ -903,11 +903,17 @@ void USB_0_Handler(void) {
     }
 }
 
-void USB_1_Handler(void) { _usb_device_interrupt_handler(); }
+void USB_1_Handler(void) {
+    _usb_device_interrupt_handler();
+}
 
-void USB_2_Handler(void) { _usb_device_interrupt_handler(); }
+void USB_2_Handler(void) {
+    _usb_device_interrupt_handler();
+}
 
-void USB_3_Handler(void) { _usb_device_interrupt_handler(); }
+void USB_3_Handler(void) {
+    _usb_device_interrupt_handler();
+}
 
 /**
  * \brief Get the default USB module settings
@@ -974,10 +980,10 @@ enum status_code usb_init(struct usb_module *module_inst, Usb *const hw, struct
     pmclk->APBBMASK.bit.USB_ = 1;
 
     /* Set up the USB DP/DN pins */
-    pport->Group[0].PMUX[12].reg          = 0x77;  // PA24, PA25, function column H for USB D-, D+
+    pport->Group[0].PMUX[12].reg          = 0x77; // PA24, PA25, function column H for USB D-, D+
     pport->Group[0].PINCFG[24].bit.PMUXEN = 1;
     pport->Group[0].PINCFG[25].bit.PMUXEN = 1;
-    pport->Group[1].PMUX[11].bit.PMUXE    = 7;  // PB22, function column H for USB SOF_1KHz output
+    pport->Group[1].PMUX[11].bit.PMUXE    = 7; // PB22, function column H for USB SOF_1KHz output
     pport->Group[1].PINCFG[22].bit.PMUXEN = 1;
 
     // configure and enable DFLL for USB clock recovery mode at 48MHz
@@ -996,7 +1002,7 @@ enum status_code usb_init(struct usb_module *module_inst, Usb *const hw, struct
     while (posc->DFLLSYNC.bit.DFLLCTRLB)
         ;
     posc->DFLLCTRLB.bit.CCDIS = 1;
-    posc->DFLLMUL.bit.MUL     = 0xbb80;  // 4800 x 1KHz
+    posc->DFLLMUL.bit.MUL     = 0xbb80; // 4800 x 1KHz
     while (posc->DFLLSYNC.bit.DFLLMUL)
         ;
     posc->DFLLCTRLA.bit.ENABLE = 1;
diff --git a/tmk_core/protocol/arm_atsam/usb/usb.h b/tmk_core/protocol/arm_atsam/usb/usb.h
index 4c937ecdc9..270143a112 100644
--- a/tmk_core/protocol/arm_atsam/usb/usb.h
+++ b/tmk_core/protocol/arm_atsam/usb/usb.h
@@ -319,14 +319,18 @@ enum status_code usb_init(struct usb_module *module_inst, Usb *const hw, struct
  *
  * \param module_inst Pointer to USB device module instance
  */
-static inline void usb_device_attach(struct usb_module *module_inst) { module_inst->hw->DEVICE.CTRLB.reg &= ~USB_DEVICE_CTRLB_DETACH; }
+static inline void usb_device_attach(struct usb_module *module_inst) {
+    module_inst->hw->DEVICE.CTRLB.reg &= ~USB_DEVICE_CTRLB_DETACH;
+}
 
 /**
  * \brief Detach USB device from the bus
  *
  * \param module_inst Pointer to USB device module instance
  */
-static inline void usb_device_detach(struct usb_module *module_inst) { module_inst->hw->DEVICE.CTRLB.reg |= USB_DEVICE_CTRLB_DETACH; }
+static inline void usb_device_detach(struct usb_module *module_inst) {
+    module_inst->hw->DEVICE.CTRLB.reg |= USB_DEVICE_CTRLB_DETACH;
+}
 
 /**
  * \brief Get the speed mode of USB device
@@ -348,7 +352,9 @@ static inline enum usb_speed usb_device_get_speed(struct usb_module *module_inst
  * \param module_inst Pointer to USB device module instance
  * \return USB device address value.
  */
-static inline uint8_t usb_device_get_address(struct usb_module *module_inst) { return ((uint8_t)(module_inst->hw->DEVICE.DADD.bit.DADD)); }
+static inline uint8_t usb_device_get_address(struct usb_module *module_inst) {
+    return ((uint8_t)(module_inst->hw->DEVICE.DADD.bit.DADD));
+}
 
 /**
  * \brief Set the speed mode of USB device
@@ -356,7 +362,9 @@ static inline uint8_t usb_device_get_address(struct usb_module *module_inst) { r
  * \param module_inst Pointer to USB device module instance
  * \param address     USB device address value
  */
-static inline void usb_device_set_address(struct usb_module *module_inst, uint8_t address) { module_inst->hw->DEVICE.DADD.reg = USB_DEVICE_DADD_ADDEN | address; }
+static inline void usb_device_set_address(struct usb_module *module_inst, uint8_t address) {
+    module_inst->hw->DEVICE.DADD.reg = USB_DEVICE_DADD_ADDEN | address;
+}
 
 /**
  * \brief Get the frame number of USB device
@@ -364,7 +372,9 @@ static inline void usb_device_set_address(struct usb_module *module_inst, uint8_
  * \param module_inst Pointer to USB device module instance
  * \return USB device frame number value.
  */
-static inline uint16_t usb_device_get_frame_number(struct usb_module *module_inst) { return ((uint16_t)(module_inst->hw->DEVICE.FNUM.bit.FNUM)); }
+static inline uint16_t usb_device_get_frame_number(struct usb_module *module_inst) {
+    return ((uint16_t)(module_inst->hw->DEVICE.FNUM.bit.FNUM));
+}
 
 /**
  * \brief Get the micro-frame number of USB device
@@ -372,14 +382,18 @@ static inline uint16_t usb_device_get_frame_number(struct usb_module *module_ins
  * \param module_inst Pointer to USB device module instance
  * \return USB device micro-frame number value.
  */
-static inline uint16_t usb_device_get_micro_frame_number(struct usb_module *module_inst) { return ((uint16_t)(module_inst->hw->DEVICE.FNUM.reg)); }
+static inline uint16_t usb_device_get_micro_frame_number(struct usb_module *module_inst) {
+    return ((uint16_t)(module_inst->hw->DEVICE.FNUM.reg));
+}
 
 /**
  * \brief USB device send the resume wakeup
  *
  * \param module_inst Pointer to USB device module instance
  */
-static inline void usb_device_send_remote_wake_up(struct usb_module *module_inst) { module_inst->hw->DEVICE.CTRLB.reg |= USB_DEVICE_CTRLB_UPRSM; }
+static inline void usb_device_send_remote_wake_up(struct usb_module *module_inst) {
+    module_inst->hw->DEVICE.CTRLB.reg |= USB_DEVICE_CTRLB_UPRSM;
+}
 
 /**
  * \brief USB device set the LPM mode
@@ -387,7 +401,9 @@ static inline void usb_device_send_remote_wake_up(struct usb_module *module_inst
  * \param module_inst Pointer to USB device module instance
  * \param lpm_mode    LPM mode
  */
-static inline void usb_device_set_lpm_mode(struct usb_module *module_inst, enum usb_device_lpm_mode lpm_mode) { module_inst->hw->DEVICE.CTRLB.bit.LPMHDSK = lpm_mode; }
+static inline void usb_device_set_lpm_mode(struct usb_module *module_inst, enum usb_device_lpm_mode lpm_mode) {
+    module_inst->hw->DEVICE.CTRLB.bit.LPMHDSK = lpm_mode;
+}
 
 /**
  * \name USB Device Callback Management
diff --git a/tmk_core/protocol/arm_atsam/usb/usb_atmel.h b/tmk_core/protocol/arm_atsam/usb/usb_atmel.h
index 1cef703788..82bafdc7d1 100644
--- a/tmk_core/protocol/arm_atsam/usb/usb_atmel.h
+++ b/tmk_core/protocol/arm_atsam/usb/usb_atmel.h
@@ -109,7 +109,7 @@
 #define USB_PID_ATMEL_UC3_EVK1101_CTRLPANEL_HID_MS 0x2306
 #define USB_PID_ATMEL_UC3_CDC 0x2307
 #define USB_PID_ATMEL_UC3_AUDIO_MICRO 0x2308
-#define USB_PID_ATMEL_UC3_CDC_DEBUG 0x2310  // Virtual Com (debug interface) on EVK11xx
+#define USB_PID_ATMEL_UC3_CDC_DEBUG 0x2310 // Virtual Com (debug interface) on EVK11xx
 #define USB_PID_ATMEL_UC3_AUDIO_SPEAKER_MICRO 0x2311
 #define USB_PID_ATMEL_UC3_CDC_MSC 0x2312
 //! @}
@@ -186,4 +186,4 @@
 
 //! @}
 
-#endif  // _USB_ATMEL_H_
+#endif // _USB_ATMEL_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/usb_device_udd.c b/tmk_core/protocol/arm_atsam/usb/usb_device_udd.c
index f138b42786..e4510e7363 100644
--- a/tmk_core/protocol/arm_atsam/usb/usb_device_udd.c
+++ b/tmk_core/protocol/arm_atsam/usb/usb_device_udd.c
@@ -127,12 +127,12 @@ uint8_t udd_ctrl_buffer[USB_DEVICE_EP_CTRL_SIZE];
 
 /** Bit definitions about endpoint control state machine for udd_ep_control_state */
 typedef enum {
-    UDD_EPCTRL_SETUP                  = 0,  //!< Wait a SETUP packet
-    UDD_EPCTRL_DATA_OUT               = 1,  //!< Wait a OUT data packet
-    UDD_EPCTRL_DATA_IN                = 2,  //!< Wait a IN data packet
-    UDD_EPCTRL_HANDSHAKE_WAIT_IN_ZLP  = 3,  //!< Wait a IN ZLP packet
-    UDD_EPCTRL_HANDSHAKE_WAIT_OUT_ZLP = 4,  //!< Wait a OUT ZLP packet
-    UDD_EPCTRL_STALL_REQ              = 5,  //!< STALL enabled on IN & OUT packet
+    UDD_EPCTRL_SETUP                  = 0, //!< Wait a SETUP packet
+    UDD_EPCTRL_DATA_OUT               = 1, //!< Wait a OUT data packet
+    UDD_EPCTRL_DATA_IN                = 2, //!< Wait a IN data packet
+    UDD_EPCTRL_HANDSHAKE_WAIT_IN_ZLP  = 3, //!< Wait a IN ZLP packet
+    UDD_EPCTRL_HANDSHAKE_WAIT_OUT_ZLP = 4, //!< Wait a OUT ZLP packet
+    UDD_EPCTRL_STALL_REQ              = 5, //!< STALL enabled on IN & OUT packet
 } udd_ctrl_ep_state_t;
 
 /** Global variable to give and record information of the set up request management */
@@ -363,11 +363,17 @@ void udd_ep_abort(udd_ep_id_t ep) {
     }
 }
 
-bool udd_is_high_speed(void) { return false; }
+bool udd_is_high_speed(void) {
+    return false;
+}
 
-uint16_t udd_get_frame_number(void) { return usb_device_get_frame_number(&usb_device); }
+uint16_t udd_get_frame_number(void) {
+    return usb_device_get_frame_number(&usb_device);
+}
 
-uint16_t udd_get_micro_frame_number(void) { return usb_device_get_micro_frame_number(&usb_device); }
+uint16_t udd_get_micro_frame_number(void) {
+    return usb_device_get_micro_frame_number(&usb_device);
+}
 
 void udd_ep_free(udd_ep_id_t ep) {
     struct usb_device_endpoint_config config_ep;
@@ -436,7 +442,9 @@ bool udd_ep_alloc(udd_ep_id_t ep, uint8_t bmAttributes, uint16_t MaxEndpointSize
     return true;
 }
 
-bool udd_ep_is_halted(udd_ep_id_t ep) { return usb_device_endpoint_is_halted(&usb_device, ep); }
+bool udd_ep_is_halted(udd_ep_id_t ep) {
+    return usb_device_endpoint_is_halted(&usb_device, ep);
+}
 
 bool udd_ep_set_halt(udd_ep_id_t ep) {
     uint8_t ep_num = ep & USB_EP_ADDR_MASK;
@@ -591,9 +599,13 @@ bool udd_ep_run(udd_ep_id_t ep, bool b_shortpacket, uint8_t *buf, iram_size_t bu
     }
 }
 
-void udd_set_address(uint8_t address) { usb_device_set_address(&usb_device, address); }
+void udd_set_address(uint8_t address) {
+    usb_device_set_address(&usb_device, address);
+}
 
-uint8_t udd_getaddress(void) { return usb_device_get_address(&usb_device); }
+uint8_t udd_getaddress(void) {
+    return usb_device_get_address(&usb_device);
+}
 
 void udd_send_remotewakeup(void) {
     uint32_t try
@@ -913,7 +925,7 @@ static void _usb_device_lpm_suspend(struct usb_module *module_inst, void *pointe
     usb_device_enable_callback(&usb_device, USB_DEVICE_CALLBACK_WAKEUP);
 
     //#warning Here the sleep mode must be choose to have a DFLL startup time < bmAttribut.HIRD
-    udd_sleep_mode(UDD_STATE_SUSPEND_LPM);  // Enter in LPM SUSPEND mode
+    udd_sleep_mode(UDD_STATE_SUSPEND_LPM); // Enter in LPM SUSPEND mode
     if ((*lpm_wakeup_enable)) {
         UDC_REMOTEWAKEUP_LPM_ENABLE();
     }
diff --git a/tmk_core/protocol/arm_atsam/usb/usb_hub.c b/tmk_core/protocol/arm_atsam/usb/usb_hub.c
index c5fd284aab..14fba799c7 100644
--- a/tmk_core/protocol/arm_atsam/usb/usb_hub.c
+++ b/tmk_core/protocol/arm_atsam/usb/usb_hub.c
@@ -27,7 +27,7 @@ uint8_t usb_extra_state;
 uint8_t usb_extra_manual;
 uint8_t usb_gcr_auto;
 
-#endif  // MD_BOOTLOADER
+#endif // MD_BOOTLOADER
 
 uint16_t adc_extra;
 
@@ -51,10 +51,10 @@ void USB_Hub_init(void) {
     pmclk->APBBMASK.bit.USB_    = 1;
 
     // setup port pins for D-, D+, and SOF_1KHZ
-    pport->Group[0].PMUX[12].reg          = 0x77;  // PA24, PA25, function column H for USB D-, D+
+    pport->Group[0].PMUX[12].reg          = 0x77; // PA24, PA25, function column H for USB D-, D+
     pport->Group[0].PINCFG[24].bit.PMUXEN = 1;
     pport->Group[0].PINCFG[25].bit.PMUXEN = 1;
-    pport->Group[1].PMUX[11].bit.PMUXE    = 7;  // PB22, function column H for USB SOF_1KHz output
+    pport->Group[1].PMUX[11].bit.PMUXE    = 7; // PB22, function column H for USB SOF_1KHz output
     pport->Group[1].PINCFG[22].bit.PMUXEN = 1;
 
     // configure and enable DFLL for USB clock recovery mode at 48MHz
@@ -78,7 +78,7 @@ void USB_Hub_init(void) {
         DBGC(DC_USB2422_INIT_OSC_SYNC_DFLLCTRLB_4);
     }
     posc->DFLLCTRLB.bit.CCDIS = 1;
-    posc->DFLLMUL.bit.MUL     = 0xBB80;  // 4800 x 1KHz
+    posc->DFLLMUL.bit.MUL     = 0xBB80; // 4800 x 1KHz
     while (posc->DFLLSYNC.bit.DFLLMUL) {
         DBGC(DC_USB2422_INIT_OSC_SYNC_DFLLMUL);
     }
@@ -99,7 +99,7 @@ void USB_Hub_init(void) {
     pusb->DEVICE.PADCAL.bit.TRANSP = (USB_FUSES_TRANSP_ADDR >> USB_FUSES_TRANSP_Pos) & USB_FUSES_TRANSP_Msk;
     pusb->DEVICE.PADCAL.bit.TRIM   = (USB_FUSES_TRIM_ADDR >> USB_FUSES_TRIM_Pos) & USB_FUSES_TRIM_Msk;
     // device mode, enabled
-    pusb->DEVICE.CTRLB.bit.SPDCONF = 0;  // full speed
+    pusb->DEVICE.CTRLB.bit.SPDCONF = 0; // full speed
     pusb->DEVICE.CTRLA.bit.MODE    = 0;
     pusb->DEVICE.CTRLA.bit.ENABLE  = 1;
     while (pusb->DEVICE.SYNCBUSY.bit.ENABLE) {
@@ -111,8 +111,8 @@ void USB_Hub_init(void) {
 
     USB2422_init();
 
-    sr_exp_data.bit.HUB_CONNECT = 1;  // connect signal
-    sr_exp_data.bit.HUB_RESET_N = 1;  // reset high
+    sr_exp_data.bit.HUB_CONNECT = 1; // connect signal
+    sr_exp_data.bit.HUB_RESET_N = 1; // reset high
     SR_EXP_WriteData();
 
     wait_us(100);
@@ -122,7 +122,7 @@ void USB_Hub_init(void) {
     usb_extra_manual = 0;
     usb_gcr_auto     = 1;
 
-#endif  // MD_BOOTLOADER
+#endif // MD_BOOTLOADER
 
     DBGC(DC_USB2422_INIT_COMPLETE);
 }
@@ -131,10 +131,10 @@ void USB_reset(void) {
     DBGC(DC_USB_RESET_BEGIN);
 
     // pulse reset for at least 1 usec
-    sr_exp_data.bit.HUB_RESET_N = 0;  // reset low
+    sr_exp_data.bit.HUB_RESET_N = 0; // reset low
     SR_EXP_WriteData();
     wait_us(2);
-    sr_exp_data.bit.HUB_RESET_N = 1;  // reset high to run
+    sr_exp_data.bit.HUB_RESET_N = 1; // reset high to run
     SR_EXP_WriteData();
 
     DBGC(DC_USB_RESET_COMPLETE);
@@ -150,7 +150,9 @@ void USB_configure(void) {
     DBGC(DC_USB_CONFIGURE_COMPLETE);
 }
 
-uint16_t USB_active(void) { return USB2422_active(); }
+uint16_t USB_active(void) {
+    return USB2422_active();
+}
 
 void USB_set_host_by_voltage(void) {
     // UP is upstream device (HOST)
@@ -162,13 +164,13 @@ void USB_set_host_by_voltage(void) {
     usb_host_port = USB_HOST_PORT_UNKNOWN;
 #ifndef MD_BOOTLOADER
     usb_extra_state = USB_EXTRA_STATE_UNKNOWN;
-#endif                             // MD_BOOTLOADER
-    sr_exp_data.bit.SRC_1    = 1;  // USBC-1 available for test
-    sr_exp_data.bit.SRC_2    = 1;  // USBC-2 available for test
-    sr_exp_data.bit.E_UP_N   = 1;  // HOST disable
-    sr_exp_data.bit.E_DN1_N  = 1;  // EXTRA disable
-    sr_exp_data.bit.E_VBUS_1 = 0;  // USBC-1 disable full power I/O
-    sr_exp_data.bit.E_VBUS_2 = 0;  // USBC-2 disable full power I/O
+#endif                            // MD_BOOTLOADER
+    sr_exp_data.bit.SRC_1    = 1; // USBC-1 available for test
+    sr_exp_data.bit.SRC_2    = 1; // USBC-2 available for test
+    sr_exp_data.bit.E_UP_N   = 1; // HOST disable
+    sr_exp_data.bit.E_DN1_N  = 1; // EXTRA disable
+    sr_exp_data.bit.E_VBUS_1 = 0; // USBC-1 disable full power I/O
+    sr_exp_data.bit.E_VBUS_2 = 0; // USBC-2 disable full power I/O
 
     SR_EXP_WriteData();
 
@@ -185,33 +187,33 @@ void USB_set_host_by_voltage(void) {
     v_con_2_boot = v_con_2;
 
     if (v_con_1 > v_con_2) {
-        sr_exp_data.bit.S_UP  = 0;  // HOST to USBC-1
-        sr_exp_data.bit.S_DN1 = 1;  // EXTRA to USBC-2
-        sr_exp_data.bit.SRC_1 = 1;  // HOST on USBC-1
-        sr_exp_data.bit.SRC_2 = 0;  // EXTRA available on USBC-2
+        sr_exp_data.bit.S_UP  = 0; // HOST to USBC-1
+        sr_exp_data.bit.S_DN1 = 1; // EXTRA to USBC-2
+        sr_exp_data.bit.SRC_1 = 1; // HOST on USBC-1
+        sr_exp_data.bit.SRC_2 = 0; // EXTRA available on USBC-2
 
-        sr_exp_data.bit.E_VBUS_1 = 1;  // USBC-1 enable full power I/O
-        sr_exp_data.bit.E_VBUS_2 = 0;  // USBC-2 disable full power I/O
+        sr_exp_data.bit.E_VBUS_1 = 1; // USBC-1 enable full power I/O
+        sr_exp_data.bit.E_VBUS_2 = 0; // USBC-2 disable full power I/O
 
         SR_EXP_WriteData();
 
-        sr_exp_data.bit.E_UP_N = 0;  // HOST enable
+        sr_exp_data.bit.E_UP_N = 0; // HOST enable
 
         SR_EXP_WriteData();
 
         usb_host_port = USB_HOST_PORT_1;
     } else {
-        sr_exp_data.bit.S_UP  = 1;  // EXTRA to USBC-1
-        sr_exp_data.bit.S_DN1 = 0;  // HOST to USBC-2
-        sr_exp_data.bit.SRC_1 = 0;  // EXTRA available on USBC-1
-        sr_exp_data.bit.SRC_2 = 1;  // HOST on USBC-2
+        sr_exp_data.bit.S_UP  = 1; // EXTRA to USBC-1
+        sr_exp_data.bit.S_DN1 = 0; // HOST to USBC-2
+        sr_exp_data.bit.SRC_1 = 0; // EXTRA available on USBC-1
+        sr_exp_data.bit.SRC_2 = 1; // HOST on USBC-2
 
-        sr_exp_data.bit.E_VBUS_1 = 0;  // USBC-1 disable full power I/O
-        sr_exp_data.bit.E_VBUS_2 = 1;  // USBC-2 enable full power I/O
+        sr_exp_data.bit.E_VBUS_1 = 0; // USBC-1 disable full power I/O
+        sr_exp_data.bit.E_VBUS_2 = 1; // USBC-2 enable full power I/O
 
         SR_EXP_WriteData();
 
-        sr_exp_data.bit.E_UP_N = 0;  // HOST enable
+        sr_exp_data.bit.E_UP_N = 0; // HOST enable
 
         SR_EXP_WriteData();
 
@@ -220,7 +222,7 @@ void USB_set_host_by_voltage(void) {
 
 #ifndef MD_BOOTLOADER
     usb_extra_state = USB_EXTRA_STATE_DISABLED;
-#endif  // MD_BOOTLOADER
+#endif // MD_BOOTLOADER
 
     USB_reset();
     USB_configure();
@@ -241,7 +243,7 @@ uint8_t USB_Hub_Port_Detect_Init(void) {
     while (!USB_active()) {
         tmod = timer_read64() % PORT_DETECT_RETRY_INTERVAL;
 
-        if (v_con_1 > v_con_2)  // Values updated from USB_set_host_by_voltage();
+        if (v_con_1 > v_con_2) // Values updated from USB_set_host_by_voltage();
         {
             // 1 flash for port 1 detected
             if (tmod > 500 && tmod < 600) {
@@ -249,7 +251,7 @@ uint8_t USB_Hub_Port_Detect_Init(void) {
             } else {
                 DBG_LED_OFF;
             }
-        } else if (v_con_2 > v_con_1)  // Values updated from USB_set_host_by_voltage();
+        } else if (v_con_2 > v_con_1) // Values updated from USB_set_host_by_voltage();
         {
             // 2 flash for port 2 detected
             if (tmod > 500 && tmod < 600) {
@@ -321,7 +323,7 @@ void USB_HandleExtraDevice(void) {
         // Detect unplug and reset state to disabled
         if (adc_extra > USB_EXTRA_ADC_THRESHOLD) usb_extra_state = USB_EXTRA_STATE_DISABLED;
 
-        return;  // Return even if unplug detected
+        return; // Return even if unplug detected
     }
 
     if (usb_extra_manual) {
@@ -337,4 +339,4 @@ void USB_HandleExtraDevice(void) {
         USB_ExtraSetState(USB_EXTRA_STATE_DISABLED);
 }
 
-#endif  // MD_BOOTLOADER
+#endif // MD_BOOTLOADER
diff --git a/tmk_core/protocol/arm_atsam/usb/usb_hub.h b/tmk_core/protocol/arm_atsam/usb/usb_hub.h
index 76b1e0a326..d7b2e3fab4 100644
--- a/tmk_core/protocol/arm_atsam/usb/usb_hub.h
+++ b/tmk_core/protocol/arm_atsam/usb/usb_hub.h
@@ -48,4 +48,4 @@ uint16_t adc_get(uint8_t muxpos);
 void     USB_HandleExtraDevice(void);
 void     USB_ExtraSetState(uint8_t state);
 
-#endif  //_USB2422_H_
+#endif //_USB2422_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/usb_main.h b/tmk_core/protocol/arm_atsam/usb/usb_main.h
index d8461c6c9f..c3b1698c59 100644
--- a/tmk_core/protocol/arm_atsam/usb/usb_main.h
+++ b/tmk_core/protocol/arm_atsam/usb/usb_main.h
@@ -71,31 +71,31 @@ void                 main_kbd_disable(void);
 extern volatile bool main_b_nkro_enable;
 bool                 main_nkro_enable(void);
 void                 main_nkro_disable(void);
-#endif  // NKRO_ENABLE
+#endif // NKRO_ENABLE
 
 #ifdef EXTRAKEY_ENABLE
 extern volatile bool main_b_exk_enable;
 bool                 main_exk_enable(void);
 void                 main_exk_disable(void);
-#endif  // EXTRAKEY_ENABLE
+#endif // EXTRAKEY_ENABLE
 
 #ifdef CONSOLE_ENABLE
 extern volatile bool main_b_con_enable;
 bool                 main_con_enable(void);
 void                 main_con_disable(void);
-#endif  // CONSOLE_ENABLE
+#endif // CONSOLE_ENABLE
 
 #ifdef MOUSE_ENABLE
 extern volatile bool main_b_mou_enable;
 bool                 main_mou_enable(void);
 void                 main_mou_disable(void);
-#endif  // MOUSE_ENABLE
+#endif // MOUSE_ENABLE
 
 #ifdef RAW_ENABLE
 extern volatile bool main_b_raw_enable;
 bool                 main_raw_enable(void);
 void                 main_raw_disable(void);
 void                 main_raw_receive(uint8_t *buffer, uint8_t len);
-#endif  // RAW_ENABLE
+#endif // RAW_ENABLE
 
-#endif  // _MAIN_H_
+#endif // _MAIN_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/usb_protocol.h b/tmk_core/protocol/arm_atsam/usb/usb_protocol.h
index 54d023a6ee..639b80a804 100644
--- a/tmk_core/protocol/arm_atsam/usb/usb_protocol.h
+++ b/tmk_core/protocol/arm_atsam/usb/usb_protocol.h
@@ -63,8 +63,8 @@
  */
 
 //! Value for field bcdUSB
-#define USB_V2_0 0x0200  //!< USB Specification version 2.00
-#define USB_V2_1 0x0201  //!< USB Specification version 2.01
+#define USB_V2_0 0x0200 //!< USB Specification version 2.00
+#define USB_V2_1 0x0201 //!< USB Specification version 2.01
 
 /*! \name Generic definitions (Class, subclass and protocol)
  */
@@ -85,26 +85,26 @@
 /**
  * \brief USB request data transfer direction (bmRequestType)
  */
-#define USB_REQ_DIR_OUT (0 << 7)   //!< Host to device
-#define USB_REQ_DIR_IN (1 << 7)    //!< Device to host
-#define USB_REQ_DIR_MASK (1 << 7)  //!< Mask
+#define USB_REQ_DIR_OUT (0 << 7)  //!< Host to device
+#define USB_REQ_DIR_IN (1 << 7)   //!< Device to host
+#define USB_REQ_DIR_MASK (1 << 7) //!< Mask
 
 /**
  * \brief USB request types (bmRequestType)
  */
-#define USB_REQ_TYPE_STANDARD (0 << 5)  //!< Standard request
-#define USB_REQ_TYPE_CLASS (1 << 5)     //!< Class-specific request
-#define USB_REQ_TYPE_VENDOR (2 << 5)    //!< Vendor-specific request
-#define USB_REQ_TYPE_MASK (3 << 5)      //!< Mask
+#define USB_REQ_TYPE_STANDARD (0 << 5) //!< Standard request
+#define USB_REQ_TYPE_CLASS (1 << 5)    //!< Class-specific request
+#define USB_REQ_TYPE_VENDOR (2 << 5)   //!< Vendor-specific request
+#define USB_REQ_TYPE_MASK (3 << 5)     //!< Mask
 
 /**
  * \brief USB recipient codes (bmRequestType)
  */
-#define USB_REQ_RECIP_DEVICE (0 << 0)     //!< Recipient device
-#define USB_REQ_RECIP_INTERFACE (1 << 0)  //!< Recipient interface
-#define USB_REQ_RECIP_ENDPOINT (2 << 0)   //!< Recipient endpoint
-#define USB_REQ_RECIP_OTHER (3 << 0)      //!< Recipient other
-#define USB_REQ_RECIP_MASK (0x1F)         //!< Mask
+#define USB_REQ_RECIP_DEVICE (0 << 0)    //!< Recipient device
+#define USB_REQ_RECIP_INTERFACE (1 << 0) //!< Recipient interface
+#define USB_REQ_RECIP_ENDPOINT (2 << 0)  //!< Recipient endpoint
+#define USB_REQ_RECIP_OTHER (3 << 0)     //!< Recipient other
+#define USB_REQ_RECIP_MASK (0x1F)        //!< Mask
 
 /**
  * \brief Standard USB requests (bRequest)
@@ -149,8 +149,8 @@ enum usb_endpoint_status {
  * \note valid for SetFeature request.
  */
 enum usb_device_feature {
-    USB_DEV_FEATURE_REMOTE_WAKEUP         = 1,  //!< Remote wakeup enabled
-    USB_DEV_FEATURE_TEST_MODE             = 2,  //!< USB test mode
+    USB_DEV_FEATURE_REMOTE_WAKEUP         = 1, //!< Remote wakeup enabled
+    USB_DEV_FEATURE_TEST_MODE             = 2, //!< USB test mode
     USB_DEV_FEATURE_OTG_B_HNP_ENABLE      = 3,
     USB_DEV_FEATURE_OTG_A_HNP_SUPPORT     = 4,
     USB_DEV_FEATURE_OTG_A_ALT_HNP_SUPPORT = 5
@@ -261,7 +261,7 @@ enum usb_ep_type {
  * \brief Standard USB language IDs for string descriptors
  */
 enum usb_langid {
-    USB_LANGID_EN_US = 0x0409,  //!< English (United States)
+    USB_LANGID_EN_US = 0x0409, //!< English (United States)
 };
 
 /**
@@ -396,14 +396,14 @@ typedef struct {
  * \brief Standard USB Interface Association Descriptor structure
  */
 typedef struct {
-    uint8_t bLength;            //!< size of this descriptor in bytes
-    uint8_t bDescriptorType;    //!< INTERFACE descriptor type
-    uint8_t bFirstInterface;    //!< Number of interface
-    uint8_t bInterfaceCount;    //!< value to select alternate setting
-    uint8_t bFunctionClass;     //!< Class code assigned by the USB
-    uint8_t bFunctionSubClass;  //!< Sub-class code assigned by the USB
-    uint8_t bFunctionProtocol;  //!< Protocol code assigned by the USB
-    uint8_t iFunction;          //!< Index of string descriptor
+    uint8_t bLength;           //!< size of this descriptor in bytes
+    uint8_t bDescriptorType;   //!< INTERFACE descriptor type
+    uint8_t bFirstInterface;   //!< Number of interface
+    uint8_t bInterfaceCount;   //!< value to select alternate setting
+    uint8_t bFunctionClass;    //!< Class code assigned by the USB
+    uint8_t bFunctionSubClass; //!< Sub-class code assigned by the USB
+    uint8_t bFunctionProtocol; //!< Protocol code assigned by the USB
+    uint8_t iFunction;         //!< Index of string descriptor
 } usb_association_desc_t;
 
 /**
@@ -420,25 +420,25 @@ typedef struct {
     uint8_t bMaxPower;
 } usb_conf_desc_t;
 
-#define USB_CONFIG_ATTR_MUST_SET (1 << 7)       //!< Must always be set
-#define USB_CONFIG_ATTR_BUS_POWERED (0 << 6)    //!< Bus-powered
-#define USB_CONFIG_ATTR_SELF_POWERED (1 << 6)   //!< Self-powered
-#define USB_CONFIG_ATTR_REMOTE_WAKEUP (1 << 5)  //!< remote wakeup supported
+#define USB_CONFIG_ATTR_MUST_SET (1 << 7)      //!< Must always be set
+#define USB_CONFIG_ATTR_BUS_POWERED (0 << 6)   //!< Bus-powered
+#define USB_CONFIG_ATTR_SELF_POWERED (1 << 6)  //!< Self-powered
+#define USB_CONFIG_ATTR_REMOTE_WAKEUP (1 << 5) //!< remote wakeup supported
 
-#define USB_CONFIG_MAX_POWER(ma) (((ma) + 1) / 2)  //!< Max power in mA
+#define USB_CONFIG_MAX_POWER(ma) (((ma) + 1) / 2) //!< Max power in mA
 
 /**
  * \brief Standard USB association descriptor structure
  */
 typedef struct {
-    uint8_t bLength;            //!< Size of this descriptor in bytes
-    uint8_t bDescriptorType;    //!< Interface descriptor type
-    uint8_t bFirstInterface;    //!< Number of interface
-    uint8_t bInterfaceCount;    //!< value to select alternate setting
-    uint8_t bFunctionClass;     //!< Class code assigned by the USB
-    uint8_t bFunctionSubClass;  //!< Sub-class code assigned by the USB
-    uint8_t bFunctionProtocol;  //!< Protocol code assigned by the USB
-    uint8_t iFunction;          //!< Index of string descriptor
+    uint8_t bLength;           //!< Size of this descriptor in bytes
+    uint8_t bDescriptorType;   //!< Interface descriptor type
+    uint8_t bFirstInterface;   //!< Number of interface
+    uint8_t bInterfaceCount;   //!< value to select alternate setting
+    uint8_t bFunctionClass;    //!< Class code assigned by the USB
+    uint8_t bFunctionSubClass; //!< Sub-class code assigned by the USB
+    uint8_t bFunctionProtocol; //!< Protocol code assigned by the USB
+    uint8_t iFunction;         //!< Index of string descriptor
 } usb_iad_desc_t;
 
 /**
diff --git a/tmk_core/protocol/arm_atsam/usb/usb_protocol_cdc.h b/tmk_core/protocol/arm_atsam/usb/usb_protocol_cdc.h
index f35503a3be..1d36d58dbd 100644
--- a/tmk_core/protocol/arm_atsam/usb/usb_protocol_cdc.h
+++ b/tmk_core/protocol/arm_atsam/usb/usb_protocol_cdc.h
@@ -50,41 +50,41 @@
 
 #ifdef VIRTSER_ENABLE
 
-#    define CDC_CLASS_DEVICE 0x02  //!< USB Communication Device Class
-#    define CDC_CLASS_COMM 0x02    //!< CDC Communication Class Interface
-#    define CDC_CLASS_DATA 0x0A    //!< CDC Data Class Interface
+#    define CDC_CLASS_DEVICE 0x02 //!< USB Communication Device Class
+#    define CDC_CLASS_COMM 0x02   //!< CDC Communication Class Interface
+#    define CDC_CLASS_DATA 0x0A   //!< CDC Data Class Interface
 
-#    define CDC_SUBCLASS_DLCM 0x01  //!< Direct Line Control Model
-#    define CDC_SUBCLASS_ACM 0x02   //!< Abstract Control Model
-#    define CDC_SUBCLASS_TCM 0x03   //!< Telephone Control Model
-#    define CDC_SUBCLASS_MCCM 0x04  //!< Multi-Channel Control Model
-#    define CDC_SUBCLASS_CCM 0x05   //!< CAPI Control Model
-#    define CDC_SUBCLASS_ETH 0x06   //!< Ethernet Networking Control Model
-#    define CDC_SUBCLASS_ATM 0x07   //!< ATM Networking Control Model
+#    define CDC_SUBCLASS_DLCM 0x01 //!< Direct Line Control Model
+#    define CDC_SUBCLASS_ACM 0x02  //!< Abstract Control Model
+#    define CDC_SUBCLASS_TCM 0x03  //!< Telephone Control Model
+#    define CDC_SUBCLASS_MCCM 0x04 //!< Multi-Channel Control Model
+#    define CDC_SUBCLASS_CCM 0x05  //!< CAPI Control Model
+#    define CDC_SUBCLASS_ETH 0x06  //!< Ethernet Networking Control Model
+#    define CDC_SUBCLASS_ATM 0x07  //!< ATM Networking Control Model
 
-#    define CDC_PROTOCOL_V25TER 0x01  //!< Common AT commands
+#    define CDC_PROTOCOL_V25TER 0x01 //!< Common AT commands
 
-#    define CDC_PROTOCOL_I430 0x30    //!< ISDN BRI
-#    define CDC_PROTOCOL_HDLC 0x31    //!< HDLC
-#    define CDC_PROTOCOL_TRANS 0x32   //!< Transparent
-#    define CDC_PROTOCOL_Q921M 0x50   //!< Q.921 management protocol
-#    define CDC_PROTOCOL_Q921 0x51    //!< Q.931 [sic] Data link protocol
-#    define CDC_PROTOCOL_Q921TM 0x52  //!< Q.921 TEI-multiplexor
-#    define CDC_PROTOCOL_V42BIS 0x90  //!< Data compression procedures
-#    define CDC_PROTOCOL_Q931 0x91    //!< Euro-ISDN protocol control
-#    define CDC_PROTOCOL_V120 0x92    //!< V.24 rate adaption to ISDN
-#    define CDC_PROTOCOL_CAPI20 0x93  //!< CAPI Commands
-#    define CDC_PROTOCOL_HOST 0xFD    //!< Host based driver
+#    define CDC_PROTOCOL_I430 0x30   //!< ISDN BRI
+#    define CDC_PROTOCOL_HDLC 0x31   //!< HDLC
+#    define CDC_PROTOCOL_TRANS 0x32  //!< Transparent
+#    define CDC_PROTOCOL_Q921M 0x50  //!< Q.921 management protocol
+#    define CDC_PROTOCOL_Q921 0x51   //!< Q.931 [sic] Data link protocol
+#    define CDC_PROTOCOL_Q921TM 0x52 //!< Q.921 TEI-multiplexor
+#    define CDC_PROTOCOL_V42BIS 0x90 //!< Data compression procedures
+#    define CDC_PROTOCOL_Q931 0x91   //!< Euro-ISDN protocol control
+#    define CDC_PROTOCOL_V120 0x92   //!< V.24 rate adaption to ISDN
+#    define CDC_PROTOCOL_CAPI20 0x93 //!< CAPI Commands
+#    define CDC_PROTOCOL_HOST 0xFD   //!< Host based driver
 
 #    define CDC_PROTOCOL_PUFD 0xFE
 
-#    define CDC_CS_INTERFACE 0x24  //!< Interface Functional Descriptor
-#    define CDC_CS_ENDPOINT 0x25   //!< Endpoint Functional Descriptor
+#    define CDC_CS_INTERFACE 0x24 //!< Interface Functional Descriptor
+#    define CDC_CS_ENDPOINT 0x25  //!< Endpoint Functional Descriptor
 
-#    define CDC_SCS_HEADER 0x00     //!< Header Functional Descriptor
-#    define CDC_SCS_CALL_MGMT 0x01  //!< Call Management
-#    define CDC_SCS_ACM 0x02        //!< Abstract Control Management
-#    define CDC_SCS_UNION 0x06      //!< Union Functional Descriptor
+#    define CDC_SCS_HEADER 0x00    //!< Header Functional Descriptor
+#    define CDC_SCS_CALL_MGMT 0x01 //!< Call Management
+#    define CDC_SCS_ACM 0x02       //!< Abstract Control Management
+#    define CDC_SCS_UNION 0x06     //!< Union Functional Descriptor
 
 #    define USB_REQ_CDC_SEND_ENCAPSULATED_COMMAND 0x00
 #    define USB_REQ_CDC_GET_ENCAPSULATED_RESPONSE 0x01
@@ -144,17 +144,17 @@ typedef struct {
 #    pragma pack(pop)
 
 enum cdc_char_format {
-    CDC_STOP_BITS_1   = 0,  //!< 1 stop bit
-    CDC_STOP_BITS_1_5 = 1,  //!< 1.5 stop bits
-    CDC_STOP_BITS_2   = 2,  //!< 2 stop bits
+    CDC_STOP_BITS_1   = 0, //!< 1 stop bit
+    CDC_STOP_BITS_1_5 = 1, //!< 1.5 stop bits
+    CDC_STOP_BITS_2   = 2, //!< 2 stop bits
 };
 
 enum cdc_parity {
-    CDC_PAR_NONE  = 0,  //!< No parity
-    CDC_PAR_ODD   = 1,  //!< Odd parity
-    CDC_PAR_EVEN  = 2,  //!< Even parity
-    CDC_PAR_MARK  = 3,  //!< Parity forced to 0 (space)
-    CDC_PAR_SPACE = 4,  //!< Parity forced to 1 (mark)
+    CDC_PAR_NONE  = 0, //!< No parity
+    CDC_PAR_ODD   = 1, //!< Odd parity
+    CDC_PAR_EVEN  = 2, //!< Even parity
+    CDC_PAR_MARK  = 3, //!< Parity forced to 0 (space)
+    CDC_PAR_SPACE = 4, //!< Parity forced to 1 (mark)
 };
 
 typedef struct {
@@ -187,4 +187,4 @@ typedef struct {
 
 #endif
 
-#endif  // _USB_PROTOCOL_CDC_H_
+#endif // _USB_PROTOCOL_CDC_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/usb_protocol_hid.h b/tmk_core/protocol/arm_atsam/usb/usb_protocol_hid.h
index fb97f63cef..c984c0762f 100644
--- a/tmk_core/protocol/arm_atsam/usb/usb_protocol_hid.h
+++ b/tmk_core/protocol/arm_atsam/usb/usb_protocol_hid.h
@@ -121,13 +121,13 @@ COMPILER_PACK_SET(1)
 
 //! \brief HID Descriptor
 typedef struct {
-    uint8_t bLength;            //!< Size of this descriptor in bytes
-    uint8_t bDescriptorType;    //!< HID descriptor type
-    le16_t  bcdHID;             //!< Binary Coded Decimal Spec. release
-    uint8_t bCountryCode;       //!< Hardware target country
-    uint8_t bNumDescriptors;    //!< Number of HID class descriptors to follow
-    uint8_t bRDescriptorType;   //!< Report descriptor type
-    le16_t  wDescriptorLength;  //!< Total length of Report descriptor
+    uint8_t bLength;           //!< Size of this descriptor in bytes
+    uint8_t bDescriptorType;   //!< HID descriptor type
+    le16_t  bcdHID;            //!< Binary Coded Decimal Spec. release
+    uint8_t bCountryCode;      //!< Hardware target country
+    uint8_t bNumDescriptors;   //!< Number of HID class descriptors to follow
+    uint8_t bRDescriptorType;  //!< Report descriptor type
+    le16_t  wDescriptorLength; //!< Total length of Report descriptor
 } usb_hid_descriptor_t;
 
 COMPILER_PACK_RESET()
@@ -151,45 +151,45 @@ COMPILER_PACK_RESET()
 
 //! \name Country code
 //! @{
-#define USB_HID_NO_COUNTRY_CODE 0             // Not Supported
-#define USB_HID_COUNTRY_ARABIC 1              // Arabic
-#define USB_HID_COUNTRY_BELGIAN 2             // Belgian
-#define USB_HID_COUNTRY_CANADIAN_BILINGUAL 3  // Canadian-Bilingual
-#define USB_HID_COUNTRY_CANADIAN_FRENCH 4     // Canadian-French
-#define USB_HID_COUNTRY_CZECH_REPUBLIC 5      // Czech Republic
-#define USB_HID_COUNTRY_DANISH 6              // Danish
-#define USB_HID_COUNTRY_FINNISH 7             // Finnish
-#define USB_HID_COUNTRY_FRENCH 8              // French
-#define USB_HID_COUNTRY_GERMAN 9              // German
-#define USB_HID_COUNTRY_GREEK 10              // Greek
-#define USB_HID_COUNTRY_HEBREW 11             // Hebrew
-#define USB_HID_COUNTRY_HUNGARY 12            // Hungary
-#define USB_HID_COUNTRY_INTERNATIONAL_ISO 13  // International (ISO)
-#define USB_HID_COUNTRY_ITALIAN 14            // Italian
-#define USB_HID_COUNTRY_JAPAN_KATAKANA 15     // Japan (Katakana)
-#define USB_HID_COUNTRY_KOREAN 16             // Korean
-#define USB_HID_COUNTRY_LATIN_AMERICAN 17     // Latin American
-#define USB_HID_COUNTRY_NETHERLANDS_DUTCH 18  // Netherlands/Dutch
-#define USB_HID_COUNTRY_NORWEGIAN 19          // Norwegian
-#define USB_HID_COUNTRY_PERSIAN_FARSI 20      // Persian (Farsi)
-#define USB_HID_COUNTRY_POLAND 21             // Poland
-#define USB_HID_COUNTRY_PORTUGUESE 22         // Portuguese
-#define USB_HID_COUNTRY_RUSSIA 23             // Russia
-#define USB_HID_COUNTRY_SLOVAKIA 24           // Slovakia
-#define USB_HID_COUNTRY_SPANISH 25            // Spanish
-#define USB_HID_COUNTRY_SWEDISH 26            // Swedish
-#define USB_HID_COUNTRY_SWISS_FRENCH 27       // Swiss/French
-#define USB_HID_COUNTRY_SWISS_GERMAN 28       // Swiss/German
-#define USB_HID_COUNTRY_SWITZERLAND 29        // Switzerland
-#define USB_HID_COUNTRY_TAIWAN 30             // Taiwan
-#define USB_HID_COUNTRY_TURKISH_Q 31          // Turkish-Q
-#define USB_HID_COUNTRY_UK 32                 // UK
-#define USB_HID_COUNTRY_US 33                 // US
-#define USB_HID_COUNTRY_YUGOSLAVIA 34         // Yugoslavia
+#define USB_HID_NO_COUNTRY_CODE 0            // Not Supported
+#define USB_HID_COUNTRY_ARABIC 1             // Arabic
+#define USB_HID_COUNTRY_BELGIAN 2            // Belgian
+#define USB_HID_COUNTRY_CANADIAN_BILINGUAL 3 // Canadian-Bilingual
+#define USB_HID_COUNTRY_CANADIAN_FRENCH 4    // Canadian-French
+#define USB_HID_COUNTRY_CZECH_REPUBLIC 5     // Czech Republic
+#define USB_HID_COUNTRY_DANISH 6             // Danish
+#define USB_HID_COUNTRY_FINNISH 7            // Finnish
+#define USB_HID_COUNTRY_FRENCH 8             // French
+#define USB_HID_COUNTRY_GERMAN 9             // German
+#define USB_HID_COUNTRY_GREEK 10             // Greek
+#define USB_HID_COUNTRY_HEBREW 11            // Hebrew
+#define USB_HID_COUNTRY_HUNGARY 12           // Hungary
+#define USB_HID_COUNTRY_INTERNATIONAL_ISO 13 // International (ISO)
+#define USB_HID_COUNTRY_ITALIAN 14           // Italian
+#define USB_HID_COUNTRY_JAPAN_KATAKANA 15    // Japan (Katakana)
+#define USB_HID_COUNTRY_KOREAN 16            // Korean
+#define USB_HID_COUNTRY_LATIN_AMERICAN 17    // Latin American
+#define USB_HID_COUNTRY_NETHERLANDS_DUTCH 18 // Netherlands/Dutch
+#define USB_HID_COUNTRY_NORWEGIAN 19         // Norwegian
+#define USB_HID_COUNTRY_PERSIAN_FARSI 20     // Persian (Farsi)
+#define USB_HID_COUNTRY_POLAND 21            // Poland
+#define USB_HID_COUNTRY_PORTUGUESE 22        // Portuguese
+#define USB_HID_COUNTRY_RUSSIA 23            // Russia
+#define USB_HID_COUNTRY_SLOVAKIA 24          // Slovakia
+#define USB_HID_COUNTRY_SPANISH 25           // Spanish
+#define USB_HID_COUNTRY_SWEDISH 26           // Swedish
+#define USB_HID_COUNTRY_SWISS_FRENCH 27      // Swiss/French
+#define USB_HID_COUNTRY_SWISS_GERMAN 28      // Swiss/German
+#define USB_HID_COUNTRY_SWITZERLAND 29       // Switzerland
+#define USB_HID_COUNTRY_TAIWAN 30            // Taiwan
+#define USB_HID_COUNTRY_TURKISH_Q 31         // Turkish-Q
+#define USB_HID_COUNTRY_UK 32                // UK
+#define USB_HID_COUNTRY_US 33                // US
+#define USB_HID_COUNTRY_YUGOSLAVIA 34        // Yugoslavia
 #define USB_HID_COUNTRY_TURKISH_F \
-    35  // Turkish-F
-        //! @}
-        //! @}
+    35 // Turkish-F
+       //! @}
+       //! @}
 //! @}
 
 //! \name HID KEYS values
@@ -237,12 +237,12 @@ COMPILER_PACK_RESET()
 #define HID_SPACEBAR 44
 #define HID_UNDERSCORE 45
 #define HID_PLUS 46
-#define HID_OPEN_BRACKET 47   // {
-#define HID_CLOSE_BRACKET 48  // }
+#define HID_OPEN_BRACKET 47  // {
+#define HID_CLOSE_BRACKET 48 // }
 #define HID_BACKSLASH 49
-#define HID_ASH 50    // # ~
-#define HID_COLON 51  // ; :
-#define HID_QUOTE 52  // ' "
+#define HID_ASH 50   // # ~
+#define HID_COLON 51 // ; :
+#define HID_QUOTE 52 // ' "
 #define HID_TILDE 53
 #define HID_COMMA 54
 #define HID_DOT 55
@@ -314,4 +314,4 @@ COMPILER_PACK_RESET()
 #define HID_LED_KANA (1 << 4)
 //! @}
 
-#endif  // _USB_PROTOCOL_HID_H_
+#endif // _USB_PROTOCOL_HID_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/usb_util.c b/tmk_core/protocol/arm_atsam/usb/usb_util.c
index a682c00b58..c7555c84c6 100644
--- a/tmk_core/protocol/arm_atsam/usb/usb_util.c
+++ b/tmk_core/protocol/arm_atsam/usb/usb_util.c
@@ -11,17 +11,17 @@ char digit(int d, int radix) {
 }
 
 int UTIL_ltoa_radix(int64_t value, char *dest, int radix) {
-    int64_t original = value;  // save original value
+    int64_t original = value; // save original value
     char    buf[25]  = "";
     int     c        = sizeof(buf) - 1;
     int     last     = c;
     int     d;
     int     size;
 
-    if (value < 0)  // if it's negative, take the absolute value
+    if (value < 0) // if it's negative, take the absolute value
         value = -value;
 
-    do  // write least significant digit of value that's left
+    do // write least significant digit of value that's left
     {
         d        = (value % radix);
         buf[--c] = digit(d, radix);
@@ -30,14 +30,20 @@ int UTIL_ltoa_radix(int64_t value, char *dest, int radix) {
 
     if (original < 0) buf[--c] = '-';
 
-    size = last - c + 1;  // includes null at end
+    size = last - c + 1; // includes null at end
     memcpy(dest, &buf[c], last - c + 1);
 
-    return (size - 1);  // without null termination
+    return (size - 1); // without null termination
 }
 
-int UTIL_ltoa(int64_t value, char *dest) { return UTIL_ltoa_radix(value, dest, 10); }
+int UTIL_ltoa(int64_t value, char *dest) {
+    return UTIL_ltoa_radix(value, dest, 10);
+}
 
-int UTIL_itoa(int value, char *dest) { return UTIL_ltoa_radix((int64_t)value, dest, 10); }
+int UTIL_itoa(int value, char *dest) {
+    return UTIL_ltoa_radix((int64_t)value, dest, 10);
+}
 
-int UTIL_utoa(uint32_t value, char *dest) { return UTIL_ltoa_radix((int64_t)value, dest, 10); }
+int UTIL_utoa(uint32_t value, char *dest) {
+    return UTIL_ltoa_radix((int64_t)value, dest, 10);
+}
diff --git a/tmk_core/protocol/arm_atsam/usb/usb_util.h b/tmk_core/protocol/arm_atsam/usb/usb_util.h
index 3bad2c26f2..3e5b4fbb32 100644
--- a/tmk_core/protocol/arm_atsam/usb/usb_util.h
+++ b/tmk_core/protocol/arm_atsam/usb/usb_util.h
@@ -6,4 +6,4 @@ int UTIL_ltoa(int64_t value, char *dest);
 int UTIL_itoa(int value, char *dest);
 int UTIL_utoa(uint32_t value, char *dest);
 
-#endif  //_USB_UTIL_H_
+#endif //_USB_UTIL_H_
diff --git a/tmk_core/protocol/chibios/chibios.c b/tmk_core/protocol/chibios/chibios.c
index 41752b2130..c9a480c325 100644
--- a/tmk_core/protocol/chibios/chibios.c
+++ b/tmk_core/protocol/chibios/chibios.c
@@ -60,10 +60,11 @@ void    send_keyboard(report_keyboard_t *report);
 void    send_mouse(report_mouse_t *report);
 void    send_system(uint16_t data);
 void    send_consumer(uint16_t data);
+void    send_programmable_button(uint32_t data);
 void    send_digitizer(report_digitizer_t *report);
 
 /* host struct */
-host_driver_t chibios_driver = {keyboard_leds, send_keyboard, send_mouse, send_system, send_consumer};
+host_driver_t chibios_driver = {keyboard_leds, send_keyboard, send_mouse, send_system, send_consumer, send_programmable_button};
 
 #ifdef VIRTSER_ENABLE
 void virtser_task(void);
@@ -106,7 +107,7 @@ __attribute__((weak)) void early_hardware_init_pre(void) {
 #if EARLY_INIT_PERFORM_BOOTLOADER_JUMP
     void enter_bootloader_mode_if_requested(void);
     enter_bootloader_mode_if_requested();
-#endif  // EARLY_INIT_PERFORM_BOOTLOADER_JUMP
+#endif // EARLY_INIT_PERFORM_BOOTLOADER_JUMP
 }
 
 __attribute__((weak)) void early_hardware_init_post(void) {}
@@ -175,7 +176,9 @@ void protocol_pre_init(void) {
     print("USB configured.\n");
 }
 
-void protocol_post_init(void) { host_set_driver(driver); }
+void protocol_post_init(void) {
+    host_set_driver(driver);
+}
 
 void protocol_pre_task(void) {
     usb_event_queue_task();
@@ -185,7 +188,7 @@ void protocol_pre_task(void) {
         print("[s]");
         while (USB_DRIVER.state == USB_SUSPENDED) {
             /* Do this in the suspended state */
-            suspend_power_down();  // on AVR this deep sleeps for 15ms
+            suspend_power_down(); // on AVR this deep sleeps for 15ms
             /* Remote wakeup */
             if (suspend_wakeup_condition()) {
                 usbWakeupHost(&USB_DRIVER);
diff --git a/tmk_core/protocol/chibios/usb_driver.c b/tmk_core/protocol/chibios/usb_driver.c
index cc0ce7600f..4de060f306 100644
--- a/tmk_core/protocol/chibios/usb_driver.c
+++ b/tmk_core/protocol/chibios/usb_driver.c
@@ -80,21 +80,37 @@ static bool qmkusb_start_receive(QMKUSBDriver *qmkusbp) {
  * Interface implementation.
  */
 
-static size_t _write(void *ip, const uint8_t *bp, size_t n) { return obqWriteTimeout(&((QMKUSBDriver *)ip)->obqueue, bp, n, TIME_INFINITE); }
+static size_t _write(void *ip, const uint8_t *bp, size_t n) {
+    return obqWriteTimeout(&((QMKUSBDriver *)ip)->obqueue, bp, n, TIME_INFINITE);
+}
 
-static size_t _read(void *ip, uint8_t *bp, size_t n) { return ibqReadTimeout(&((QMKUSBDriver *)ip)->ibqueue, bp, n, TIME_INFINITE); }
+static size_t _read(void *ip, uint8_t *bp, size_t n) {
+    return ibqReadTimeout(&((QMKUSBDriver *)ip)->ibqueue, bp, n, TIME_INFINITE);
+}
 
-static msg_t _put(void *ip, uint8_t b) { return obqPutTimeout(&((QMKUSBDriver *)ip)->obqueue, b, TIME_INFINITE); }
+static msg_t _put(void *ip, uint8_t b) {
+    return obqPutTimeout(&((QMKUSBDriver *)ip)->obqueue, b, TIME_INFINITE);
+}
 
-static msg_t _get(void *ip) { return ibqGetTimeout(&((QMKUSBDriver *)ip)->ibqueue, TIME_INFINITE); }
+static msg_t _get(void *ip) {
+    return ibqGetTimeout(&((QMKUSBDriver *)ip)->ibqueue, TIME_INFINITE);
+}
 
-static msg_t _putt(void *ip, uint8_t b, sysinterval_t timeout) { return obqPutTimeout(&((QMKUSBDriver *)ip)->obqueue, b, timeout); }
+static msg_t _putt(void *ip, uint8_t b, sysinterval_t timeout) {
+    return obqPutTimeout(&((QMKUSBDriver *)ip)->obqueue, b, timeout);
+}
 
-static msg_t _gett(void *ip, sysinterval_t timeout) { return ibqGetTimeout(&((QMKUSBDriver *)ip)->ibqueue, timeout); }
+static msg_t _gett(void *ip, sysinterval_t timeout) {
+    return ibqGetTimeout(&((QMKUSBDriver *)ip)->ibqueue, timeout);
+}
 
-static size_t _writet(void *ip, const uint8_t *bp, size_t n, sysinterval_t timeout) { return obqWriteTimeout(&((QMKUSBDriver *)ip)->obqueue, bp, n, timeout); }
+static size_t _writet(void *ip, const uint8_t *bp, size_t n, sysinterval_t timeout) {
+    return obqWriteTimeout(&((QMKUSBDriver *)ip)->obqueue, bp, n, timeout);
+}
 
-static size_t _readt(void *ip, uint8_t *bp, size_t n, sysinterval_t timeout) { return ibqReadTimeout(&((QMKUSBDriver *)ip)->ibqueue, bp, n, timeout); }
+static size_t _readt(void *ip, uint8_t *bp, size_t n, sysinterval_t timeout) {
+    return ibqReadTimeout(&((QMKUSBDriver *)ip)->ibqueue, bp, n, timeout);
+}
 
 static const struct QMKUSBDriverVMT vmt = {0, _write, _read, _put, _get, _putt, _gett, _writet, _readt};
 
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index 541c44b574..d9aa351ecb 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -775,7 +775,9 @@ void kbd_in_cb(USBDriver *usbp, usbep_t ep) {
 /* start-of-frame handler
  * TODO: i guess it would be better to re-implement using timers,
  *  so that this is not going to have to be checked every 1ms */
-void kbd_sof_cb(USBDriver *usbp) { (void)usbp; }
+void kbd_sof_cb(USBDriver *usbp) {
+    (void)usbp;
+}
 
 /* Idle requests timer code
  * callback (called from ISR, unlocked state) */
@@ -815,7 +817,9 @@ static void keyboard_idle_timer_cb(void *arg) {
 }
 
 /* LED status */
-uint8_t keyboard_leds(void) { return keyboard_led_state; }
+uint8_t keyboard_leds(void) {
+    return keyboard_led_state;
+}
 
 /* prepare and start sending a report IN
  * not callable from ISR or locked state */
@@ -915,7 +919,9 @@ void send_mouse(report_mouse_t *report) {
 }
 
 #else  /* MOUSE_ENABLE */
-void send_mouse(report_mouse_t *report) { (void)report; }
+void send_mouse(report_mouse_t *report) {
+    (void)report;
+}
 #endif /* MOUSE_ENABLE */
 
 /* ---------------------------------------------------------
@@ -975,6 +981,35 @@ void send_consumer(uint16_t data) {
 #endif
 }
 
+void send_programmable_button(uint32_t data) {
+#ifdef PROGRAMMABLE_BUTTON_ENABLE
+    osalSysLock();
+    if (usbGetDriverStateI(&USB_DRIVER) != USB_ACTIVE) {
+        osalSysUnlock();
+        return;
+    }
+
+    if (usbGetTransmitStatusI(&USB_DRIVER, SHARED_IN_EPNUM)) {
+        /* Need to either suspend, or loop and call unlock/lock during
+         * every iteration - otherwise the system will remain locked,
+         * no interrupts served, so USB not going through as well.
+         * Note: for suspend, need USB_USE_WAIT == TRUE in halconf.h */
+        if (osalThreadSuspendTimeoutS(&(&USB_DRIVER)->epc[SHARED_IN_EPNUM]->in_state->thread, TIME_MS2I(10)) == MSG_TIMEOUT) {
+            osalSysUnlock();
+            return;
+        }
+    }
+    static report_programmable_button_t report = {
+        .report_id = REPORT_ID_PROGRAMMABLE_BUTTON,
+    };
+
+    report.usage = data;
+
+    usbStartTransmitI(&USB_DRIVER, SHARED_IN_EPNUM, (uint8_t *)&report, sizeof(report));
+    osalSysUnlock();
+#endif
+}
+
 void send_digitizer(report_digitizer_t *report) {
 #ifdef DIGITIZER_ENABLE
 #    ifdef DIGITIZER_SHARED_EP
@@ -1078,7 +1113,9 @@ void raw_hid_task(void) {
 
 #ifdef MIDI_ENABLE
 
-void send_midi_packet(MIDI_EventPacket_t *event) { chnWrite(&drivers.midi_driver.driver, (uint8_t *)event, sizeof(MIDI_EventPacket_t)); }
+void send_midi_packet(MIDI_EventPacket_t *event) {
+    chnWrite(&drivers.midi_driver.driver, (uint8_t *)event, sizeof(MIDI_EventPacket_t));
+}
 
 bool recv_midi_packet(MIDI_EventPacket_t *const event) {
     size_t size = chnReadTimeout(&drivers.midi_driver.driver, (uint8_t *)event, sizeof(MIDI_EventPacket_t), TIME_IMMEDIATE);
@@ -1101,7 +1138,9 @@ void midi_ep_task(void) {
 
 void virtser_init(void) {}
 
-void virtser_send(const uint8_t byte) { chnWrite(&drivers.serial_driver.driver, &byte, 1); }
+void virtser_send(const uint8_t byte) {
+    chnWrite(&drivers.serial_driver.driver, &byte, 1);
+}
 
 __attribute__((weak)) void virtser_recv(uint8_t c) {
     // Ignore by default
@@ -1145,7 +1184,7 @@ void send_joystick_packet(joystick_t *joystick) {
           joystick->axes[5],
 #        endif
         },
-#    endif  // JOYSTICK_AXES_COUNT>0
+#    endif // JOYSTICK_AXES_COUNT>0
 
 #    if JOYSTICK_BUTTON_COUNT > 0
         .buttons = {
@@ -1161,7 +1200,7 @@ void send_joystick_packet(joystick_t *joystick) {
             joystick->buttons[3],
 #        endif
         }
-#    endif  // JOYSTICK_BUTTON_COUNT>0
+#    endif // JOYSTICK_BUTTON_COUNT>0
     };
 
     // chnWrite(&drivers.joystick_driver.driver, (uint8_t *)&rep, sizeof(rep));
diff --git a/tmk_core/protocol/chibios/usb_util.c b/tmk_core/protocol/chibios/usb_util.c
index e32d6ebfa4..c8b435db0c 100644
--- a/tmk_core/protocol/chibios/usb_util.c
+++ b/tmk_core/protocol/chibios/usb_util.c
@@ -16,6 +16,10 @@
 #include <hal.h>
 #include "usb_util.h"
 
-void usb_disconnect(void) { usbStop(&USBD1); }
+void usb_disconnect(void) {
+    usbStop(&USBD1);
+}
 
-bool usb_connected_state(void) { return usbGetDriverStateI(&USBD1) == USB_ACTIVE; }
+bool usb_connected_state(void) {
+    return usbGetDriverStateI(&USBD1) == USB_ACTIVE;
+}
diff --git a/tmk_core/protocol/host.c b/tmk_core/protocol/host.c
index 56d4bb0847..053d2b79e3 100644
--- a/tmk_core/protocol/host.c
+++ b/tmk_core/protocol/host.c
@@ -34,13 +34,19 @@ static uint16_t       last_system_report              = 0;
 static uint16_t       last_consumer_report            = 0;
 static uint32_t       last_programmable_button_report = 0;
 
-void host_set_driver(host_driver_t *d) { driver = d; }
+void host_set_driver(host_driver_t *d) {
+    driver = d;
+}
 
-host_driver_t *host_get_driver(void) { return driver; }
+host_driver_t *host_get_driver(void) {
+    return driver;
+}
 
 #ifdef SPLIT_KEYBOARD
 uint8_t split_led_state = 0;
-void    set_split_host_keyboard_leds(uint8_t led_state) { split_led_state = led_state; }
+void    set_split_host_keyboard_leds(uint8_t led_state) {
+    split_led_state = led_state;
+}
 #endif
 
 uint8_t host_keyboard_leds(void) {
@@ -51,7 +57,9 @@ uint8_t host_keyboard_leds(void) {
     return (*driver->keyboard_leds)();
 }
 
-led_t host_keyboard_led_state(void) { return (led_t)host_keyboard_leds(); }
+led_t host_keyboard_led_state(void) {
+    return (led_t)host_keyboard_leds();
+}
 
 /* send report */
 void host_keyboard_send(report_keyboard_t *report) {
@@ -131,8 +139,14 @@ void host_programmable_button_send(uint32_t report) {
     (*driver->send_programmable_button)(report);
 }
 
-uint16_t host_last_system_report(void) { return last_system_report; }
+uint16_t host_last_system_report(void) {
+    return last_system_report;
+}
 
-uint16_t host_last_consumer_report(void) { return last_consumer_report; }
+uint16_t host_last_consumer_report(void) {
+    return last_consumer_report;
+}
 
-uint32_t host_last_programmable_button_report(void) { return last_programmable_button_report; }
+uint32_t host_last_programmable_button_report(void) {
+    return last_programmable_button_report;
+}
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index f6eee7b4f2..47c3d30c3c 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -342,7 +342,8 @@ static void Console_Task(void) {
     }
 
     // fill empty bank
-    while (Endpoint_IsReadWriteAllowed()) Endpoint_Write_8(0);
+    while (Endpoint_IsReadWriteAllowed())
+        Endpoint_Write_8(0);
 
     // flush sendchar packet
     if (Endpoint_IsINReady()) {
@@ -382,7 +383,7 @@ void send_joystick_packet(joystick_t *joystick) {
           joystick->axes[5],
 #        endif
         },
-#    endif  // JOYSTICK_AXES_COUNT>0
+#    endif // JOYSTICK_AXES_COUNT>0
 
 #    if JOYSTICK_BUTTON_COUNT > 0
         .buttons = {
@@ -398,14 +399,15 @@ void send_joystick_packet(joystick_t *joystick) {
             joystick->buttons[3],
 #        endif
         }
-#    endif  // JOYSTICK_BUTTON_COUNT>0
+#    endif // JOYSTICK_BUTTON_COUNT>0
     };
 
     /* Select the Joystick Report Endpoint */
     Endpoint_SelectEndpoint(JOYSTICK_IN_EPNUM);
 
     /* Check if write ready for a polling interval around 10ms */
-    while (timeout-- && !Endpoint_IsReadWriteAllowed()) _delay_us(40);
+    while (timeout-- && !Endpoint_IsReadWriteAllowed())
+        _delay_us(40);
     if (!Endpoint_IsReadWriteAllowed()) return;
 
     /* Write Joystick Report Data */
@@ -500,9 +502,11 @@ void EVENT_USB_Device_WakeUp() {
 
 #ifdef CONSOLE_ENABLE
 static bool console_flush = false;
-#    define CONSOLE_FLUSH_SET(b)                                     \
-        do {                                                         \
-            ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { console_flush = b; } \
+#    define CONSOLE_FLUSH_SET(b)                \
+        do {                                    \
+            ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { \
+                console_flush = b;              \
+            }                                   \
         } while (0)
 
 /** \brief Event USB Device Start Of Frame
@@ -726,7 +730,9 @@ void EVENT_USB_Device_ControlRequest(void) {
  *
  * FIXME: Needs doc
  */
-static uint8_t keyboard_leds(void) { return keyboard_led_state; }
+static uint8_t keyboard_leds(void) {
+    return keyboard_led_state;
+}
 
 /** \brief Send Keyboard
  *
@@ -757,7 +763,8 @@ static void send_keyboard(report_keyboard_t *report) {
 #endif
     Endpoint_SelectEndpoint(ep);
     /* Check if write ready for a polling interval around 10ms */
-    while (timeout-- && !Endpoint_IsReadWriteAllowed()) _delay_us(40);
+    while (timeout-- && !Endpoint_IsReadWriteAllowed())
+        _delay_us(40);
     if (!Endpoint_IsReadWriteAllowed()) return;
 
     /* If we're in Boot Protocol, don't send any report ID or other funky fields */
@@ -797,7 +804,8 @@ static void send_mouse(report_mouse_t *report) {
     Endpoint_SelectEndpoint(MOUSE_IN_EPNUM);
 
     /* Check if write ready for a polling interval around 10ms */
-    while (timeout-- && !Endpoint_IsReadWriteAllowed()) _delay_us(40);
+    while (timeout-- && !Endpoint_IsReadWriteAllowed())
+        _delay_us(40);
     if (!Endpoint_IsReadWriteAllowed()) return;
 
     /* Write Mouse Report Data */
@@ -817,7 +825,8 @@ static void send_report(void *report, size_t size) {
     Endpoint_SelectEndpoint(SHARED_IN_EPNUM);
 
     /* Check if write ready for a polling interval around 10ms */
-    while (timeout-- && !Endpoint_IsReadWriteAllowed()) _delay_us(40);
+    while (timeout-- && !Endpoint_IsReadWriteAllowed())
+        _delay_us(40);
     if (!Endpoint_IsReadWriteAllowed()) return;
 
     Endpoint_Write_Stream_LE(report, size, NULL);
@@ -968,9 +977,13 @@ USB_ClassInfo_MIDI_Device_t USB_MIDI_Interface = {
 
 // clang-format on
 
-void send_midi_packet(MIDI_EventPacket_t *event) { MIDI_Device_SendEventPacket(&USB_MIDI_Interface, event); }
+void send_midi_packet(MIDI_EventPacket_t *event) {
+    MIDI_Device_SendEventPacket(&USB_MIDI_Interface, event);
+}
 
-bool recv_midi_packet(MIDI_EventPacket_t *const event) { return MIDI_Device_ReceiveEventPacket(&USB_MIDI_Interface, event); }
+bool recv_midi_packet(MIDI_EventPacket_t *const event) {
+    return MIDI_Device_ReceiveEventPacket(&USB_MIDI_Interface, event);
+}
 
 #endif
 
@@ -1026,7 +1039,8 @@ void virtser_send(const uint8_t byte) {
             return;
         }
 
-        while (timeout-- && !Endpoint_IsReadWriteAllowed()) _delay_us(40);
+        while (timeout-- && !Endpoint_IsReadWriteAllowed())
+            _delay_us(40);
 
         Endpoint_Write_8(byte);
         CDC_Device_Flush(&cdc_device);
@@ -1049,7 +1063,8 @@ void send_digitizer(report_digitizer_t *report) {
     Endpoint_SelectEndpoint(DIGITIZER_IN_EPNUM);
 
     /* Check if write ready for a polling interval around 10ms */
-    while (timeout-- && !Endpoint_IsReadWriteAllowed()) _delay_us(40);
+    while (timeout-- && !Endpoint_IsReadWriteAllowed())
+        _delay_us(40);
     if (!Endpoint_IsReadWriteAllowed()) return;
 
     Endpoint_Write_Stream_LE(report, sizeof(report_digitizer_t), NULL);
@@ -1125,7 +1140,9 @@ void protocol_pre_init(void) {
 #endif
 }
 
-void protocol_post_init(void) { host_set_driver(&lufa_driver); }
+void protocol_post_init(void) {
+    host_set_driver(&lufa_driver);
+}
 
 void protocol_pre_task(void) {
 #if !defined(NO_USB_STARTUP_CHECK)
@@ -1180,4 +1197,6 @@ void protocol_post_task(void) {
 #endif
 }
 
-uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint16_t wIndex, const void **const DescriptorAddress) { return get_usb_descriptor(wValue, wIndex, DescriptorAddress); }
+uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint16_t wIndex, const void **const DescriptorAddress) {
+    return get_usb_descriptor(wValue, wIndex, DescriptorAddress);
+}
diff --git a/tmk_core/protocol/lufa/usb_util.c b/tmk_core/protocol/lufa/usb_util.c
index 9691eff1e4..2e3b86b80e 100644
--- a/tmk_core/protocol/lufa/usb_util.c
+++ b/tmk_core/protocol/lufa/usb_util.c
@@ -22,13 +22,15 @@ void usb_disconnect(void) {
     USB_DeviceState = DEVICE_STATE_Unattached;
 }
 
-bool usb_connected_state(void) { return USB_Device_IsAddressSet(); }
+bool usb_connected_state(void) {
+    return USB_Device_IsAddressSet();
+}
 
 #if defined(OTGPADE)
 bool usb_vbus_state(void) {
-    USB_OTGPAD_On();  // enables VBUS pad
+    USB_OTGPAD_On(); // enables VBUS pad
     wait_us(5);
 
-    return USB_VBUS_GetStatus();  // checks state of VBUS
+    return USB_VBUS_GetStatus(); // checks state of VBUS
 }
 #endif
diff --git a/tmk_core/protocol/midi/bytequeue/bytequeue.c b/tmk_core/protocol/midi/bytequeue/bytequeue.c
index e36a9e66b1..0dd18680f0 100644
--- a/tmk_core/protocol/midi/bytequeue/bytequeue.c
+++ b/tmk_core/protocol/midi/bytequeue/bytequeue.c
@@ -52,7 +52,9 @@ byteQueueIndex_t bytequeue_length(byteQueue_t* queue) {
 }
 
 // we don't need to avoid interrupts if there is only one reader
-uint8_t bytequeue_get(byteQueue_t* queue, byteQueueIndex_t index) { return queue->data[(queue->start + index) % queue->length]; }
+uint8_t bytequeue_get(byteQueue_t* queue, byteQueueIndex_t index) {
+    return queue->data[(queue->start + index) % queue->length];
+}
 
 // we just update the start index to remove elements
 void bytequeue_remove(byteQueue_t* queue, byteQueueIndex_t numToRemove) {
diff --git a/tmk_core/protocol/midi/bytequeue/interrupt_setting.c b/tmk_core/protocol/midi/bytequeue/interrupt_setting.c
index 407cc65f49..d9c0035946 100644
--- a/tmk_core/protocol/midi/bytequeue/interrupt_setting.c
+++ b/tmk_core/protocol/midi/bytequeue/interrupt_setting.c
@@ -30,7 +30,9 @@ interrupt_setting_t store_and_clear_interrupt(void) {
     return sreg;
 }
 
-void restore_interrupt_setting(interrupt_setting_t setting) { SREG = setting; }
+void restore_interrupt_setting(interrupt_setting_t setting) {
+    SREG = setting;
+}
 #elif defined(__arm__)
 #    include <ch.h>
 
@@ -39,5 +41,7 @@ interrupt_setting_t store_and_clear_interrupt(void) {
     return 0;
 }
 
-void restore_interrupt_setting(interrupt_setting_t setting) { chSysUnlock(); }
+void restore_interrupt_setting(interrupt_setting_t setting) {
+    chSysUnlock();
+}
 #endif
diff --git a/tmk_core/protocol/midi/midi.c b/tmk_core/protocol/midi/midi.c
index 643c43722d..f3792552f4 100644
--- a/tmk_core/protocol/midi/midi.c
+++ b/tmk_core/protocol/midi/midi.c
@@ -17,7 +17,7 @@
 // along with avr-midi.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "midi.h"
-#include <string.h>  //for memcpy
+#include <string.h> //for memcpy
 
 #define MIN(x, y) (((x) < (y)) ? (x) : (y))
 
@@ -25,9 +25,13 @@
 #    define NULL 0
 #endif
 
-bool midi_is_statusbyte(uint8_t theByte) { return (bool)(theByte & MIDI_STATUSMASK); }
+bool midi_is_statusbyte(uint8_t theByte) {
+    return (bool)(theByte & MIDI_STATUSMASK);
+}
 
-bool midi_is_realtime(uint8_t theByte) { return (theByte >= MIDI_CLOCK); }
+bool midi_is_realtime(uint8_t theByte) {
+    return (theByte >= MIDI_CLOCK);
+}
 
 midi_packet_length_t midi_packet_length(uint8_t status) {
     switch (status & 0xF0) {
@@ -83,7 +87,9 @@ void midi_send_noteoff(MidiDevice* device, uint8_t chan, uint8_t num, uint8_t ve
     device->send_func(device, 3, MIDI_NOTEOFF | (chan & MIDI_CHANMASK), num & 0x7F, vel & 0x7F);
 }
 
-void midi_send_aftertouch(MidiDevice* device, uint8_t chan, uint8_t note_num, uint8_t amt) { device->send_func(device, 3, MIDI_AFTERTOUCH | (chan & MIDI_CHANMASK), note_num & 0x7F, amt & 0x7F); }
+void midi_send_aftertouch(MidiDevice* device, uint8_t chan, uint8_t note_num, uint8_t amt) {
+    device->send_func(device, 3, MIDI_AFTERTOUCH | (chan & MIDI_CHANMASK), note_num & 0x7F, amt & 0x7F);
+}
 
 // XXX does this work right?
 // amt in range -0x2000, 0x1fff
@@ -102,34 +108,62 @@ void midi_send_pitchbend(MidiDevice* device, uint8_t chan, int16_t amt) {
     device->send_func(device, 3, MIDI_PITCHBEND | (chan & MIDI_CHANMASK), uAmt & 0x7F, (uAmt >> 7) & 0x7F);
 }
 
-void midi_send_programchange(MidiDevice* device, uint8_t chan, uint8_t num) { device->send_func(device, 2, MIDI_PROGCHANGE | (chan & MIDI_CHANMASK), num & 0x7F, 0); }
+void midi_send_programchange(MidiDevice* device, uint8_t chan, uint8_t num) {
+    device->send_func(device, 2, MIDI_PROGCHANGE | (chan & MIDI_CHANMASK), num & 0x7F, 0);
+}
 
-void midi_send_channelpressure(MidiDevice* device, uint8_t chan, uint8_t amt) { device->send_func(device, 2, MIDI_CHANPRESSURE | (chan & MIDI_CHANMASK), amt & 0x7F, 0); }
+void midi_send_channelpressure(MidiDevice* device, uint8_t chan, uint8_t amt) {
+    device->send_func(device, 2, MIDI_CHANPRESSURE | (chan & MIDI_CHANMASK), amt & 0x7F, 0);
+}
 
-void midi_send_clock(MidiDevice* device) { device->send_func(device, 1, MIDI_CLOCK, 0, 0); }
+void midi_send_clock(MidiDevice* device) {
+    device->send_func(device, 1, MIDI_CLOCK, 0, 0);
+}
 
-void midi_send_tick(MidiDevice* device) { device->send_func(device, 1, MIDI_TICK, 0, 0); }
+void midi_send_tick(MidiDevice* device) {
+    device->send_func(device, 1, MIDI_TICK, 0, 0);
+}
 
-void midi_send_start(MidiDevice* device) { device->send_func(device, 1, MIDI_START, 0, 0); }
+void midi_send_start(MidiDevice* device) {
+    device->send_func(device, 1, MIDI_START, 0, 0);
+}
 
-void midi_send_continue(MidiDevice* device) { device->send_func(device, 1, MIDI_CONTINUE, 0, 0); }
+void midi_send_continue(MidiDevice* device) {
+    device->send_func(device, 1, MIDI_CONTINUE, 0, 0);
+}
 
-void midi_send_stop(MidiDevice* device) { device->send_func(device, 1, MIDI_STOP, 0, 0); }
+void midi_send_stop(MidiDevice* device) {
+    device->send_func(device, 1, MIDI_STOP, 0, 0);
+}
 
-void midi_send_activesense(MidiDevice* device) { device->send_func(device, 1, MIDI_ACTIVESENSE, 0, 0); }
+void midi_send_activesense(MidiDevice* device) {
+    device->send_func(device, 1, MIDI_ACTIVESENSE, 0, 0);
+}
 
-void midi_send_reset(MidiDevice* device) { device->send_func(device, 1, MIDI_RESET, 0, 0); }
+void midi_send_reset(MidiDevice* device) {
+    device->send_func(device, 1, MIDI_RESET, 0, 0);
+}
 
-void midi_send_tcquarterframe(MidiDevice* device, uint8_t time) { device->send_func(device, 2, MIDI_TC_QUARTERFRAME, time & 0x7F, 0); }
+void midi_send_tcquarterframe(MidiDevice* device, uint8_t time) {
+    device->send_func(device, 2, MIDI_TC_QUARTERFRAME, time & 0x7F, 0);
+}
 
 // XXX is this right?
-void midi_send_songposition(MidiDevice* device, uint16_t pos) { device->send_func(device, 3, MIDI_SONGPOSITION, pos & 0x7F, (pos >> 7) & 0x7F); }
+void midi_send_songposition(MidiDevice* device, uint16_t pos) {
+    device->send_func(device, 3, MIDI_SONGPOSITION, pos & 0x7F, (pos >> 7) & 0x7F);
+}
 
-void midi_send_songselect(MidiDevice* device, uint8_t song) { device->send_func(device, 2, MIDI_SONGSELECT, song & 0x7F, 0); }
+void midi_send_songselect(MidiDevice* device, uint8_t song) {
+    device->send_func(device, 2, MIDI_SONGSELECT, song & 0x7F, 0);
+}
 
-void midi_send_tunerequest(MidiDevice* device) { device->send_func(device, 1, MIDI_TUNEREQUEST, 0, 0); }
+void midi_send_tunerequest(MidiDevice* device) {
+    device->send_func(device, 1, MIDI_TUNEREQUEST, 0, 0);
+}
 
-void midi_send_byte(MidiDevice* device, uint8_t b) { device->send_func(device, 1, b, 0, 0); }
+void midi_send_byte(MidiDevice* device, uint8_t b) {
+    device->send_func(device, 1, b, 0, 0);
+}
 
 void midi_send_data(MidiDevice* device, uint16_t count, uint8_t byte0, uint8_t byte1, uint8_t byte2) {
     // ensure that the count passed along is always 3 or lower
@@ -150,32 +184,62 @@ void midi_send_array(MidiDevice* device, uint16_t count, uint8_t* array) {
     }
 }
 
-void midi_register_cc_callback(MidiDevice* device, midi_three_byte_func_t func) { device->input_cc_callback = func; }
+void midi_register_cc_callback(MidiDevice* device, midi_three_byte_func_t func) {
+    device->input_cc_callback = func;
+}
 
-void midi_register_noteon_callback(MidiDevice* device, midi_three_byte_func_t func) { device->input_noteon_callback = func; }
+void midi_register_noteon_callback(MidiDevice* device, midi_three_byte_func_t func) {
+    device->input_noteon_callback = func;
+}
 
-void midi_register_noteoff_callback(MidiDevice* device, midi_three_byte_func_t func) { device->input_noteoff_callback = func; }
+void midi_register_noteoff_callback(MidiDevice* device, midi_three_byte_func_t func) {
+    device->input_noteoff_callback = func;
+}
 
-void midi_register_aftertouch_callback(MidiDevice* device, midi_three_byte_func_t func) { device->input_aftertouch_callback = func; }
+void midi_register_aftertouch_callback(MidiDevice* device, midi_three_byte_func_t func) {
+    device->input_aftertouch_callback = func;
+}
 
-void midi_register_pitchbend_callback(MidiDevice* device, midi_three_byte_func_t func) { device->input_pitchbend_callback = func; }
+void midi_register_pitchbend_callback(MidiDevice* device, midi_three_byte_func_t func) {
+    device->input_pitchbend_callback = func;
+}
 
-void midi_register_songposition_callback(MidiDevice* device, midi_three_byte_func_t func) { device->input_songposition_callback = func; }
+void midi_register_songposition_callback(MidiDevice* device, midi_three_byte_func_t func) {
+    device->input_songposition_callback = func;
+}
 
-void midi_register_progchange_callback(MidiDevice* device, midi_two_byte_func_t func) { device->input_progchange_callback = func; }
+void midi_register_progchange_callback(MidiDevice* device, midi_two_byte_func_t func) {
+    device->input_progchange_callback = func;
+}
 
-void midi_register_chanpressure_callback(MidiDevice* device, midi_two_byte_func_t func) { device->input_chanpressure_callback = func; }
+void midi_register_chanpressure_callback(MidiDevice* device, midi_two_byte_func_t func) {
+    device->input_chanpressure_callback = func;
+}
 
-void midi_register_songselect_callback(MidiDevice* device, midi_two_byte_func_t func) { device->input_songselect_callback = func; }
+void midi_register_songselect_callback(MidiDevice* device, midi_two_byte_func_t func) {
+    device->input_songselect_callback = func;
+}
 
-void midi_register_tc_quarterframe_callback(MidiDevice* device, midi_two_byte_func_t func) { device->input_tc_quarterframe_callback = func; }
+void midi_register_tc_quarterframe_callback(MidiDevice* device, midi_two_byte_func_t func) {
+    device->input_tc_quarterframe_callback = func;
+}
 
-void midi_register_realtime_callback(MidiDevice* device, midi_one_byte_func_t func) { device->input_realtime_callback = func; }
+void midi_register_realtime_callback(MidiDevice* device, midi_one_byte_func_t func) {
+    device->input_realtime_callback = func;
+}
 
-void midi_register_tunerequest_callback(MidiDevice* device, midi_one_byte_func_t func) { device->input_tunerequest_callback = func; }
+void midi_register_tunerequest_callback(MidiDevice* device, midi_one_byte_func_t func) {
+    device->input_tunerequest_callback = func;
+}
 
-void midi_register_sysex_callback(MidiDevice* device, midi_sysex_func_t func) { device->input_sysex_callback = func; }
+void midi_register_sysex_callback(MidiDevice* device, midi_sysex_func_t func) {
+    device->input_sysex_callback = func;
+}
 
-void midi_register_fallthrough_callback(MidiDevice* device, midi_var_byte_func_t func) { device->input_fallthrough_callback = func; }
+void midi_register_fallthrough_callback(MidiDevice* device, midi_var_byte_func_t func) {
+    device->input_fallthrough_callback = func;
+}
 
-void midi_register_catchall_callback(MidiDevice* device, midi_var_byte_func_t func) { device->input_catchall_callback = func; }
+void midi_register_catchall_callback(MidiDevice* device, midi_var_byte_func_t func) {
+    device->input_catchall_callback = func;
+}
diff --git a/tmk_core/protocol/midi/midi.h b/tmk_core/protocol/midi/midi.h
index 75f3b13b0b..34547077e4 100644
--- a/tmk_core/protocol/midi/midi.h
+++ b/tmk_core/protocol/midi/midi.h
@@ -48,7 +48,7 @@ extern "C" {
  *
  * @param device the device to initialize
  */
-void midi_device_init(MidiDevice* device);  // [implementation in midi_device.c]
+void midi_device_init(MidiDevice* device); // [implementation in midi_device.c]
 
 /**
  * @brief Process input data
@@ -58,7 +58,7 @@ void midi_device_init(MidiDevice* device);  // [implementation in midi_device.c]
  *
  * @param device the device to process
  */
-void midi_device_process(MidiDevice* device);  // [implementation in midi_device.c]
+void midi_device_process(MidiDevice* device); // [implementation in midi_device.c]
 
 /**@}*/
 
@@ -115,7 +115,7 @@ void midi_send_aftertouch(MidiDevice* device, uint8_t chan, uint8_t note_num, ui
  * @param chan the channel to send on, 0-15
  * @param amt the bend amount range: -8192..8191, 0 means no bend
  */
-void midi_send_pitchbend(MidiDevice* device, uint8_t chan, int16_t amt);  // range -8192, 8191
+void midi_send_pitchbend(MidiDevice* device, uint8_t chan, int16_t amt); // range -8192, 8191
 
 /**
  * @brief Send a program change message via the given device.
diff --git a/tmk_core/protocol/midi/midi_device.c b/tmk_core/protocol/midi/midi_device.c
index 58fe685e2d..77c010b156 100644
--- a/tmk_core/protocol/midi/midi_device.c
+++ b/tmk_core/protocol/midi/midi_device.c
@@ -60,12 +60,17 @@ void midi_device_init(MidiDevice* device) {
 
 void midi_device_input(MidiDevice* device, uint8_t cnt, uint8_t* input) {
     uint8_t i;
-    for (i = 0; i < cnt; i++) bytequeue_enqueue(&device->input_queue, input[i]);
+    for (i = 0; i < cnt; i++)
+        bytequeue_enqueue(&device->input_queue, input[i]);
 }
 
-void midi_device_set_send_func(MidiDevice* device, midi_var_byte_func_t send_func) { device->send_func = send_func; }
+void midi_device_set_send_func(MidiDevice* device, midi_var_byte_func_t send_func) {
+    device->send_func = send_func;
+}
 
-void midi_device_set_pre_input_process_func(MidiDevice* device, midi_no_byte_func_t pre_process_func) { device->pre_input_process_callback = pre_process_func; }
+void midi_device_set_pre_input_process_func(MidiDevice* device, midi_no_byte_func_t pre_process_func) {
+    device->pre_input_process_callback = pre_process_func;
+}
 
 void midi_device_process(MidiDevice* device) {
     // call the pre_input_process_callback if there is one
diff --git a/tmk_core/protocol/midi/qmk_midi.c b/tmk_core/protocol/midi/qmk_midi.c
index 3a454d61ae..f6a5d92281 100644
--- a/tmk_core/protocol/midi/qmk_midi.c
+++ b/tmk_core/protocol/midi/qmk_midi.c
@@ -50,7 +50,7 @@ static void usb_send_func(MidiDevice* device, uint16_t cnt, uint8_t byte0, uint8
                     event.Event = MIDI_EVENT(cable, SYSEX_START_OR_CONT);
                 break;
             default:
-                return;  // invalid cnt
+                return; // invalid cnt
         }
     } else {
         // deal with 'system common' messages
diff --git a/tmk_core/protocol/midi/sysex_tools.c b/tmk_core/protocol/midi/sysex_tools.c
index 84bca72158..c9a9d03285 100644
--- a/tmk_core/protocol/midi/sysex_tools.c
+++ b/tmk_core/protocol/midi/sysex_tools.c
@@ -35,7 +35,7 @@ uint16_t sysex_decoded_length(uint16_t encoded_length) {
 }
 
 uint16_t sysex_encode(uint8_t *encoded, const uint8_t *source, const uint16_t length) {
-    uint16_t encoded_full = length / 7;  // number of full 8 byte sections from 7 bytes of input
+    uint16_t encoded_full = length / 7; // number of full 8 byte sections from 7 bytes of input
     uint16_t i, j;
 
     // fill out the fully encoded sections
diff --git a/tmk_core/protocol/usb_descriptor.h b/tmk_core/protocol/usb_descriptor.h
index 0d9f57d271..a346e6d4f6 100644
--- a/tmk_core/protocol/usb_descriptor.h
+++ b/tmk_core/protocol/usb_descriptor.h
@@ -212,7 +212,7 @@ enum usb_interfaces {
  * Endpoint numbers
  */
 enum usb_endpoints {
-    __unused_epnum__ = NEXT_EPNUM,  // Endpoint numbering starts at 1
+    __unused_epnum__ = NEXT_EPNUM, // Endpoint numbering starts at 1
 
 #ifndef KEYBOARD_SHARED_EP
     KEYBOARD_IN_EPNUM = NEXT_EPNUM,
diff --git a/tmk_core/protocol/usb_device_state.c b/tmk_core/protocol/usb_device_state.c
index 84f01943be..8d56ba4d2f 100644
--- a/tmk_core/protocol/usb_device_state.c
+++ b/tmk_core/protocol/usb_device_state.c
@@ -22,7 +22,9 @@
 
 enum usb_device_state usb_device_state = USB_DEVICE_STATE_NO_INIT;
 
-__attribute__((weak)) void notify_usb_device_state_change_kb(enum usb_device_state usb_device_state) { notify_usb_device_state_change_user(usb_device_state); }
+__attribute__((weak)) void notify_usb_device_state_change_kb(enum usb_device_state usb_device_state) {
+    notify_usb_device_state_change_user(usb_device_state);
+}
 
 __attribute__((weak)) void notify_usb_device_state_change_user(enum usb_device_state usb_device_state) {}
 
diff --git a/tmk_core/protocol/usb_device_state.h b/tmk_core/protocol/usb_device_state.h
index c229311d46..3be65ea7e1 100644
--- a/tmk_core/protocol/usb_device_state.h
+++ b/tmk_core/protocol/usb_device_state.h
@@ -27,10 +27,10 @@ void usb_device_state_set_reset(void);
 void usb_device_state_init(void);
 
 enum usb_device_state {
-    USB_DEVICE_STATE_NO_INIT    = 0,  // We're in this state before calling usb_device_state_init()
-    USB_DEVICE_STATE_INIT       = 1,  // Can consume up to 100mA
-    USB_DEVICE_STATE_CONFIGURED = 2,  // Can consume up to what is specified in configuration descriptor, typically 500mA
-    USB_DEVICE_STATE_SUSPEND    = 3   // Can consume only suspend current
+    USB_DEVICE_STATE_NO_INIT    = 0, // We're in this state before calling usb_device_state_init()
+    USB_DEVICE_STATE_INIT       = 1, // Can consume up to 100mA
+    USB_DEVICE_STATE_CONFIGURED = 2, // Can consume up to what is specified in configuration descriptor, typically 500mA
+    USB_DEVICE_STATE_SUSPEND    = 3  // Can consume only suspend current
 };
 
 extern enum usb_device_state usb_device_state;
diff --git a/tmk_core/protocol/usb_util.c b/tmk_core/protocol/usb_util.c
index dd1deeaa11..49aadedc2a 100644
--- a/tmk_core/protocol/usb_util.c
+++ b/tmk_core/protocol/usb_util.c
@@ -17,7 +17,9 @@
 #include "usb_util.h"
 
 __attribute__((weak)) void usb_disconnect(void) {}
-__attribute__((weak)) bool usb_connected_state(void) { return true; }
+__attribute__((weak)) bool usb_connected_state(void) {
+    return true;
+}
 __attribute__((weak)) bool usb_vbus_state(void) {
 #ifdef USB_VBUS_PIN
     setPinInput(USB_VBUS_PIN);
diff --git a/tmk_core/protocol/vusb/protocol.c b/tmk_core/protocol/vusb/protocol.c
index 644e77e021..20d0530483 100644
--- a/tmk_core/protocol/vusb/protocol.c
+++ b/tmk_core/protocol/vusb/protocol.c
@@ -97,7 +97,9 @@ static void vusb_wakeup(void) {
  *
  * FIXME: Needs doc
  */
-static void setup_usb(void) { initForUsbConnectivity(); }
+static void setup_usb(void) {
+    initForUsbConnectivity();
+}
 
 uint16_t sof_timer = 0;
 
diff --git a/tmk_core/protocol/vusb/usb_util.c b/tmk_core/protocol/vusb/usb_util.c
index 4ee2d3188b..38c4352d55 100644
--- a/tmk_core/protocol/vusb/usb_util.c
+++ b/tmk_core/protocol/vusb/usb_util.c
@@ -16,7 +16,9 @@
 #include <usbdrv/usbdrv.h>
 #include "usb_util.h"
 
-void usb_disconnect(void) { usbDeviceDisconnect(); }
+void usb_disconnect(void) {
+    usbDeviceDisconnect();
+}
 
 bool usb_connected_state(void) {
     usbPoll();
diff --git a/tmk_core/protocol/vusb/vusb.c b/tmk_core/protocol/vusb/vusb.c
index 8bdcccc9c9..ebde955d3b 100644
--- a/tmk_core/protocol/vusb/vusb.c
+++ b/tmk_core/protocol/vusb/vusb.c
@@ -230,9 +230,13 @@ static void    send_programmable_button(uint32_t data);
 
 static host_driver_t driver = {keyboard_leds, send_keyboard, send_mouse, send_system, send_consumer, send_programmable_button};
 
-host_driver_t *vusb_driver(void) { return &driver; }
+host_driver_t *vusb_driver(void) {
+    return &driver;
+}
 
-static uint8_t keyboard_leds(void) { return keyboard_led_state; }
+static uint8_t keyboard_leds(void) {
+    return keyboard_led_state;
+}
 
 static void send_keyboard(report_keyboard_t *report) {
     uint8_t next = (kbuf_head + 1) % KBUF_SIZE;
@@ -348,7 +352,7 @@ usbMsgLen_t usbFunctionSetup(uchar data[8]) {
                 last_req.kind = SET_LED;
                 last_req.len  = rq->wLength.word;
             }
-            return USB_NO_MSG;  // to get data in usbFunctionWrite
+            return USB_NO_MSG; // to get data in usbFunctionWrite
         } else {
             dprint("UNKNOWN:");
         }
@@ -410,47 +414,47 @@ const PROGMEM uchar shared_hid_report[] = {
 #else
 const PROGMEM uchar keyboard_hid_report[] = {
 #endif
-    0x05, 0x01,  // Usage Page (Generic Desktop)
-    0x09, 0x06,  // Usage (Keyboard)
-    0xA1, 0x01,  // Collection (Application)
+    0x05, 0x01, // Usage Page (Generic Desktop)
+    0x09, 0x06, // Usage (Keyboard)
+    0xA1, 0x01, // Collection (Application)
 #ifdef KEYBOARD_SHARED_EP
-    0x85, REPORT_ID_KEYBOARD,  // Report ID
+    0x85, REPORT_ID_KEYBOARD, // Report ID
 #endif
     // Modifiers (8 bits)
-    0x05, 0x07,  //   Usage Page (Keyboard/Keypad)
-    0x19, 0xE0,  //   Usage Minimum (Keyboard Left Control)
-    0x29, 0xE7,  //   Usage Maximum (Keyboard Right GUI)
-    0x15, 0x00,  //   Logical Minimum (0)
-    0x25, 0x01,  //   Logical Maximum (1)
-    0x95, 0x08,  //   Report Count (8)
-    0x75, 0x01,  //   Report Size (1)
-    0x81, 0x02,  //   Input (Data, Variable, Absolute)
+    0x05, 0x07, //   Usage Page (Keyboard/Keypad)
+    0x19, 0xE0, //   Usage Minimum (Keyboard Left Control)
+    0x29, 0xE7, //   Usage Maximum (Keyboard Right GUI)
+    0x15, 0x00, //   Logical Minimum (0)
+    0x25, 0x01, //   Logical Maximum (1)
+    0x95, 0x08, //   Report Count (8)
+    0x75, 0x01, //   Report Size (1)
+    0x81, 0x02, //   Input (Data, Variable, Absolute)
     // Reserved (1 byte)
-    0x95, 0x01,  //   Report Count (1)
-    0x75, 0x08,  //   Report Size (8)
-    0x81, 0x03,  //   Input (Constant)
+    0x95, 0x01, //   Report Count (1)
+    0x75, 0x08, //   Report Size (8)
+    0x81, 0x03, //   Input (Constant)
     // Keycodes (6 bytes)
-    0x05, 0x07,        //   Usage Page (Keyboard/Keypad)
-    0x19, 0x00,        //   Usage Minimum (0)
-    0x29, 0xFF,        //   Usage Maximum (255)
-    0x15, 0x00,        //   Logical Minimum (0)
-    0x26, 0xFF, 0x00,  //   Logical Maximum (255)
-    0x95, 0x06,        //   Report Count (6)
-    0x75, 0x08,        //   Report Size (8)
-    0x81, 0x00,        //   Input (Data, Array, Absolute)
+    0x05, 0x07,       //   Usage Page (Keyboard/Keypad)
+    0x19, 0x00,       //   Usage Minimum (0)
+    0x29, 0xFF,       //   Usage Maximum (255)
+    0x15, 0x00,       //   Logical Minimum (0)
+    0x26, 0xFF, 0x00, //   Logical Maximum (255)
+    0x95, 0x06,       //   Report Count (6)
+    0x75, 0x08,       //   Report Size (8)
+    0x81, 0x00,       //   Input (Data, Array, Absolute)
 
     // Status LEDs (5 bits)
-    0x05, 0x08,  //   Usage Page (LED)
-    0x19, 0x01,  //   Usage Minimum (Num Lock)
-    0x29, 0x05,  //   Usage Maximum (Kana)
-    0x95, 0x05,  //   Report Count (5)
-    0x75, 0x01,  //   Report Size (1)
-    0x91, 0x02,  //   Output (Data, Variable, Absolute)
+    0x05, 0x08, //   Usage Page (LED)
+    0x19, 0x01, //   Usage Minimum (Num Lock)
+    0x29, 0x05, //   Usage Maximum (Kana)
+    0x95, 0x05, //   Report Count (5)
+    0x75, 0x01, //   Report Size (1)
+    0x91, 0x02, //   Output (Data, Variable, Absolute)
     // LED padding (3 bits)
-    0x95, 0x01,  //   Report Count (1)
-    0x75, 0x03,  //   Report Size (3)
-    0x91, 0x03,  //   Output (Constant)
-    0xC0,        // End Collection
+    0x95, 0x01, //   Report Count (1)
+    0x75, 0x03, //   Report Size (3)
+    0x91, 0x03, //   Output (Constant)
+    0xC0,       // End Collection
 #ifndef KEYBOARD_SHARED_EP
 };
 #endif
@@ -462,135 +466,135 @@ const PROGMEM uchar shared_hid_report[] = {
 
 #ifdef MOUSE_ENABLE
     // Mouse report descriptor
-    0x05, 0x01,             // Usage Page (Generic Desktop)
-    0x09, 0x02,             // Usage (Mouse)
-    0xA1, 0x01,             // Collection (Application)
-    0x85, REPORT_ID_MOUSE,  //   Report ID
-    0x09, 0x01,             //   Usage (Pointer)
-    0xA1, 0x00,             //   Collection (Physical)
+    0x05, 0x01,            // Usage Page (Generic Desktop)
+    0x09, 0x02,            // Usage (Mouse)
+    0xA1, 0x01,            // Collection (Application)
+    0x85, REPORT_ID_MOUSE, //   Report ID
+    0x09, 0x01,            //   Usage (Pointer)
+    0xA1, 0x00,            //   Collection (Physical)
     // Buttons (8 bits)
-    0x05, 0x09,  //     Usage Page (Button)
-    0x19, 0x01,  //     Usage Minimum (Button 1)
-    0x29, 0x08,  //     Usage Maximum (Button 8)
-    0x15, 0x00,  //     Logical Minimum (0)
-    0x25, 0x01,  //     Logical Maximum (1)
-    0x95, 0x08,  //     Report Count (8)
-    0x75, 0x01,  //     Report Size (1)
-    0x81, 0x02,  //     Input (Data, Variable, Absolute)
+    0x05, 0x09, //     Usage Page (Button)
+    0x19, 0x01, //     Usage Minimum (Button 1)
+    0x29, 0x08, //     Usage Maximum (Button 8)
+    0x15, 0x00, //     Logical Minimum (0)
+    0x25, 0x01, //     Logical Maximum (1)
+    0x95, 0x08, //     Report Count (8)
+    0x75, 0x01, //     Report Size (1)
+    0x81, 0x02, //     Input (Data, Variable, Absolute)
 
     // X/Y position (2 bytes)
-    0x05, 0x01,  //     Usage Page (Generic Desktop)
-    0x09, 0x30,  //     Usage (X)
-    0x09, 0x31,  //     Usage (Y)
-    0x15, 0x81,  //     Logical Minimum (-127)
-    0x25, 0x7F,  //     Logical Maximum (127)
-    0x95, 0x02,  //     Report Count (2)
-    0x75, 0x08,  //     Report Size (8)
-    0x81, 0x06,  //     Input (Data, Variable, Relative)
+    0x05, 0x01, //     Usage Page (Generic Desktop)
+    0x09, 0x30, //     Usage (X)
+    0x09, 0x31, //     Usage (Y)
+    0x15, 0x81, //     Logical Minimum (-127)
+    0x25, 0x7F, //     Logical Maximum (127)
+    0x95, 0x02, //     Report Count (2)
+    0x75, 0x08, //     Report Size (8)
+    0x81, 0x06, //     Input (Data, Variable, Relative)
 
     // Vertical wheel (1 byte)
-    0x09, 0x38,  //     Usage (Wheel)
-    0x15, 0x81,  //     Logical Minimum (-127)
-    0x25, 0x7F,  //     Logical Maximum (127)
-    0x95, 0x01,  //     Report Count (1)
-    0x75, 0x08,  //     Report Size (8)
-    0x81, 0x06,  //     Input (Data, Variable, Relative)
+    0x09, 0x38, //     Usage (Wheel)
+    0x15, 0x81, //     Logical Minimum (-127)
+    0x25, 0x7F, //     Logical Maximum (127)
+    0x95, 0x01, //     Report Count (1)
+    0x75, 0x08, //     Report Size (8)
+    0x81, 0x06, //     Input (Data, Variable, Relative)
     // Horizontal wheel (1 byte)
-    0x05, 0x0C,        //     Usage Page (Consumer)
-    0x0A, 0x38, 0x02,  //     Usage (AC Pan)
-    0x15, 0x81,        //     Logical Minimum (-127)
-    0x25, 0x7F,        //     Logical Maximum (127)
-    0x95, 0x01,        //     Report Count (1)
-    0x75, 0x08,        //     Report Size (8)
-    0x81, 0x06,        //     Input (Data, Variable, Relative)
-    0xC0,              //   End Collection
-    0xC0,              // End Collection
+    0x05, 0x0C,       //     Usage Page (Consumer)
+    0x0A, 0x38, 0x02, //     Usage (AC Pan)
+    0x15, 0x81,       //     Logical Minimum (-127)
+    0x25, 0x7F,       //     Logical Maximum (127)
+    0x95, 0x01,       //     Report Count (1)
+    0x75, 0x08,       //     Report Size (8)
+    0x81, 0x06,       //     Input (Data, Variable, Relative)
+    0xC0,             //   End Collection
+    0xC0,             // End Collection
 #endif
 
 #ifdef EXTRAKEY_ENABLE
     // Extrakeys report descriptor
-    0x05, 0x01,              // Usage Page (Generic Desktop)
-    0x09, 0x80,              // Usage (System Control)
-    0xA1, 0x01,              // Collection (Application)
-    0x85, REPORT_ID_SYSTEM,  //   Report ID
-    0x19, 0x01,              //   Usage Minimum (Pointer)
-    0x2A, 0xB7, 0x00,        //   Usage Maximum (System Display LCD Autoscale)
-    0x15, 0x01,              //   Logical Minimum
-    0x26, 0xB7, 0x00,        //   Logical Maximum
-    0x95, 0x01,              //   Report Count (1)
-    0x75, 0x10,              //   Report Size (16)
-    0x81, 0x00,              //   Input (Data, Array, Absolute)
-    0xC0,                    // End Collection
+    0x05, 0x01,             // Usage Page (Generic Desktop)
+    0x09, 0x80,             // Usage (System Control)
+    0xA1, 0x01,             // Collection (Application)
+    0x85, REPORT_ID_SYSTEM, //   Report ID
+    0x19, 0x01,             //   Usage Minimum (Pointer)
+    0x2A, 0xB7, 0x00,       //   Usage Maximum (System Display LCD Autoscale)
+    0x15, 0x01,             //   Logical Minimum
+    0x26, 0xB7, 0x00,       //   Logical Maximum
+    0x95, 0x01,             //   Report Count (1)
+    0x75, 0x10,             //   Report Size (16)
+    0x81, 0x00,             //   Input (Data, Array, Absolute)
+    0xC0,                   // End Collection
 
-    0x05, 0x0C,                // Usage Page (Consumer)
-    0x09, 0x01,                // Usage (Consumer Control)
-    0xA1, 0x01,                // Collection (Application)
-    0x85, REPORT_ID_CONSUMER,  //   Report ID
-    0x19, 0x01,                //   Usage Minimum (Consumer Control)
-    0x2A, 0xA0, 0x02,          //   Usage Maximum (AC Desktop Show All Applications)
-    0x15, 0x01,                //   Logical Minimum
-    0x26, 0xA0, 0x02,          //   Logical Maximum
-    0x95, 0x01,                //   Report Count (1)
-    0x75, 0x10,                //   Report Size (16)
-    0x81, 0x00,                //   Input (Data, Array, Absolute)
-    0xC0,                      // End Collection
+    0x05, 0x0C,               // Usage Page (Consumer)
+    0x09, 0x01,               // Usage (Consumer Control)
+    0xA1, 0x01,               // Collection (Application)
+    0x85, REPORT_ID_CONSUMER, //   Report ID
+    0x19, 0x01,               //   Usage Minimum (Consumer Control)
+    0x2A, 0xA0, 0x02,         //   Usage Maximum (AC Desktop Show All Applications)
+    0x15, 0x01,               //   Logical Minimum
+    0x26, 0xA0, 0x02,         //   Logical Maximum
+    0x95, 0x01,               //   Report Count (1)
+    0x75, 0x10,               //   Report Size (16)
+    0x81, 0x00,               //   Input (Data, Array, Absolute)
+    0xC0,                     // End Collection
 #endif
 
 #ifdef DIGITIZER_ENABLE
     // Digitizer report descriptor
-    0x05, 0x0D,                 // Usage Page (Digitizers)
-    0x09, 0x01,                 // Usage (Digitizer)
-    0xA1, 0x01,                 // Collection (Application)
-    0x85, REPORT_ID_DIGITIZER,  //   Report ID
-    0x09, 0x22,                 //   Usage (Finger)
-    0xA1, 0x00,                 //   Collection (Physical)
+    0x05, 0x0D,                // Usage Page (Digitizers)
+    0x09, 0x01,                // Usage (Digitizer)
+    0xA1, 0x01,                // Collection (Application)
+    0x85, REPORT_ID_DIGITIZER, //   Report ID
+    0x09, 0x22,                //   Usage (Finger)
+    0xA1, 0x00,                //   Collection (Physical)
     // Tip Switch (1 bit)
-    0x09, 0x42,  //     Usage (Tip Switch)
-    0x15, 0x00,  //     Logical Minimum
-    0x25, 0x01,  //     Logical Maximum
-    0x95, 0x01,  //     Report Count (1)
-    0x75, 0x01,  //     Report Size (16)
-    0x81, 0x02,  //     Input (Data, Variable, Absolute)
+    0x09, 0x42, //     Usage (Tip Switch)
+    0x15, 0x00, //     Logical Minimum
+    0x25, 0x01, //     Logical Maximum
+    0x95, 0x01, //     Report Count (1)
+    0x75, 0x01, //     Report Size (16)
+    0x81, 0x02, //     Input (Data, Variable, Absolute)
     // In Range (1 bit)
-    0x09, 0x32,  //     Usage (In Range)
-    0x81, 0x02,  //     Input (Data, Variable, Absolute)
+    0x09, 0x32, //     Usage (In Range)
+    0x81, 0x02, //     Input (Data, Variable, Absolute)
     // Padding (6 bits)
-    0x95, 0x06,  //     Report Count (6)
-    0x81, 0x03,  //     Input (Constant)
+    0x95, 0x06, //     Report Count (6)
+    0x81, 0x03, //     Input (Constant)
 
     // X/Y Position (4 bytes)
-    0x05, 0x01,        //     Usage Page (Generic Desktop)
-    0x26, 0xFF, 0x7F,  //     Logical Maximum (32767)
-    0x95, 0x01,        //     Report Count (1)
-    0x75, 0x10,        //     Report Size (16)
-    0x65, 0x33,        //     Unit (Inch, English Linear)
-    0x55, 0x0E,        //     Unit Exponent (-2)
-    0x09, 0x30,        //     Usage (X)
-    0x81, 0x02,        //     Input (Data, Variable, Absolute)
-    0x09, 0x31,        //     Usage (Y)
-    0x81, 0x02,        //     Input (Data, Variable, Absolute)
-    0xC0,              //   End Collection
-    0xC0,              // End Collection
+    0x05, 0x01,       //     Usage Page (Generic Desktop)
+    0x26, 0xFF, 0x7F, //     Logical Maximum (32767)
+    0x95, 0x01,       //     Report Count (1)
+    0x75, 0x10,       //     Report Size (16)
+    0x65, 0x33,       //     Unit (Inch, English Linear)
+    0x55, 0x0E,       //     Unit Exponent (-2)
+    0x09, 0x30,       //     Usage (X)
+    0x81, 0x02,       //     Input (Data, Variable, Absolute)
+    0x09, 0x31,       //     Usage (Y)
+    0x81, 0x02,       //     Input (Data, Variable, Absolute)
+    0xC0,             //   End Collection
+    0xC0,             // End Collection
 #endif
 
 #ifdef PROGRAMMABLE_BUTTON_ENABLE
     // Programmable buttons report descriptor
-    0x05, 0x0C,                           // Usage Page (Consumer)
-    0x09, 0x01,                           // Usage (Consumer Control)
-    0xA1, 0x01,                           // Collection (Application)
-    0x85, REPORT_ID_PROGRAMMABLE_BUTTON,  //   Report ID
-    0x09, 0x03,                           //   Usage (Programmable Buttons)
-    0xA1, 0x04,                           //   Collection (Named Array)
-    0x05, 0x09,                           //     Usage Page (Button)
-    0x19, 0x01,                           //     Usage Minimum (Button 1)
-    0x29, 0x20,                           //     Usage Maximum (Button 32)
-    0x15, 0x00,                           //     Logical Minimum (0)
-    0x25, 0x01,                           //     Logical Maximum (1)
-    0x95, 0x20,                           //     Report Count (32)
-    0x75, 0x01,                           //     Report Size (1)
-    0x81, 0x02,                           //     Input (Data, Variable, Absolute)
-    0xC0,                                 //   End Collection
-    0xC0,                                 // End Collection
+    0x05, 0x0C,                          // Usage Page (Consumer)
+    0x09, 0x01,                          // Usage (Consumer Control)
+    0xA1, 0x01,                          // Collection (Application)
+    0x85, REPORT_ID_PROGRAMMABLE_BUTTON, //   Report ID
+    0x09, 0x03,                          //   Usage (Programmable Buttons)
+    0xA1, 0x04,                          //   Collection (Named Array)
+    0x05, 0x09,                          //     Usage Page (Button)
+    0x19, 0x01,                          //     Usage Minimum (Button 1)
+    0x29, 0x20,                          //     Usage Maximum (Button 32)
+    0x15, 0x00,                          //     Logical Minimum (0)
+    0x25, 0x01,                          //     Logical Maximum (1)
+    0x95, 0x20,                          //     Report Count (32)
+    0x75, 0x01,                          //     Report Size (1)
+    0x81, 0x02,                          //     Input (Data, Variable, Absolute)
+    0xC0,                                //   End Collection
+    0xC0,                                // End Collection
 #endif
 
 #ifdef SHARED_EP_ENABLE
@@ -599,47 +603,47 @@ const PROGMEM uchar shared_hid_report[] = {
 
 #ifdef RAW_ENABLE
 const PROGMEM uchar raw_hid_report[] = {
-    0x06, RAW_USAGE_PAGE_LO, RAW_USAGE_PAGE_HI,  // Usage Page (Vendor Defined)
-    0x09, RAW_USAGE_ID,                          // Usage (Vendor Defined)
-    0xA1, 0x01,                                  // Collection (Application)
+    0x06, RAW_USAGE_PAGE_LO, RAW_USAGE_PAGE_HI, // Usage Page (Vendor Defined)
+    0x09, RAW_USAGE_ID,                         // Usage (Vendor Defined)
+    0xA1, 0x01,                                 // Collection (Application)
     // Data to host
-    0x09, 0x62,             //   Usage (Vendor Defined)
-    0x15, 0x00,             //   Logical Minimum (0)
-    0x26, 0xFF, 0x00,       //   Logical Maximum (255)
-    0x95, RAW_BUFFER_SIZE,  //   Report Count
-    0x75, 0x08,             //   Report Size (8)
-    0x81, 0x02,             //   Input (Data, Variable, Absolute)
+    0x09, 0x62,            //   Usage (Vendor Defined)
+    0x15, 0x00,            //   Logical Minimum (0)
+    0x26, 0xFF, 0x00,      //   Logical Maximum (255)
+    0x95, RAW_BUFFER_SIZE, //   Report Count
+    0x75, 0x08,            //   Report Size (8)
+    0x81, 0x02,            //   Input (Data, Variable, Absolute)
     // Data from host
-    0x09, 0x63,             //   Usage (Vendor Defined)
-    0x15, 0x00,             //   Logical Minimum (0)
-    0x26, 0xFF, 0x00,       //   Logical Maximum (255)
-    0x95, RAW_BUFFER_SIZE,  //   Report Count
-    0x75, 0x08,             //   Report Size (8)
-    0x91, 0x02,             //   Output (Data, Variable, Absolute)
-    0xC0                    // End Collection
+    0x09, 0x63,            //   Usage (Vendor Defined)
+    0x15, 0x00,            //   Logical Minimum (0)
+    0x26, 0xFF, 0x00,      //   Logical Maximum (255)
+    0x95, RAW_BUFFER_SIZE, //   Report Count
+    0x75, 0x08,            //   Report Size (8)
+    0x91, 0x02,            //   Output (Data, Variable, Absolute)
+    0xC0                   // End Collection
 };
 #endif
 
 #if defined(CONSOLE_ENABLE)
 const PROGMEM uchar console_hid_report[] = {
-    0x06, 0x31, 0xFF,  // Usage Page (Vendor Defined - PJRC Teensy compatible)
-    0x09, 0x74,        // Usage (Vendor Defined - PJRC Teensy compatible)
-    0xA1, 0x01,        // Collection (Application)
+    0x06, 0x31, 0xFF, // Usage Page (Vendor Defined - PJRC Teensy compatible)
+    0x09, 0x74,       // Usage (Vendor Defined - PJRC Teensy compatible)
+    0xA1, 0x01,       // Collection (Application)
     // Data to host
-    0x09, 0x75,                 //   Usage (Vendor Defined)
-    0x15, 0x00,                 //   Logical Minimum (0x00)
-    0x26, 0xFF, 0x00,           //   Logical Maximum (0x00FF)
-    0x95, CONSOLE_BUFFER_SIZE,  //   Report Count
-    0x75, 0x08,                 //   Report Size (8)
-    0x81, 0x02,                 //   Input (Data, Variable, Absolute)
+    0x09, 0x75,                //   Usage (Vendor Defined)
+    0x15, 0x00,                //   Logical Minimum (0x00)
+    0x26, 0xFF, 0x00,          //   Logical Maximum (0x00FF)
+    0x95, CONSOLE_BUFFER_SIZE, //   Report Count
+    0x75, 0x08,                //   Report Size (8)
+    0x81, 0x02,                //   Input (Data, Variable, Absolute)
     // Data from host
-    0x09, 0x76,                 //   Usage (Vendor Defined)
-    0x15, 0x00,                 //   Logical Minimum (0x00)
-    0x26, 0xFF, 0x00,           //   Logical Maximum (0x00FF)
-    0x95, CONSOLE_BUFFER_SIZE,  //   Report Count
-    0x75, 0x08,                 //   Report Size (8)
-    0x91, 0x02,                 //   Output (Data)
-    0xC0                        // End Collection
+    0x09, 0x76,                //   Usage (Vendor Defined)
+    0x15, 0x00,                //   Logical Minimum (0x00)
+    0x26, 0xFF, 0x00,          //   Logical Maximum (0x00FF)
+    0x95, CONSOLE_BUFFER_SIZE, //   Report Count
+    0x75, 0x08,                //   Report Size (8)
+    0x91, 0x02,                //   Output (Data)
+    0xC0                       // End Collection
 };
 #endif
 
@@ -939,16 +943,16 @@ USB_PUBLIC usbMsgLen_t usbFunctionDescriptor(struct usbRequest *rq) {
                     usbMsgPtr = (usbMsgPtr_t)&usbStringDescriptorZero;
                     len       = usbStringDescriptorZero.header.bLength;
                     break;
-                case 1:  // iManufacturer
+                case 1: // iManufacturer
                     usbMsgPtr = (usbMsgPtr_t)&usbStringDescriptorManufacturer;
                     len       = usbStringDescriptorManufacturer.header.bLength;
                     break;
-                case 2:  // iProduct
+                case 2: // iProduct
                     usbMsgPtr = (usbMsgPtr_t)&usbStringDescriptorProduct;
                     len       = usbStringDescriptorProduct.header.bLength;
                     break;
 #if defined(SERIAL_NUMBER)
-                case 3:  // iSerialNumber
+                case 3: // iSerialNumber
                     usbMsgPtr = (usbMsgPtr_t)&usbStringDescriptorSerial;
                     len       = usbStringDescriptorSerial.header.bLength;
                     break;
diff --git a/users/uqs/config.h b/users/uqs/config.h
new file mode 100644
index 0000000000..b8a140fe87
--- /dev/null
+++ b/users/uqs/config.h
@@ -0,0 +1,40 @@
+// Copyright 2022 Ulrich Spörlein (@uqs)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#ifdef RGBLIGHT_ENABLE
+#    define RGBLIGHT_SLEEP
+//#    define RGBLIGHT_ANIMATIONS      // disabled to save space
+#    define RGBLIGHT_LAYERS
+#    define RGBLIGHT_MAX_LAYERS 8      // default is 16
+#    define RGBLIGHT_DISABLE_KEYCODES  // RGB_foo keys no longer work, saves 600 bytes
+#    define RGBLIGHT_DEFAULT_HUE 15
+#endif
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 6  // default is 4 for VIA builds
+
+#define TAPPING_TOGGLE 2  // number of taps for a toggle-on-tap
+#define TAPPING_TERM 170  // ms to trigger tap
+// https://precondition.github.io/home-row-mods
+#define TAPPING_FORCE_HOLD  // make tap-then-hold _not_ do key auto repeat
+#define IGNORE_MOD_TAP_INTERRUPT
+#define PERMISSIVE_HOLD  // I don't think this works for me, hence I rolled my own implementation.
+
+#define LEADER_TIMEOUT 400
+#define LEADER_PER_KEY_TIMING
+
+#define UNICODE_SELECTED_MODES UC_LNX
+
+// make KC_ACL0 et al work when held.
+#define MK_COMBINED
+#define MOUSEKEY_WHEEL_INTERVAL 40  // default is 50, lower means more scroll events, 40 works ok.
+
+// From https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/
+#define USB_POLLING_INTERVAL_MS 1
+
+#ifdef KEYBOARD_preonic_rev3
+// Some games seem to not register Esc otherwise when tapped, maybe try with this delay?
+#    define TAP_CODE_DELAY 30
+#else
+#    define TAP_CODE_DELAY 10
+#endif
diff --git a/users/uqs/rules.mk b/users/uqs/rules.mk
new file mode 100644
index 0000000000..6050362952
--- /dev/null
+++ b/users/uqs/rules.mk
@@ -0,0 +1,24 @@
+# don't include for keyboards/ploopyco/mouse/keymaps/uqs
+ifeq ($(filter $(strip $(KEYBOARD)),ploopyco/mouse),)
+    SRC += uqs.c
+
+    RGBLIGHT_ENABLE ?= yes      # Enable keyboard RGB underglow
+    LTO_ENABLE ?= yes  # disables the legacy TMK Macros and Functions features
+
+    UCIS_ENABLE = yes
+    LEADER_ENABLE = yes
+    COMBO_ENABLE = yes
+    MOUSEKEY_ENABLE = yes
+
+    # Disable all the unused stuff.
+    SPACE_CADET_ENABLE = no
+    COMMAND_ENABLE = no
+    MAGIC_ENABLE = no
+endif
+
+# From https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/
+# adds about 900 bytes! Don't use it on puny AVR though.
+# ifeq (,$(filter $(MCU), atmega16u2 atmega32u2 at90usb162)) # doesn't work MCU not set yet
+ifneq (,$(filter $(KEYBOARD),ploopyco/mouse preonic/rev3))
+    DEBOUNCE_TYPE = asym_eager_defer_pk
+endif
diff --git a/users/uqs/uqs.c b/users/uqs/uqs.c
new file mode 100644
index 0000000000..72284143c6
--- /dev/null
+++ b/users/uqs/uqs.c
@@ -0,0 +1,584 @@
+// Copyright 2022 Ulrich Spörlein (@uqs)
+// SPDX-License-Identifier: GPL-2.0-or-later
+// vi:et sw=4:
+
+#include "uqs.h"
+
+// LOG:
+// late Jan 2020, got Ohkeycaps Dactyl Manuform 5x6
+// https://play.typeracer.com shows about 75-80wpm (en) or ~400cpm (de) on my classic keeb.
+// Never did proper touch typing, basically didn't use ring finger much, mostly index/middle and pinky (only to hold down modifiers, really).
+// Feb 2020, switching to Colemak DH after 30 years of Qwerty, uh oh...
+// mid Feb, 20wpm/87% on monkeytype.com (no punct, numbers)
+// early March, 28wpm/90% on MT (plus punct./numbers from here on); 25wpm on typeracer
+// early April, 35wpm/92% on MT; 41wpm on typeracer
+// early May, 45wpm/96% on MT; 46wpm on typeracer; my qwerty is deteriorating, I need to look at the keys more and more o_O
+// early June, 49wpm/95% on MT (sigh ...); 50wpm on typeracer;
+// early July, 50wpm/96% on MT (...); 52wpm/96% on typeracer;
+// early August, 55wpm/96% on MT; 55wpm/98% on typeracer;
+// early September, 57wpm/97% on MT; 58wpm/97% on typeracer;
+// early October, 59wpm/96% on MT; 61wpm/97% on typeracer;
+// November, 56wpm/97% on MT; 62wpm/98% on typeracer;
+// December, 62wpm/96% on MT; 66wpm/98% on typeracer;
+// January, 61wpm/97% on MT; 65wpm/98% on typeracer;
+// February, 64wpm/97% on MT; 67wpm/98% on typeracer; my qwerty on the laptop is still fine, but I miss my shortcuts badly.
+//
+// So that's one year on Colemak. Was it worth the switch? Probably not, though
+// I also had to first learn proper technique, but that was actually swift, as
+// the keyboard nicely forces that on you. I really like home row mods though,
+// they are so comfy. Need to rethink my combos some more, still.
+
+
+#ifdef RGBLIGHT_LAYERS
+layer_state_t default_layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(L_QWER, layer_state_cmp(state, L_QWER));
+    rgblight_set_layer_state(L_WASD, layer_state_cmp(state, L_WASD));
+    rgblight_set_layer_state(L_COLM, layer_state_cmp(state, L_COLM));
+    return state;
+}
+#endif
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+#if 0
+    // defining layer L_FUNC when both keys are pressed
+    state = update_tri_layer_state(state, L_EXTD, L_NUM, L_FUNC);
+#endif
+#ifdef RGBLIGHT_LAYERS
+    rgblight_set_layer_state(L_EXTD, layer_state_cmp(state, L_EXTD));
+    rgblight_set_layer_state(L_NUM, layer_state_cmp(state, L_NUM));
+    rgblight_set_layer_state(L_FUNC, layer_state_cmp(state, L_FUNC));
+    rgblight_set_layer_state(L_MOUSE, layer_state_cmp(state, L_MOUSE));
+#else
+#endif
+    return state;
+}
+
+#ifdef RGBLIGHT_LAYERS
+// NOTE: at most 2 elements, last one needs to be RGBLIGHT_END_SEGMENTS
+typedef rgblight_segment_t rgblight_layer_t[3];
+
+const rgblight_layer_t PROGMEM my_rgb_segments[] = {
+    [L_QWER] = {{0, RGBLED_NUM, HSV_WHITE},  RGBLIGHT_END_SEGMENTS},
+    [L_WASD] = {{0, RGBLED_NUM/2, HSV_RED}, {RGBLED_NUM/2, RGBLED_NUM/2, HSV_OFF}, RGBLIGHT_END_SEGMENTS},
+    [L_COLM] = {{0, RGBLED_NUM, HSV_GREEN},  RGBLIGHT_END_SEGMENTS},
+    [L_EXTD] = {{0, RGBLED_NUM, HSV_BLUE},   RGBLIGHT_END_SEGMENTS},
+    [L_NUM] =  {{0, RGBLED_NUM, HSV_ORANGE}, RGBLIGHT_END_SEGMENTS},
+    [L_FUNC] = {{0, RGBLED_NUM, HSV_YELLOW}, RGBLIGHT_END_SEGMENTS},
+    [L_MOUSE]= {{0, RGBLED_NUM, HSV_PURPLE}, RGBLIGHT_END_SEGMENTS},
+};
+
+// This array needs pointers, :/
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = {
+    my_rgb_segments[L_QWER],
+    my_rgb_segments[L_WASD],
+    my_rgb_segments[L_COLM],
+    my_rgb_segments[L_EXTD],
+    my_rgb_segments[L_NUM],
+    my_rgb_segments[L_FUNC],
+    my_rgb_segments[L_MOUSE],
+};
+
+_Static_assert(sizeof(my_rgb_layers) / sizeof(my_rgb_layers[0]) ==
+        sizeof(my_rgb_segments) / sizeof(my_rgb_segments[0]),
+        "Number of rgb_segment definitions does not match up!");
+#endif
+
+#ifdef COMBO_ENABLE
+enum combo_events {
+  C_AUML,
+  C_OUML,
+  C_UUML,
+  C_SZ,
+  C_CBR,
+  C_PRN,
+  C_BRC,
+};
+
+// Maybe use this?
+// #define COMBO_ONLY_FROM_LAYER L_COLM
+
+// The official way has way too much duplication and intermediate names for my taste...
+const uint16_t PROGMEM my_action_combos[][3] = {
+    [C_AUML] = {KC_G_A, KC_W, COMBO_END},
+    [C_OUML] = {KC_G_O, KC_Y, COMBO_END},
+    [C_UUML] = {KC_C_N, KC_U, COMBO_END},
+    [C_SZ]   = {KC_S_S, KC_Z, COMBO_END},
+    [C_CBR]  = {KC_COLN, KC_LCBR, COMBO_END},
+    [C_PRN]  = {KC_LCBR, KC_LPRN, COMBO_END},
+    [C_BRC]  = {KC_LPRN, KC_LBRC, COMBO_END},
+};
+const uint16_t PROGMEM my_combos[][4] = {
+    {KC_LPRN, KC_F, KC_P, COMBO_END},
+    {KC_RPRN, KC_C, KC_D, COMBO_END},
+    {KC_LCBR, KC_W, KC_F, COMBO_END},
+    {KC_RCBR, KC_X, KC_C, COMBO_END},
+    {KC_TAB,  KC_G_A, KC_A_R, COMBO_END},
+    {KC_BSLS, KC_B, KC_J, COMBO_END},  // remove this?
+    {KC_BSLS, KC_F, KC_U, COMBO_END},
+    {LSFT(KC_BSLS), KC_P, KC_L, COMBO_END},
+    {KC_MINUS, KC_C_T, KC_C_N, COMBO_END},
+    {LSFT(KC_MINUS), KC_D, KC_H, COMBO_END},
+    {KC_GRV,  KC_Q, KC_W, COMBO_END},  // remove this?
+    {KC_GRV,  KC_C, KC_COMM, COMBO_END},
+    {LSFT(KC_GRV), KC_G, KC_M, COMBO_END},
+    {KC_BTN3, KC_BTN1, KC_BTN2, COMBO_END},
+    {KC_BTN1, KC_BTN2, KC_BTN3, COMBO_END},
+};
+
+const uint16_t COMBO_LEN = sizeof(my_action_combos) / sizeof(my_action_combos[0]) + sizeof(my_combos) / sizeof(my_combos[0]);
+
+#define MY_ACTION_COMBO(ck) \
+    [ck] = { .keys = &(my_action_combos[ck][0]) }
+#define MY_COMBO(ck) \
+    { .keys = &(my_combos[ck][1]), .keycode = my_combos[ck][0] }
+
+// NOTE: while my_combos can live in PROGMEM, the key_combos data also
+// contains state that is tweaked at runtime, so we need to indirect. Ugh.
+#define COMBO_STATICALLY
+#ifdef COMBO_STATICALLY
+// TODO: fill this at runtime with a loop?
+combo_t key_combos[] = {
+  MY_ACTION_COMBO(0),
+  MY_ACTION_COMBO(1),
+  MY_ACTION_COMBO(2),
+  MY_ACTION_COMBO(3),
+  MY_ACTION_COMBO(4),
+  MY_ACTION_COMBO(5),
+  MY_ACTION_COMBO(6),
+  MY_COMBO(0),
+  MY_COMBO(1),
+  MY_COMBO(2),
+  MY_COMBO(3),
+  MY_COMBO(4),
+  MY_COMBO(5),
+  MY_COMBO(6),
+  MY_COMBO(7),
+  MY_COMBO(8),
+  MY_COMBO(9),
+  MY_COMBO(10),
+  MY_COMBO(11),
+  MY_COMBO(12),
+  MY_COMBO(13),
+  MY_COMBO(14),
+};
+
+_Static_assert(sizeof(key_combos) / sizeof(key_combos[0]) ==
+        (sizeof(my_action_combos) / sizeof(my_action_combos[0]) + sizeof(my_combos) / sizeof(my_combos[0])),
+        "Number of combo definitions does not match up!");
+#else
+combo_t key_combos[sizeof(my_action_combos) / sizeof(my_action_combos[0]) + sizeof(my_combos) / sizeof(my_combos[0])];
+#endif
+
+void process_combo_event(uint16_t combo_index, bool pressed) {
+    switch (combo_index) {
+        case C_AUML:
+            if (pressed) {
+                tap_code16(KC_RALT);
+                tap_code16(LSFT(KC_QUOT));
+                tap_code16(KC_A);
+            }
+            break;
+        case C_OUML:
+            if (pressed) {
+                tap_code16(KC_RALT);
+                tap_code16(LSFT(KC_QUOT));
+                tap_code16(KC_O);
+            }
+            break;
+        case C_UUML:
+            if (pressed) {
+                tap_code16(KC_RALT);
+                tap_code16(LSFT(KC_QUOT));
+                tap_code16(KC_U);
+            }
+            break;
+        case C_SZ:
+            if (pressed) {
+                tap_code16(KC_RALT);
+                tap_code16(KC_S);
+                tap_code16(KC_S);
+            }
+            break;
+        case C_CBR:
+            if (pressed) {
+                tap_code16(KC_LCBR);
+                tap_code16(KC_RCBR);
+                tap_code16(KC_LEFT);
+            }
+            break;
+        case C_PRN:
+            if (pressed) {
+                tap_code16(KC_LPRN);
+                tap_code16(KC_RPRN);
+                tap_code16(KC_LEFT);
+            }
+            break;
+        case C_BRC:
+            if (pressed) {
+                tap_code16(KC_LBRC);
+                tap_code16(KC_RBRC);
+                tap_code16(KC_LEFT);
+            }
+            break;
+    }
+}
+#endif
+
+void keyboard_post_init_user(void) {
+#ifndef KEYBOARD_preonic_rev3
+    default_layer_set(1ul << L_COLM);
+#endif
+#ifdef RGBLIGHT_LAYERS
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+    rgblight_set_layer_state(0, true);
+#endif
+#if defined(COMBO_ENABLE) && !defined(COMBO_STATICALLY)
+    uint8_t i = 0;
+    for (; i < sizeof(my_action_combos) / sizeof(my_action_combos[0]); i++) {
+        key_combos[i].keys = &(my_action_combos[i][0]);
+    }
+    for (uint8_t j = 0; j < sizeof(my_combos) / sizeof(my_combos[0]); j++, i++) {
+        key_combos[i].keycode = my_combos[j][0];
+        key_combos[i].keys = &(my_combos[j][1]);
+    }
+#endif
+}
+
+uint16_t key_timer;
+bool delkey_registered;
+bool num_layer_was_used;
+bool extd_layer_was_used;
+// These keep state about the long-press-means-umlaut keys.
+bool auml_pressed;
+bool ouml_pressed;
+bool uuml_pressed;
+
+void maybe_send_umlaut(uint16_t keycode, bool *is_pressed) {
+    // Some other key did _not_ already re-arm this key, so now we need to do
+    // that ourselves.
+    if (*is_pressed) {
+        *is_pressed = false;
+        // If released within the timer, then just KC_A, KC_O, KC_U
+        if (timer_elapsed(key_timer) < TAPPING_TERM) {
+            tap_code16(keycode);
+        } else {
+            tap_code16(KC_RALT);
+            tap_code16(LSFT(KC_QUOT));
+            tap_code16(keycode);
+        }
+    }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    // TODO: why not use key_timer here? is it dynamic or not?
+    static uint16_t extd_layer_timer;
+    if (layer_state_is(L_EXTD) && record->event.pressed) {
+        extd_layer_was_used = true;
+    }
+    if (layer_state_is(L_NUM) && record->event.pressed) {
+        num_layer_was_used = true;
+    }
+
+    // An umlaut key was pressed previously (but will only emit the key on
+    // release), but we've pressed a different key now, so fire the regular key,
+    // re-arm it and continue with whatever actual key was pressed just now.
+    if (record->event.pressed) {
+        if (auml_pressed) {
+            tap_code16(KC_A);
+            auml_pressed = false;
+        }
+        if (ouml_pressed) {
+            tap_code16(KC_O);
+            ouml_pressed = false;
+        }
+        if (uuml_pressed) {
+            tap_code16(KC_U);
+            uuml_pressed = false;
+        }
+    }
+
+    switch (keycode) {
+        // From https://github.com/qmk/qmk_firmware/issues/6053
+    case LT_EXTD_ESC:
+        if (record->event.pressed) {
+            extd_layer_was_used = false;
+            extd_layer_timer = timer_read();
+            layer_on(L_EXTD);
+        } else {
+            layer_off(L_EXTD);
+            unregister_mods(MOD_BIT(KC_LALT));   // undo what ALT_TAB might've set
+            // NOTE: need to track whether we made use of the extd layer and
+            // that all happened within the tapping term. Otherwise we'd emit
+            // that layer key code _plus_ an extra Esc.
+            if (timer_elapsed(extd_layer_timer) < TAPPING_TERM && !extd_layer_was_used) {
+                tap_code(KC_ESC);
+            }
+        }
+        return true;
+    case LT_NUM_BSPC:
+        if (record->event.pressed){
+            num_layer_was_used = false;
+            extd_layer_timer = timer_read();
+            layer_on(L_NUM);
+        } else {
+            layer_off(L_NUM);
+            // NOTE: Custom LT method so that any press of a key on that layer will prevent the backspace.
+            if (timer_elapsed(extd_layer_timer) < TAPPING_TERM && !num_layer_was_used) {
+                tap_code(KC_BSPC);
+            }
+        }
+        return true;
+    case LT_MOUSE_ALT_SHIFT_INS:
+        if (record->event.pressed) {
+            key_timer = timer_read();
+            layer_on(L_MOUSE);
+        } else {
+            layer_off(L_MOUSE);
+            if (timer_elapsed(key_timer) < TAPPING_TERM) {
+                tap_code16(LALT(LSFT(KC_INS)));
+            }
+        }
+        return true;
+    case LT_FUNC_SHIFT_INS:
+        if (record->event.pressed) {
+            key_timer = timer_read();
+            layer_on(L_FUNC);
+        } else {
+            layer_off(L_FUNC);
+            if (timer_elapsed(key_timer) < TAPPING_TERM) {
+                tap_code16(LSFT(KC_INS));
+            }
+        }
+        return true;
+#if 1
+        /* Looks like PERMISSIVE_HOLD on LT and OSM doesn't work properly. This
+         * is probaby https://github.com/qmk/qmk_firmware/issues/8971
+         */
+    case OSM_GUI:
+        /* OSM(MOD_LGUI) is delaying the event, but I need immediate triggering
+         * of the modifier to move windows around with the mouse. If only
+         * tapped, however, have it be a win OSM */
+        if (record->event.pressed) {
+            key_timer = timer_read();
+            register_mods(MOD_BIT(KC_LGUI));
+        } else {
+            unregister_mods(MOD_BIT(KC_LGUI));
+            if (timer_elapsed(key_timer) < TAPPING_TERM) {
+                add_oneshot_mods(MOD_BIT(KC_LGUI));
+            } else {
+                del_oneshot_mods(MOD_BIT(KC_LGUI));
+            }
+        }
+        return true;
+        // Why do I have to roll my own? It seems the original ones work on
+        // keyrelease, at which time I might have let go of the layer tap
+        // already, so I cannot roll them fast...
+    case OSM_SFT:
+        if (record->event.pressed) {
+            key_timer = timer_read();
+            register_mods(MOD_BIT(KC_LSFT));
+        } else {
+            unregister_mods(MOD_BIT(KC_LSFT));
+            if (timer_elapsed(key_timer) < TAPPING_TERM) {
+                add_oneshot_mods(MOD_BIT(KC_LSFT));
+            } /*else {
+                del_oneshot_mods(MOD_BIT(KC_LSFT));
+            }*/
+        }
+        return true;
+    case OSM_CTL:
+        if (record->event.pressed) {
+            key_timer = timer_read();
+            register_mods(MOD_BIT(KC_LCTL));
+        } else {
+            unregister_mods(MOD_BIT(KC_LCTL));
+            if (timer_elapsed(key_timer) < TAPPING_TERM) {
+                add_oneshot_mods(MOD_BIT(KC_LCTL));
+            } /*else {
+                del_oneshot_mods(MOD_BIT(KC_LCTL));
+            }*/
+        }
+        return true;
+    case OSM_ALT:
+        if (record->event.pressed) {
+            key_timer = timer_read();
+            register_mods(MOD_BIT(KC_LALT));
+        } else {
+            unregister_mods(MOD_BIT(KC_LALT));
+            if (timer_elapsed(key_timer) < TAPPING_TERM) {
+                add_oneshot_mods(MOD_BIT(KC_LALT));
+            } /*else {
+                del_oneshot_mods(MOD_BIT(KC_LALT));
+            }*/
+        }
+        return true;
+#else
+#define OSM_ALT OSM(MOD_LALT)
+#define OSM_CTL OSM(MOD_LCTL)
+#define OSM_GUI OSM(MOD_LGUI)
+#define OSM_SFT OSM(MOD_LSFT)
+#endif
+    // Obsoleted by using combos for umlauts now.
+    case KC_A_AE:
+        if (record->event.pressed) {
+            key_timer = timer_read();
+            auml_pressed = true;
+        } else {
+            maybe_send_umlaut(KC_A, &auml_pressed);
+        }
+        break;
+    case KC_O_OE:
+        if (record->event.pressed) {
+            key_timer = timer_read();
+            ouml_pressed = true;
+        } else {
+            maybe_send_umlaut(KC_O, &ouml_pressed);
+        }
+        break;
+    case KC_U_UE:
+        if (record->event.pressed) {
+            key_timer = timer_read();
+            uuml_pressed = true;
+        } else {
+            maybe_send_umlaut(KC_U, &uuml_pressed);
+        }
+        break;
+    case MINS_UNDSCR:
+        if (record->event.pressed) {
+            key_timer = timer_read();
+        } else {
+            if (timer_elapsed(key_timer) < TAPPING_TERM) {
+                // Can't send KC_KP_MINUS, it doesn't compose to, say →
+                tap_code16(KC_MINUS);
+            } else {
+                tap_code16(KC_UNDERSCORE);
+            }
+        }
+        break;
+    case ALT_TAB:
+        if (record->event.pressed) {
+            register_mods(MOD_BIT(KC_LALT));
+            tap_code16(KC_TAB);
+        }
+        break;
+    case INS_HARD:
+        // Do Alt-Shift-Ins first to have xdotool copy from SELECTION to CLIPBOARD, then Shift-Ins to paste.
+        if (record->event.pressed) {
+            tap_code16(LSFT(LALT(KC_INS)));
+        } else {
+            tap_code16(LSFT(KC_INS));
+        }
+        break;
+    case SHIFT_INS:
+        if (record->event.pressed) {
+            // when keycode is pressed
+            key_timer = timer_read();
+            // Shift when held ...
+            register_mods(MOD_BIT(KC_RSFT));
+        } else {
+            // If released within the timer, then Shift+Ins
+            if (timer_elapsed(key_timer) < TAPPING_TERM) {
+                tap_code16(KC_INS);
+            }
+            unregister_mods(MOD_BIT(KC_RSFT));
+        }
+        break;
+    case ALT_SHIFT_INS:
+        if (record->event.pressed) {
+            key_timer = timer_read();
+            // Shift when held ...
+            register_mods(MOD_BIT(KC_LSFT));
+        } else {
+            // If released within the timer, then Shift+Alt+Ins
+            if (timer_elapsed(key_timer) < TAPPING_TERM) {
+                register_mods(MOD_BIT(KC_LALT));
+                tap_code16(KC_INS);
+            }
+            // Note: this makes xev(1) see KeyPress for Meta_L but KeyRelease for Alt_L
+            unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_LALT));
+        }
+        break;
+/*
+ * Obsoleted by making tmux understand Ctrl-(Shift)-Tab natively.
+    case TM_NEXT:
+        if (record->event.pressed) SEND_STRING(SS_LCTRL("a") "n");
+        break;
+    case TM_PREV:
+        if (record->event.pressed) SEND_STRING(SS_LCTRL("a") "p");
+        break;
+*/
+        // TODO: use key overrides to turn, e.g. Win+Ctrl-Tab into VIM_NEXT.
+        // Not sure why Ctrl-Pgup works in vim, but not in vim-inside-tmux.
+    case VIM_NEXT:
+        if (record->event.pressed) SEND_STRING(SS_TAP(X_ESC) SS_TAP(X_G) SS_TAP(X_T));
+        break;
+    case VIM_PREV:
+        if (record->event.pressed) SEND_STRING(SS_TAP(X_ESC) SS_TAP(X_G) SS_LSFT("t"));
+        break;
+    case WIN_LEFT:
+        if (record->event.pressed) SEND_STRING(SS_LCTRL("w") SS_TAP(X_H));
+        break;
+    case WIN_DN:
+        if (record->event.pressed) SEND_STRING(SS_LCTRL("w") SS_TAP(X_J));
+        break;
+    case WIN_UP:
+        if (record->event.pressed) SEND_STRING(SS_LCTRL("w") SS_TAP(X_K));
+        break;
+    case WIN_RGHT:
+        if (record->event.pressed) SEND_STRING(SS_LCTRL("w") SS_TAP(X_L));
+        break;
+    }
+
+    return true;
+}
+
+#ifdef LEADER_ENABLE
+LEADER_EXTERNS();
+
+void matrix_scan_user(void) {
+  LEADER_DICTIONARY() {
+    leading = false;
+    leader_end();
+
+#ifdef UCIS_ENABLE
+    SEQ_ONE_KEY(KC_U) {
+      qk_ucis_start();
+    }
+#endif
+    SEQ_ONE_KEY(KC_H) {
+      send_unicode_string("ᕕ( ᐛ )ᕗ");  // happy
+    }
+    SEQ_ONE_KEY(KC_D) {
+      send_unicode_string("ಠ_ಠ");  // disapproval
+    }
+    SEQ_ONE_KEY(KC_L) {
+      send_unicode_string("( ͡° ͜ʖ ͡°)");  // lenny
+    }
+    SEQ_ONE_KEY(KC_S) {
+      send_unicode_string("¯\\_(ツ)_/¯");  // shrug
+    }
+    // tableflip (LEADER - TF)
+    SEQ_TWO_KEYS(KC_T, KC_F) {
+      //set_unicode_input_mode(UC_LNX);
+      //send_unicode_hex_string("0028 30CE 0CA0 75CA 0CA0 0029 30CE 5F61 253B 2501 253B");
+      send_unicode_string("(╯°□°）╯︵ ┻━┻");
+    }
+    // untableflip
+    SEQ_THREE_KEYS(KC_U, KC_T, KC_F) {
+      //set_unicode_input_mode(UC_LNX);
+      //send_unicode_hex_string("0028 30CE 0CA0 75CA 0CA0 0029 30CE 5F61 253B 2501 253B");
+      send_unicode_string("┬─┬ノ( º _ ºノ)");
+    }
+  }
+}
+#endif
+
+#ifdef UCIS_ENABLE
+// 3 codepoints at most, otherwise increase UCIS_MAX_CODE_POINTS
+const qk_ucis_symbol_t ucis_symbol_table[] = UCIS_TABLE(
+    UCIS_SYM("poop", 0x1F4A9),                // 💩
+    UCIS_SYM("rofl", 0x1F923),                // 🤣
+    UCIS_SYM("look", 0x0CA0, 0x005F, 0x0CA0)  // ಠ_ಠ
+);
+#endif
diff --git a/users/uqs/uqs.h b/users/uqs/uqs.h
new file mode 100644
index 0000000000..f8b30caf79
--- /dev/null
+++ b/users/uqs/uqs.h
@@ -0,0 +1,77 @@
+// Copyright 2022 Ulrich Spörlein (@uqs)
+// SPDX-License-Identifier: GPL-2.0-or-later
+// vi:et sw=4:
+#pragma once
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    L_QWER = 0,
+    L_WASD,  // wasd gaming
+    L_COLM,  // Colemak DHm
+    L_EXTD,
+    L_NUM,
+    L_FUNC,
+    L_MOUSE,
+    L_LAST, // unused
+};
+
+#ifdef VIA_ENABLE
+_Static_assert(DYNAMIC_KEYMAP_LAYER_COUNT >= L_LAST, "VIA enabled, but not enough DYNAMIC_KEYMAP_LAYER_COUNT for all layers");
+#endif
+
+#define KC_CTAB LCTL(KC_TAB)
+#define KC_SCTAB LCTL(LSFT(KC_TAB))
+
+// Custom single-key codes, see uqs.c for the combos.
+enum custom_keycodes {
+    SHIFT_INS = SAFE_RANGE,
+    ALT_SHIFT_INS,
+    INS_HARD,
+    KC_A_AE,
+    KC_O_OE,
+    KC_U_UE,
+    MINS_UNDSCR,  // obsoleted by combos, remove this!
+    TM_NEXT,
+    TM_PREV,
+    VIM_NEXT,
+    VIM_PREV,
+    WIN_LEFT,
+    WIN_RGHT,
+    WIN_UP,
+    WIN_DN,
+    LT_EXTD_ESC,
+    LT_NUM_BSPC,
+    LT_MOUSE_ALT_SHIFT_INS,
+    LT_FUNC_SHIFT_INS,
+    OSM_GUI,
+    OSM_SFT,
+    OSM_CTL,
+    OSM_ALT,
+    ALT_TAB,
+};
+
+#ifndef LEADER_ENABLE
+#define KC_LEAD KC_NO
+#endif
+
+// Shorter names
+#define MS_WHDN KC_MS_WH_DOWN
+#define MS_WHUP KC_MS_WH_UP
+#define MS_WHLEFT KC_MS_WH_LEFT
+#define MS_WHRGHT KC_MS_WH_RIGHT
+
+// GASC/◆⎇⇧⎈ home row mod, read all about it here:
+// https://precondition.github.io/home-row-mods
+// Left-hand home row mods
+#define KC_G_A LGUI_T(KC_A)
+#define KC_A_R LALT_T(KC_R)
+#define KC_S_S LSFT_T(KC_S)
+#define KC_C_T LCTL_T(KC_T)
+
+// Right-hand home row mods
+#define KC_C_N RCTL_T(KC_N)
+#define KC_S_E RSFT_T(KC_E)
+#define KC_A_I LALT_T(KC_I)  // RALT is special, it's AltGr and my compose key under Win (layout UScmpse) and *nix (setxkbmap -option compose:ralt)
+#define KC_G_O RGUI_T(KC_O)
+
diff --git a/users/zigotica/rows.h b/users/zigotica/rows.h
index ef9487ace8..18f08ccb0b 100644
--- a/users/zigotica/rows.h
+++ b/users/zigotica/rows.h
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *   ,---------------------------------------.         ,---------------------------------------.
  *   |       |       |       |       |       |         |       |       |       |       |       |
- *   |  ` ~  |   W   |   D   |   P   |   F   |         |   K   |   Y   |   U   |   Q   |  ' "  |
+ *   |  ` ~  |   W   |   D   |   P   |   F   |         |   Q   |   L   |   U   |   Y   |  ' "  |
  *   |       |       |       |       |       |         |       |       |       |       |       |
  *   |-------+-------+-------+-------+-------|         |-------+-------+-------+-------+-------|
  *   |       |       |       |       |       |         |       |       |       |       |       |
@@ -31,7 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *   |  alt  | ctrl  | shft  | meta  |       |         |       |  meta |  shft | ctrl  |  alt  |
  *   |-------+-------+-------+-------+-------|         |-------+-------+-------+-------+-------|
  *   |       |       |       |       |       |         |       |       |       |       |       |
- *   |   B   |   X   |   C   |   V   |  [ {  |         |  , <  |   L   |   Z   |   J   |   . > |
+ *   |   B   |   X   |   C   |   V   |  [ {  |         |  , <  |   K   |   Z   |   J   |   . > |
  *   |       |       |       |       | TD ]} |         |  TD ; |       |       |       |  TD : |
  *   `-------+-------+-------+-------+-------|         |-------+-------+-------+-------+-------.
  *                           |       |       |         |       |       |
@@ -45,9 +45,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define _STENAI_L3      KC_B,             KC_X,            KC_C,          KC_V,             ZK_BRC
 #define _STENAI_LT      LT(_NUM, KC_TAB), LT(_NAV, KC_SPC)
 
-#define _STENAI_R1      KC_K,             KC_Y,            KC_U,          KC_Q,             KC_QUOT
+#define _STENAI_R1      KC_Q,             KC_L,            KC_U,          KC_Y,             KC_QUOT
 #define _STENAI_R2      KC_M,             RGUI_T(KC_N),    RSFT_T(KC_A),  RCTL_T(KC_I),     RALT_T(KC_O)
-#define _STENAI_R3      ZK_SEMI,          KC_L,            KC_Z,          KC_J,             ZK_COLON
+#define _STENAI_R3      ZK_SEMI,          KC_K,            KC_Z,          KC_J,             ZK_COLON
 #define _STENAI_RT      LT(_SYM, KC_E),   LT(_FN, KC_ENT)
 
 
diff --git a/util/new_keyboard.sh b/util/new_keyboard.sh
deleted file mode 100755
index 62e8cb9e13..0000000000
--- a/util/new_keyboard.sh
+++ /dev/null
@@ -1,181 +0,0 @@
-#!/usr/bin/env bash
-
-# This script generates a new keyboard directory under keyboards/,
-# and copies the template files from data/templates/ into it.
-
-# Print an error message with the word "ERROR" in red.
-echo_error() {
-    echo -e "[\033[0;91mERROR\033[m]: $1"
-}
-
-# Print a message in bold.
-echo_bold() {
-    echo -e "\033[1m$1\033[m"
-}
-
-# Prompt the user for information, showing the default value in brackets.
-prompt() {
-    local message="$1"
-    local default="$2"
-
-    [ -n "$default" ] && message+=" [$default]"
-    message+=": "
-
-    read -rp "$message" prompt_return
-    [ -z "$prompt_return" ] && prompt_return="$default"
-}
-
-# Grab a username from Git config.
-set_git_username() {
-    git_username="$(git config --get user.name)"
-}
-
-# Copy the template files to the new keyboard directory.
-copy_templates() {
-    mkdir -p "$keyboard_dir"
-
-    echo -n "Copying base template files..."
-    cp -r "data/templates/base/." "${keyboard_dir}"
-    echo " done"
-
-    echo -n "Copying $keyboard_type template files..."
-    cp -r "data/templates/${keyboard_type}/." "${keyboard_dir}"
-    echo " done"
-
-    echo -n "Renaming keyboard files..."
-    mv "${keyboard_dir}/keyboard.c" "${keyboard_dir}/${keyboard_base_name}.c"
-    mv "${keyboard_dir}/keyboard.h" "${keyboard_dir}/${keyboard_base_name}.h"
-    echo " done"
-}
-
-# Set the inplace editing parameter for sed.
-# macOS/BSD sed expects a file extension immediately following -i.
-set_sed_i() {
-    sed_i=(-i)
-
-    case $(uname -a) in
-        *Darwin*) sed_i=(-i "")
-    esac
-}
-
-# Replace a token with a value in the given list of files.
-replace_placeholders() {
-    local replace_token="$1"
-    local replace_value="$2"
-    shift 2
-    local replace_filenames=("$@")
-
-    echo -n "Replacing $replace_token with $replace_value..."
-    for replace_filename in "${replace_filenames[@]}"; do
-        sed "${sed_i[@]}" -e "s/${replace_token}/${replace_value}/g" "$replace_filename"
-    done
-    echo " done"
-}
-
-# Replace %YEAR% with the current year.
-replace_year_placeholders() {
-    local replace_year_filenames=(
-        "${keyboard_dir}/config.h"
-        "${keyboard_dir}/${keyboard_base_name}.c"
-        "${keyboard_dir}/${keyboard_base_name}.h"
-        "${keyboard_dir}/keymaps/default/keymap.c"
-    )
-    replace_placeholders "%YEAR%" "$(date +%Y)" "${replace_year_filenames[@]}"
-}
-
-# Replace %KEYBOARD% with the keyboard name.
-replace_keyboard_placeholders() {
-    local replace_keyboard_filenames=(
-        "${keyboard_dir}/config.h"
-        "${keyboard_dir}/info.json"
-        "${keyboard_dir}/readme.md"
-        "${keyboard_dir}/${keyboard_base_name}.c"
-        "${keyboard_dir}/keymaps/default/readme.md"
-    )
-    replace_placeholders "%KEYBOARD%" "$keyboard_base_name" "${replace_keyboard_filenames[@]}"
-}
-
-# Replace %YOUR_NAME% with the username.
-replace_name_placeholders() {
-    local replace_name_filenames=(
-        "${keyboard_dir}/config.h"
-        "${keyboard_dir}/info.json"
-        "${keyboard_dir}/readme.md"
-        "${keyboard_dir}/${keyboard_base_name}.c"
-        "${keyboard_dir}/${keyboard_base_name}.h"
-        "${keyboard_dir}/keymaps/default/keymap.c"
-    )
-    replace_placeholders "%YOUR_NAME%" "$username" "${replace_name_filenames[@]}"
-}
-
-# Check if an array contains an element.
-array_contains() {
-    local e match="$1"
-    shift
-    for e; do
-        [[ "$e" == "$match" ]] && return 0;
-    done
-
-    return 1
-}
-
-# If we've been started from util/, we want to be in qmk_firmware/
-[[ "$PWD" == *util ]] && cd ..
-
-# The root qmk_firmware/ directory should have a subdirectory called quantum/
-if [ ! -d "quantum" ]; then
-    echo_error "Could not detect the QMK firmware directory!"
-    echo_error "Are you sure you're in the right place?"
-    exit 1
-fi
-
-echo_bold "########################################"
-echo_bold "#                NOTICE                #"
-echo_bold "#   This script has been deprecated.   #"
-echo_bold "# Please use qmk new-keyboard instead. #"
-echo_bold "########################################"
-echo
-echo_bold "Generating a new QMK keyboard directory"
-echo
-
-# Keyboard name is required, so keep prompting until we get one
-while [ -z "$keyboard_name" ]; do
-    prompt "Keyboard Name" ""
-    keyboard_name=$prompt_return
-    keyboard_base_name=$(basename $keyboard_name)
-done
-
-keyboard_dir="keyboards/$keyboard_name"
-
-if [ -d "$keyboard_dir" ]; then
-    echo_error "Keyboard $keyboard_name already exists!"
-    exit 1
-fi
-
-KEYBOARD_TYPES=("avr" "ps2avrgb")
-
-prompt "Keyboard Type" "avr"
-keyboard_type=$prompt_return
-
-if ! array_contains "$keyboard_type" "${KEYBOARD_TYPES[@]}"; then
-    echo_error "Keyboard type must be one of: ${KEYBOARD_TYPES[*]}"
-    exit 1
-fi
-
-set_git_username
-prompt "Your Name" "$git_username"
-username=$prompt_return
-
-echo
-
-copy_templates
-set_sed_i
-replace_year_placeholders
-replace_keyboard_placeholders
-[ -n "$username" ] && replace_name_placeholders
-
-echo
-echo_bold "Created a new keyboard called $keyboard_name."
-echo
-echo_bold "To start working on things, cd into keyboards/$keyboard_name,"
-echo_bold "or open the directory in your favourite text editor."
diff --git a/util/new_keymap.sh b/util/new_keymap.sh
deleted file mode 100755
index c483314fdb..0000000000
--- a/util/new_keymap.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-# Script to make a new keymap for a keyboard of your choosing
-# This script automates the copying of the default keymap into
-# your own keymap
-
-KB_PATH=$(echo "$1" | tr 'A-Z' 'a-z')
-USERNAME=$(echo "$2" | tr 'A-Z' 'a-z')
-
-if [ -z "$KB_PATH" ]; then
-    printf "Usage:   %s <keyboard_path> <username>\n" "$0"
-    printf "Example: %s 1upkeyboards/1up60hse yourname\n" "$0"
-    exit 1
-fi
-
-if [ -z "$USERNAME" ]; then
-    printf "Usage:   %s <keyboard_path> <username>\n" "$0"
-    printf "Example: %s 1upkeyboards/1up60hse yourname\n" "$0"
-    exit 1
-fi
-
-cd "$(dirname "$0")/.."
-
-if [ ! -d "keyboards/$KB_PATH" ]; then
-	printf "Error! keyboards/%s does not exist!\n" "$KB_PATH"
-	exit 1
-fi
-
-if [ -d "keyboards/$KB_PATH/keymaps/$USERNAME" ]; then
-	printf "Error! keyboards/%s/keymaps/%s already exists!\n" "$KB_PATH" "$USERNAME"
-	exit 1
-fi
-
-# Recursively copy the chosen keyboard's default keymap
-cp -r keyboards/"$KB_PATH"/keymaps/default keyboards/"$KB_PATH"/keymaps/"$USERNAME"
-
-printf "%s keymap directory created in: qmk_firmware/keyboards/%s/keymaps/\n\n" "$USERNAME" "$KB_PATH"
-
-printf "Compile a firmware file with your new keymap by typing: \n"
-printf "   make %s:%s\n" "$KB_PATH" "$USERNAME"
-printf "from the qmk_firmware directory\n"
diff --git a/util/size_regression.sh b/util/size_regression.sh
index 988d1d9b5b..d474d8d0d5 100755
--- a/util/size_regression.sh
+++ b/util/size_regression.sh
@@ -11,6 +11,8 @@ dest_ref="develop"
 ignore_ref="master"
 unset skip_zero
 
+export SIZE_REGRESSION_EXECUTING=1
+
 function usage() {
     echo "Usage: $(basename "$0") [-h] [-j <jobs>] [-s <source>] [-d <dest>] [-n] planck/rev6:default"
     echo "    -h           : Shows this usage page."
@@ -23,9 +25,24 @@ function usage() {
 }
 
 if [[ ${#} -eq 0 ]]; then
-   usage
+    usage
+    exit 0
 fi
 
+unset cleanup_completed
+_internal_cleanup() {
+    if [[ -z "${cleanup_completed:-}" ]] ; then
+        echo
+        echo
+        echo 'Your git repository is in an indeterminate state!' >&2
+        echo 'Make sure you swap to your intended branch.' >&2
+        echo
+        unset SIZE_REGRESSION_EXECUTING
+    fi
+    cleanup_completed=1
+}
+trap _internal_cleanup EXIT HUP INT
+
 while getopts "hj:s:d:i:n" opt "$@" ; do
     case "$opt" in
         h) usage; exit 0;;
@@ -49,7 +66,8 @@ function build_executor() {
         revision=$(echo $line | cut -d' ' -f1)
 
         make distclean >/dev/null 2>&1
-        git checkout $revision >/dev/null 2>&1 || { echo "Failed to check out revision ${revision}" >&2 ; exit 1 ; }
+
+        git checkout -f $revision >/dev/null 2>&1 || { echo "Failed to check out revision ${revision}" >&2 ; exit 1 ; }
         make -j${job_count} $keyboard_target >/dev/null 2>&1 || true
         file_size=$(arm-none-eabi-size .build/*.elf 2>/dev/null | awk '/elf/ {print $1}' 2>/dev/null || true)